From 8322de67e8ee7e5f82c1ae102e5574d6d08ac39c Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 13 Mar 2016 07:45:12 +0000 Subject: [PATCH 0001/2457] Uses libX11 directly; seen in tnn's -7 build. PKGREVISION -> 4 --- graphics/ivtools/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/graphics/ivtools/Makefile b/graphics/ivtools/Makefile index 77381d844725d..7c97133c2a602 100644 --- a/graphics/ivtools/Makefile +++ b/graphics/ivtools/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2014/12/25 05:10:38 obache Exp $ +# $NetBSD: Makefile,v 1.32 2016/03/13 07:45:12 dholland Exp $ DISTNAME= ivtools-1.2.8 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ivtools/} EXTRACT_SUFX= .tgz @@ -35,6 +35,7 @@ pre-install: ${RM} -f ${WRKSRC}/config/arch.def.orig .include "../../graphics/tiff/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" From 959d83f1710381a14e33298bf294fd30f01bde3e Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 13 Mar 2016 07:56:12 +0000 Subject: [PATCH 0002/2457] Include CONFIGURE_ENV in the setenv for the custom do-configure target. Should make it more likely to be able to find the right imake. --- net/nasd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/nasd/Makefile b/net/nasd/Makefile index 2aec24890099f..48bafd206ac96 100644 --- a/net/nasd/Makefile +++ b/net/nasd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2015/11/08 21:55:11 dholland Exp $ +# $NetBSD: Makefile,v 1.18 2016/03/13 07:56:12 dholland Exp $ DISTNAME= repackaged-${PKGNAME_NOREV} PKGNAME= nasd-1.3 @@ -25,7 +25,7 @@ pre-patch: ${MKDIR} ${WRKSRC}/common/netbsd do-configure: - cd ${WRKSRC} && ${SETENV} NASD_DESTDIR=${PREFIX}/nasd ./itomf -m ${TOOLS_PATH.makedepend} -x ${X11BASE}/lib/X11/config + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} NASD_DESTDIR=${PREFIX}/nasd ./itomf -m ${TOOLS_PATH.makedepend} -x ${X11BASE}/lib/X11/config .include "../../mk/pthread.buildlink3.mk" From cd96529d9caa62f7f77cd76ab73f90e3c75c42e7 Mon Sep 17 00:00:00 2001 From: tnn Date: Sun, 13 Mar 2016 08:04:06 +0000 Subject: [PATCH 0003/2457] don't pick up doxygen --- audio/opusfile/Makefile | 5 +- audio/opusfile/PLIST | 150 +--------------------------------------- 2 files changed, 5 insertions(+), 150 deletions(-) diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile index 737af40e9a30e..247f769756c96 100644 --- a/audio/opusfile/Makefile +++ b/audio/opusfile/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2016/03/07 19:36:57 nros Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/13 08:04:06 tnn Exp $ DISTNAME= opusfile-0.7 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ @@ -16,6 +17,8 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= opusfile.pc.in PKGCONFIG_OVERRIDE+= opusurl.pc.in +CONFIGURE_ARGS+= --disable-doc # needs doxygen + .include "../../audio/libopus/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/audio/opusfile/PLIST b/audio/opusfile/PLIST index 1f957a0c384d1..18ecc9b550563 100644 --- a/audio/opusfile/PLIST +++ b/audio/opusfile/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2016/03/07 19:36:57 nros Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/13 08:04:06 tnn Exp $ include/opus/opusfile.h lib/libopusfile.la lib/libopusurl.la @@ -7,151 +7,3 @@ lib/pkgconfig/opusurl.pc share/doc/opusfile/AUTHORS share/doc/opusfile/COPYING share/doc/opusfile/README.txt -share/doc/opusfile/html/annotated.html -share/doc/opusfile/html/arrowdown.png -share/doc/opusfile/html/arrowright.png -share/doc/opusfile/html/bc_s.png -share/doc/opusfile/html/bdwn.png -share/doc/opusfile/html/classes.html -share/doc/opusfile/html/closed.png -share/doc/opusfile/html/dir_000000.html -share/doc/opusfile/html/doc.png -share/doc/opusfile/html/doxygen.css -share/doc/opusfile/html/doxygen.png -share/doc/opusfile/html/dynsections.js -share/doc/opusfile/html/files.html -share/doc/opusfile/html/folderclosed.png -share/doc/opusfile/html/folderopen.png -share/doc/opusfile/html/functions.html -share/doc/opusfile/html/functions_vars.html -share/doc/opusfile/html/group__error__codes.html -share/doc/opusfile/html/group__header__info.html -share/doc/opusfile/html/group__stream__callbacks.html -share/doc/opusfile/html/group__stream__decoding.html -share/doc/opusfile/html/group__stream__info.html -share/doc/opusfile/html/group__stream__open__close.html -share/doc/opusfile/html/group__stream__seeking.html -share/doc/opusfile/html/group__url__options.html -share/doc/opusfile/html/index.html -share/doc/opusfile/html/jquery.js -share/doc/opusfile/html/modules.html -share/doc/opusfile/html/nav_f.png -share/doc/opusfile/html/nav_g.png -share/doc/opusfile/html/nav_h.png -share/doc/opusfile/html/open.png -share/doc/opusfile/html/opus_logo.svg -share/doc/opusfile/html/opusfile_8h_source.html -share/doc/opusfile/html/search/all_0.html -share/doc/opusfile/html/search/all_0.js -share/doc/opusfile/html/search/all_1.html -share/doc/opusfile/html/search/all_1.js -share/doc/opusfile/html/search/all_10.html -share/doc/opusfile/html/search/all_10.js -share/doc/opusfile/html/search/all_11.html -share/doc/opusfile/html/search/all_11.js -share/doc/opusfile/html/search/all_12.html -share/doc/opusfile/html/search/all_12.js -share/doc/opusfile/html/search/all_2.html -share/doc/opusfile/html/search/all_2.js -share/doc/opusfile/html/search/all_3.html -share/doc/opusfile/html/search/all_3.js -share/doc/opusfile/html/search/all_4.html -share/doc/opusfile/html/search/all_4.js -share/doc/opusfile/html/search/all_5.html -share/doc/opusfile/html/search/all_5.js -share/doc/opusfile/html/search/all_6.html -share/doc/opusfile/html/search/all_6.js -share/doc/opusfile/html/search/all_7.html -share/doc/opusfile/html/search/all_7.js -share/doc/opusfile/html/search/all_8.html -share/doc/opusfile/html/search/all_8.js -share/doc/opusfile/html/search/all_9.html -share/doc/opusfile/html/search/all_9.js -share/doc/opusfile/html/search/all_a.html -share/doc/opusfile/html/search/all_a.js -share/doc/opusfile/html/search/all_b.html -share/doc/opusfile/html/search/all_b.js -share/doc/opusfile/html/search/all_c.html -share/doc/opusfile/html/search/all_c.js -share/doc/opusfile/html/search/all_d.html -share/doc/opusfile/html/search/all_d.js -share/doc/opusfile/html/search/all_e.html -share/doc/opusfile/html/search/all_e.js -share/doc/opusfile/html/search/all_f.html -share/doc/opusfile/html/search/all_f.js -share/doc/opusfile/html/search/classes_0.html -share/doc/opusfile/html/search/classes_0.js -share/doc/opusfile/html/search/close.png -share/doc/opusfile/html/search/functions_0.html -share/doc/opusfile/html/search/functions_0.js -share/doc/opusfile/html/search/groups_0.html -share/doc/opusfile/html/search/groups_0.js -share/doc/opusfile/html/search/groups_1.html -share/doc/opusfile/html/search/groups_1.js -share/doc/opusfile/html/search/groups_2.html -share/doc/opusfile/html/search/groups_2.js -share/doc/opusfile/html/search/groups_3.html -share/doc/opusfile/html/search/groups_3.js -share/doc/opusfile/html/search/groups_4.html -share/doc/opusfile/html/search/groups_4.js -share/doc/opusfile/html/search/groups_5.html -share/doc/opusfile/html/search/groups_5.js -share/doc/opusfile/html/search/groups_6.html -share/doc/opusfile/html/search/groups_6.js -share/doc/opusfile/html/search/mag_sel.png -share/doc/opusfile/html/search/nomatches.html -share/doc/opusfile/html/search/search.css -share/doc/opusfile/html/search/search.js -share/doc/opusfile/html/search/search_l.png -share/doc/opusfile/html/search/search_m.png -share/doc/opusfile/html/search/search_r.png -share/doc/opusfile/html/search/searchdata.js -share/doc/opusfile/html/search/typedefs_0.html -share/doc/opusfile/html/search/typedefs_0.js -share/doc/opusfile/html/search/variables_0.html -share/doc/opusfile/html/search/variables_0.js -share/doc/opusfile/html/search/variables_1.html -share/doc/opusfile/html/search/variables_1.js -share/doc/opusfile/html/search/variables_10.html -share/doc/opusfile/html/search/variables_10.js -share/doc/opusfile/html/search/variables_2.html -share/doc/opusfile/html/search/variables_2.js -share/doc/opusfile/html/search/variables_3.html -share/doc/opusfile/html/search/variables_3.js -share/doc/opusfile/html/search/variables_4.html -share/doc/opusfile/html/search/variables_4.js -share/doc/opusfile/html/search/variables_5.html -share/doc/opusfile/html/search/variables_5.js -share/doc/opusfile/html/search/variables_6.html -share/doc/opusfile/html/search/variables_6.js -share/doc/opusfile/html/search/variables_7.html -share/doc/opusfile/html/search/variables_7.js -share/doc/opusfile/html/search/variables_8.html -share/doc/opusfile/html/search/variables_8.js -share/doc/opusfile/html/search/variables_9.html -share/doc/opusfile/html/search/variables_9.js -share/doc/opusfile/html/search/variables_a.html -share/doc/opusfile/html/search/variables_a.js -share/doc/opusfile/html/search/variables_b.html -share/doc/opusfile/html/search/variables_b.js -share/doc/opusfile/html/search/variables_c.html -share/doc/opusfile/html/search/variables_c.js -share/doc/opusfile/html/search/variables_d.html -share/doc/opusfile/html/search/variables_d.js -share/doc/opusfile/html/search/variables_e.html -share/doc/opusfile/html/search/variables_e.js -share/doc/opusfile/html/search/variables_f.html -share/doc/opusfile/html/search/variables_f.js -share/doc/opusfile/html/splitbar.png -share/doc/opusfile/html/structOpusFileCallbacks.html -share/doc/opusfile/html/structOpusHead.html -share/doc/opusfile/html/structOpusPictureTag.html -share/doc/opusfile/html/structOpusServerInfo.html -share/doc/opusfile/html/structOpusTags.html -share/doc/opusfile/html/sync_off.png -share/doc/opusfile/html/sync_on.png -share/doc/opusfile/html/tab_a.png -share/doc/opusfile/html/tab_b.png -share/doc/opusfile/html/tab_h.png -share/doc/opusfile/html/tab_s.png -share/doc/opusfile/html/tabs.css From 03363ad6b052001c3f24d639bf503a2deef037ff Mon Sep 17 00:00:00 2001 From: tnn Date: Sun, 13 Mar 2016 08:10:29 +0000 Subject: [PATCH 0004/2457] export libxml2 dependency, pkg-config says so --- audio/libmusicbrainz5/buildlink3.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/audio/libmusicbrainz5/buildlink3.mk b/audio/libmusicbrainz5/buildlink3.mk index 00ed1023f9478..b1ae0aa0c3f01 100644 --- a/audio/libmusicbrainz5/buildlink3.mk +++ b/audio/libmusicbrainz5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2016/03/08 11:21:27 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2016/03/13 08:10:29 tnn Exp $ BUILDLINK_TREE+= libmusicbrainz5 @@ -9,6 +9,7 @@ BUILDLINK_API_DEPENDS.libmusicbrainz5+= libmusicbrainz5>=5.0.1 BUILDLINK_ABI_DEPENDS.libmusicbrainz5?= libmusicbrainz5>=5.1.0 BUILDLINK_PKGSRCDIR.libmusicbrainz5?= ../../audio/libmusicbrainz5 +.include "../../textproc/libxml2/buildlink3.mk" .include "../../www/neon/buildlink3.mk" .endif # LIBMUSICBRAINZ5_BUILDLINK3_MK From 61d8667068641be9164c6c5c18a0de4770d4bdf6 Mon Sep 17 00:00:00 2001 From: tnn Date: Sun, 13 Mar 2016 08:15:59 +0000 Subject: [PATCH 0005/2457] teach it about NetBSD's pthread_setname_np(3) prototype --- sysutils/rsyslog/distinfo | 3 ++- sysutils/rsyslog/patches/patch-runtime_lookup.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 sysutils/rsyslog/patches/patch-runtime_lookup.c diff --git a/sysutils/rsyslog/distinfo b/sysutils/rsyslog/distinfo index abcd29646ba1e..cee89cc6630a1 100644 --- a/sysutils/rsyslog/distinfo +++ b/sysutils/rsyslog/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2016/03/09 20:54:43 fhajny Exp $ +$NetBSD: distinfo,v 1.15 2016/03/13 08:15:59 tnn Exp $ SHA1 (rsyslog-8.17.0.tar.gz) = 179593a63f1977ab4b2529bd14b2f1655aa9e78d RMD160 (rsyslog-8.17.0.tar.gz) = 98e1228189cb73ab54097f481b5300d1707acaf6 @@ -10,6 +10,7 @@ SHA1 (patch-plugins_imfile_imfile.c) = 65b56f6799e2b206e1a8c3d055a4e9dc22da88be SHA1 (patch-plugins_imptcp_imptcp.c) = 47f7184acf0279df4117924108f961529b22a21e SHA1 (patch-plugins_imuxsock_imuxsock.c) = a3c682d5a2132cd4796893f286193259087223da SHA1 (patch-plugins_mmexternal_mmexternal.c) = 00606bd11d5d281bf4b32f038e857eb364954c4c +SHA1 (patch-runtime_lookup.c) = f4551d19792fedea7944d395df3c491363bbbcf1 SHA1 (patch-runtime_nsd__ptcp.c) = fcc8bdd5c5068cc0fb2f3b29d53a6bee41c7a437 SHA1 (patch-tools_rsyslogd.8) = a3c79f551111b7bf5933ca5e0930b1f52875f341 SHA1 (patch-tools_rsyslogd.c) = 5d480bc32f44ee308acad76588b250f8a56d894f diff --git a/sysutils/rsyslog/patches/patch-runtime_lookup.c b/sysutils/rsyslog/patches/patch-runtime_lookup.c new file mode 100644 index 0000000000000..9fece36a0d7eb --- /dev/null +++ b/sysutils/rsyslog/patches/patch-runtime_lookup.c @@ -0,0 +1,17 @@ +$NetBSD: patch-runtime_lookup.c,v 1.1 2016/03/13 08:15:59 tnn Exp $ + +--- runtime/lookup.c.orig 2016-03-07 06:47:55.000000000 +0000 ++++ runtime/lookup.c +@@ -926,8 +926,12 @@ lookupTableDefProcessCnf(struct cnfobj * + strcpy(reloader_thd_name, reloader_prefix); + strcpy(reloader_thd_name + strlen(reloader_prefix), (char*) lu->name); + reloader_thd_name[thd_name_len - 1] = '\0'; ++#if defined(__NetBSD__) ++ pthread_setname_np(lu->reloader, "%s", reloader_thd_name); ++#else + pthread_setname_np(lu->reloader, reloader_thd_name); + #endif ++#endif + CHKiRet(lookupReadFile(lu->self, lu->name, lu->filename)); + DBGPRINTF("lookup table '%s' loaded from file '%s'\n", lu->name, lu->filename); + From 25220e2b280d498d63239f3013455e4ae2bbfe31 Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 13 Mar 2016 08:38:54 +0000 Subject: [PATCH 0006/2457] Compile in 'localhost' as the log host, instead of extracting the build machine's hostname and then trying (often incorrectly) to convert it to a FQDN. I was getting "Host" as the alleged FQDN; the bulk build tnn@ just posted was getting ";;", which caused the package to not even compile. While 'localhost' is hardly an ideal hardwired loghost, it's better than the possibly-internal-only name of some random package build host used to build binary packages... even assuming the FQDN extraction worked. If anyone has any better ideas, let me know. (See pkgsrc-users.) PKGREVISION -> 12. --- net/nocol/Makefile | 33 +++++++++++++++------------------ net/nocol/files/answers | 6 +++--- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/net/nocol/Makefile b/net/nocol/Makefile index 5bf001cf9922d..ed130c66c15b3 100644 --- a/net/nocol/Makefile +++ b/net/nocol/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2015/06/12 10:50:43 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2016/03/13 08:38:54 dholland Exp $ # DISTNAME= nocol-4.3.1 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= net MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/ @@ -37,22 +37,19 @@ INSTALL_MAKE_FLAGS+= ROOTDIR=${DESTDIR}${PREFIX} \ DATADIR=${DESTDIR}/var/run/data \ MSGSDIR=${DESTDIR}/var/run/msgs -post-patch: - @(hostname=`/bin/hostname`; \ - dir=""; \ - for d in /usr/bin /usr/sbin `${ECHO} $$PATH | ${TR} ':' ' '`; do \ - if [ -x $$d/host ]; then \ - dir=$$d; \ - break; \ - fi \ - done; \ - if [ "X$$dir" = "X" ]; then \ - ${ECHO} "host program not found"; \ - exit 1; \ - fi; \ - fqdn=`$$dir/host $$hostname | ${AWK} '{ print $$1; exit }'`; \ - ${SED} -e 's|@prefix@|${PREFIX}|g' -e "s|@FQDN@|$$fqdn|g" \ - ${FILESDIR}/answers > ${WRKSRC}/answers) +post-extract: + ${CP} ${FILESDIR}/answers ${WRKSRC}/answers + +# XXX This is compiled in as the logging host. Compiling in "localhost" +# lacks a certain something; however, for years it was compiling in the +# name of the build host, or, not infrequently, something entirely +# invalid. +FQDN= localhost + +SUBST_CLASSES+= answers +SUBST_STAGE.answers= pre-configure +SUBST_FILES.answers= answers +SUBST_VARS.answers= PREFIX PKGMANDIR FQDN pre-configure: @${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmp diff --git a/net/nocol/files/answers b/net/nocol/files/answers index bedf6374ce67b..b59dac61b2815 100644 --- a/net/nocol/files/answers +++ b/net/nocol/files/answers @@ -1,5 +1,5 @@ -@prefix@ -@prefix@/man/mann +@PREFIX@ +@PREFIX@/@PKGMANDIR@/mann n @FQDN@ /usr/bin/mail @@ -8,4 +8,4 @@ root@@FQDN@ cc -O yacc -@prefix@/bin/perl +@PREFIX@/bin/perl From f07b783e89115651568fbba9070e2b21592b0591 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Mar 2016 08:49:31 +0000 Subject: [PATCH 0007/2457] Update lgogdownloader to 2.27: LGOGDownloader 2.27 - Changed build system to CMake (patch by: Sandy Carter) - Fixed crash after login - Added option to set automatic XML creation in config file * --automatic-xml-creation - Improved game specific config options * Directory options can be overriden in game specific config file * "platform" and "language" options allow using string to set them. Use "+" as separator to combine values and "," as separator to set priority. * For example: this allows setting "language" to English, German and French with "en+de+fr" which is much easier to understand than setting it to "7" - Improvements to orphan detection (patch by: Thomas J. Moore) * blacklist applies to installed files only; use ignorelist for orphans * blacklisted but present items are orphans, as they should be * use exact matching for file paths: files in wrong location are orphans * See man page for more details on how to use ignorelist - Apply blacklist to status checker to avoid some spurious ND messages (patch by: Thomas J. Moore) - Use cerr for password prompts, error messages, rolling status messages, and other stuff that shouldn't clutter saved stdout. (patch by: Thomas J. Moore) - Reduce the amount of HTTP requests * This also slightly speeds up getting game details for games with DLC - Added option to save changelogs when downloading * --save-changelogs - Added support for two-step login --- games/lgogdownloader/Makefile | 20 ++++++++++--------- games/lgogdownloader/distinfo | 11 +++++----- .../patches/patch-cmake_FindJsoncpp.cmake | 14 +++++++++++++ 3 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 games/lgogdownloader/patches/patch-cmake_FindJsoncpp.cmake diff --git a/games/lgogdownloader/Makefile b/games/lgogdownloader/Makefile index 65751877a4bc9..e7325b3f120a5 100644 --- a/games/lgogdownloader/Makefile +++ b/games/lgogdownloader/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2016/03/05 11:28:34 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2016/03/13 08:49:31 wiz Exp $ -DISTNAME= lgogdownloader-2.26 -PKGREVISION= 1 +DISTNAME= lgogdownloader-2.27 CATEGORIES= games MASTER_SITES= http://sites.google.com/site/gogdownloader/ @@ -12,13 +11,16 @@ COMMENT= Download games from GOG BUILD_DEPENDS+= help2man-[0-9]*:../../converters/help2man -#WRKSRC= ${WRKDIR}/lgogdownloader USE_LANGUAGES= c++ -USE_TOOLS+= gmake gunzip - -MAKE_FLAGS+= PREFIX=${PREFIX} -MAKE_FLAGS+= MANPREFIX=${PREFIX} -MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} +USE_CMAKE= yes +USE_TOOLS+= pkg-config +CMAKE_ARGS+= -DPC_JSONCPP_FOUND:BOOL=1 +CMAKE_ARGS+= -DPC_JSONCPP_INCLUDEDIRS:PATH=${BUILDLINK_PREFIX.jsoncpp}/include/json +CMAKE_ARGS+= -DPC_JSONCPP_LIBRARY_DIRS:PATH=${BUILDLINK_PREFIX.jsoncpp}/lib +CMAKE_ARGS+= -DPC_TINYXML_FOUND:BOOL=1 +CMAKE_ARGS+= -DPC_TINYXML_LIBRARY_DIRS:PATH=${BUILDLINK_PREFIX.tinyxml}/lib +# for man page +CMAKE_ARGS+= -DINSTALL_SHARE_DIR:PATH=${PREFIX} .include "../../devel/boost-libs/buildlink3.mk" .include "../../security/liboauth/buildlink3.mk" diff --git a/games/lgogdownloader/distinfo b/games/lgogdownloader/distinfo index f12362ec52d06..444f108144d23 100644 --- a/games/lgogdownloader/distinfo +++ b/games/lgogdownloader/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.16 2015/11/04 17:41:18 agc Exp $ +$NetBSD: distinfo,v 1.17 2016/03/13 08:49:31 wiz Exp $ -SHA1 (lgogdownloader-2.26.tar.gz) = da95d3bf78880c71776f91cc91a9584785004f23 -RMD160 (lgogdownloader-2.26.tar.gz) = 4c1095e1571fdb3fc53bd9b096b879ada1417c68 -SHA512 (lgogdownloader-2.26.tar.gz) = 6820f577e02adb510c97212b658178d0778d60c97a7c6e08471ff7840909e80eef9e505ddf99f57766a45ea397a1fbaec6c8a1d33146c14f94f6d924b413a9bd -Size (lgogdownloader-2.26.tar.gz) = 47424 bytes +SHA1 (lgogdownloader-2.27.tar.gz) = 8e6841637d9a6ea8b0ed3c346ae96fa48655db41 +RMD160 (lgogdownloader-2.27.tar.gz) = 89cc6e373528326712abbd54fa1f7d468875c3f5 +SHA512 (lgogdownloader-2.27.tar.gz) = 3dd2845b801c883d42bb12bfeb4c28ab6852524a0397ea313b7e4b0195e575a255177b85281bfd923765ac49cfc313dc5bd62a1188e1c465172f79ec281ea0a7 +Size (lgogdownloader-2.27.tar.gz) = 50433 bytes +SHA1 (patch-cmake_FindJsoncpp.cmake) = 0ab831e8d26625a748cf9c4ab270cd7a39a4472e diff --git a/games/lgogdownloader/patches/patch-cmake_FindJsoncpp.cmake b/games/lgogdownloader/patches/patch-cmake_FindJsoncpp.cmake new file mode 100644 index 0000000000000..f77d04d752de8 --- /dev/null +++ b/games/lgogdownloader/patches/patch-cmake_FindJsoncpp.cmake @@ -0,0 +1,14 @@ +$NetBSD: patch-cmake_FindJsoncpp.cmake,v 1.1 2016/03/13 08:49:31 wiz Exp $ + +jsoncpp does not provide a pkg-config file, don't insist on one. + +--- cmake/FindJsoncpp.cmake.orig 2016-01-17 17:41:13.000000000 +0000 ++++ cmake/FindJsoncpp.cmake +@@ -6,7 +6,6 @@ + # Jsoncpp_LIBRARIES - link these to use Jsoncpp + + find_package(PkgConfig) +-pkg_check_modules(PC_JSONCPP REQUIRED jsoncpp) + + find_path(JSONCPP_INCLUDE_DIR + NAMES From d934072962eba9d1de6aadb74562b7f7ef6321df Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Mar 2016 08:49:40 +0000 Subject: [PATCH 0008/2457] Updated games/lgogdownloader to 2.27 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index ab25df1476415..f6bc83a0d4e50 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1141 2016/03/13 03:55:03 mef Exp $ +$NetBSD: CHANGES-2016,v 1.1142 2016/03/13 08:49:40 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1527,3 +1527,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/p11-kit to 0.22.1 [ryoon 2016-03-13] Updated lang/scala to 2.11.8 [ryoon 2016-03-13] Updated devel/p5-App-cpanminus to 1.7040 [mef 2016-03-13] + Updated games/lgogdownloader to 2.27 [wiz 2016-03-13] From 663f5820bb55707f68b844950e1d0232a2b1454c Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 13 Mar 2016 09:06:01 +0000 Subject: [PATCH 0009/2457] Use standard headers. Fixes at least some LP64 bugs. Ride previous version bump. --- net/nocol/distinfo | 25 +++++++++++++------ net/nocol/patches/patch-aa | 18 +++++++------ net/nocol/patches/patch-ak | 20 +++++++++++---- net/nocol/patches/patch-ap | 8 +++--- net/nocol/patches/patch-ar | 13 +++++++--- net/nocol/patches/patch-cmu-snmp_snmp_asn1.c | 14 +++++++++++ .../patches/patch-eventselect_eventselect.c | 12 +++++++++ net/nocol/patches/patch-genmon_genmon_c | 16 ++++++------ .../patches/patch-netconsole_netconsole_c | 7 +++--- net/nocol/patches/patch-netconsole_utils_c | 7 +++--- net/nocol/patches/patch-nsmon_nsmon.c | 14 +++++++++++ net/nocol/patches/patch-ntpmon_main.c | 14 +++++++++++ net/nocol/patches/patch-ntpmon_ntpmon.c | 14 +++++++++++ net/nocol/patches/patch-pingmon_poll__sites.c | 14 +++++++++++ net/nocol/patches/patch-radiusmon_main.c | 16 ++++++++++++ net/nocol/patches/patch-radiusmon_radiusmon.c | 15 +++++++++++ .../patches/patch-support_rpcping_rpcping.c | 15 +++++++++++ 17 files changed, 202 insertions(+), 40 deletions(-) create mode 100644 net/nocol/patches/patch-cmu-snmp_snmp_asn1.c create mode 100644 net/nocol/patches/patch-eventselect_eventselect.c create mode 100644 net/nocol/patches/patch-nsmon_nsmon.c create mode 100644 net/nocol/patches/patch-ntpmon_main.c create mode 100644 net/nocol/patches/patch-ntpmon_ntpmon.c create mode 100644 net/nocol/patches/patch-pingmon_poll__sites.c create mode 100644 net/nocol/patches/patch-radiusmon_main.c create mode 100644 net/nocol/patches/patch-radiusmon_radiusmon.c create mode 100644 net/nocol/patches/patch-support_rpcping_rpcping.c diff --git a/net/nocol/distinfo b/net/nocol/distinfo index d4332ddf9f993..33a83bc9896cb 100644 --- a/net/nocol/distinfo +++ b/net/nocol/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.20 2015/12/29 05:57:02 dholland Exp $ +$NetBSD: distinfo,v 1.21 2016/03/13 09:06:01 dholland Exp $ SHA1 (nocol-4.3.1.tar.gz) = a8cb88727bc3a3ddd544792407d431b3ef13a325 RMD160 (nocol-4.3.1.tar.gz) = 77a57ae447f0a8f1ce2417d9b828710f21865cc8 SHA512 (nocol-4.3.1.tar.gz) = 5fea1233ce3a9d132e370304e14284e92dc547c9956510a557c9342fc73a928a12b3b1b2795cb3bac4e9a8912f6a21ff4c652ec5ab4b11aa972df461d060ef03 Size (nocol-4.3.1.tar.gz) = 1117438 bytes -SHA1 (patch-aa) = cac346e3ae5889ebea5ab2abc895ed46935b7d97 +SHA1 (patch-aa) = 01dc14aabc183bdfaf29ddbc11f624d872a5bece SHA1 (patch-ab) = dc7763d83a95ead899bbe74ea68c706d093ccb6f SHA1 (patch-ac) = b2e16760e8d57b2c2b719e6c42dcd5846d71f179 SHA1 (patch-ad) = a64750ad0bfa40f8c01e3d6af49b40c525f13985 @@ -12,29 +12,38 @@ SHA1 (patch-ae) = 57bfc3941aa765eda2a54da45122a5fde642ee3f SHA1 (patch-ah) = 14091c7a6c8de7dd451e4292f2d0121ab3643158 SHA1 (patch-ai) = d8317fad7c5e4574fa980859762f5acb1a7c631d SHA1 (patch-aj) = 0eb201f47864132b04702fab4d03e452c07c2e2a -SHA1 (patch-ak) = 97364e3ca5956d43b6e18520a288242d4bfc9131 +SHA1 (patch-ak) = f619ccc5b0b56c6cf2863642478643f1f5ed2e71 SHA1 (patch-al) = f4932b5e84fc7647140c2b3e46abd6b12ea7e887 SHA1 (patch-am) = a8345c95b9183e1a70af682729d24ebb8af97eb6 SHA1 (patch-an) = 1a869a8a2e4e0c5a29540bff7d1da76e4d8c74e9 SHA1 (patch-ao) = 83a4f72fbf433ef496fee481af36dac7b9c51c4a -SHA1 (patch-ap) = 0c7ca32c9d00eb493df3ff2b1c441e6c1e1aa34e +SHA1 (patch-ap) = ee204a0ad164262687e9a1161d8df66ce347a3b3 SHA1 (patch-aq) = 04a764918910d6d20e09842ff280be0231a269f5 -SHA1 (patch-ar) = 758be995183713f7d390f6642a7d66ab147cefe0 +SHA1 (patch-ar) = 1f26beb46a23d9f7b6b89e8039e6df6b343de286 SHA1 (patch-as) = 7a49170bbeb04812ad83c294777d9d364e60823f SHA1 (patch-at) = c49b96d1c2158d0a8f67228922f0e4bff5df2908 SHA1 (patch-au) = a8bbcb0eef41ac514bb1106c5feedb5bc087aac7 +SHA1 (patch-cmu-snmp_snmp_asn1.c) = 555edf5310f40ef52fe38e42303c989733e8279f SHA1 (patch-etherload_bpf_c) = 2d11b411693b8bca39954da47bc2fc9afb1fc273 SHA1 (patch-etherload_get__devlist_c) = dc03458a5ba5d825371dafced876de4c80228fb3 SHA1 (patch-etherload_main_c) = 0ee5cffa70b42be6eca2e5de90b5583a7d684d50 SHA1 (patch-etherload_nocol__specific_c) = 16c9c6ec50b56dbf4e35498eb09ee04e788f901b SHA1 (patch-etherload_util_c) = 964e84020af0ac2903aa7fb87512b81be67cb1fe -SHA1 (patch-genmon_genmon_c) = cb07a91c2e9ae3f28f59578563b994bd3557018b +SHA1 (patch-eventselect_eventselect.c) = 02f5540fd92ccd94f5233beb2770ad9c7d402f1c +SHA1 (patch-genmon_genmon_c) = ec6842548adb3a7efb2cb9aa6b24265d183f75b5 SHA1 (patch-lib_misc_c) = 486f954d2554907c17822525f5ba33e75a581943 -SHA1 (patch-netconsole_netconsole_c) = 08283ba29c0ff63dbc23501011a7c3e56b272d0a +SHA1 (patch-netconsole_netconsole_c) = f6e799973fec6baf0b1c7132acfaee2cc4e60b9d SHA1 (patch-netconsole_read__filter_c) = 03e5a0e3a5ffad7b5260c3902dfb505d52927522 -SHA1 (patch-netconsole_utils_c) = 40bfc9bee53f6c77ccf7674bdb0ab153e56eadc3 +SHA1 (patch-netconsole_utils_c) = 45467a71bc58b58bc4ff4521bf3fe5a3c6ba13f3 SHA1 (patch-noclog_noclogd_c) = 65409b1768de39eb8341af9aafb9d7a81c9622bb SHA1 (patch-nsmon_main_c) = 26992f1cc7b4cbfac3f968937ee9533b9c55d126 +SHA1 (patch-nsmon_nsmon.c) = 3bcd592d7c126b48fde587b1fff81d8df3cec1c0 +SHA1 (patch-ntpmon_main.c) = 0193578372fc1d21cb7eaf735d4631311d1c0cc6 +SHA1 (patch-ntpmon_ntpmon.c) = 012458c3ce46f94ff54bf5c613726649443fb3e0 +SHA1 (patch-pingmon_poll__sites.c) = 5a8bc4edaad239a8ed3e9c0bd6c8647bc8b490e7 +SHA1 (patch-radiusmon_main.c) = 40cc079a0940c604d603c6a52dc16fe1256deeaf +SHA1 (patch-radiusmon_radiusmon.c) = f64a1516feb1248a23badb3cf4f030a8ab63dec4 SHA1 (patch-strerror_c) = 566959a5784ea640c269b247cdd1ad5ad988882e +SHA1 (patch-support_rpcping_rpcping.c) = 401994995fc0504cdfe46949f4aaa7758a350c3a SHA1 (patch-tknocol_ndaemon_c) = 9ea38cd4495b4b99532dcaecaf266c28662bc5c0 SHA1 (patch-utility_display__nocol__datafile_c) = 6c7796043658fa6e56d2ccf4a0b5346007aea537 diff --git a/net/nocol/patches/patch-aa b/net/nocol/patches/patch-aa index a7de0eead993b..10f4555cd592f 100644 --- a/net/nocol/patches/patch-aa +++ b/net/nocol/patches/patch-aa @@ -1,11 +1,15 @@ -$NetBSD: patch-aa,v 1.6 2012/09/09 19:49:45 dholland Exp $ +$NetBSD: patch-aa,v 1.7 2016/03/13 09:06:01 dholland Exp $ -Don't use curses internals. +- Use standard headers. +- Don't use curses internals. ---- netconsole/build_display.c.orig Thu Jul 13 11:13:37 2000 -+++ netconsole/build_display.c Thu Jul 13 11:15:26 2000 -@@ -59,7 +59,7 @@ +--- netconsole/build_display.c.orig 1994-11-29 20:41:06.000000000 +0000 ++++ netconsole/build_display.c +@@ -57,9 +57,10 @@ + */ + #include "netconsole.h" ++#include -#define WFULL(w) (w->_cury == (w->_maxy - 1)) ? 1:0 @@ -13,7 +17,7 @@ Don't use curses internals. build_display () { -@@ -229,8 +229,8 @@ +@@ -229,8 +230,8 @@ display_screenful () "\n(DEBUG): frozen = %s, quiet = %s\n", frozen ? "YES" : "NO", quiet ? "YES" : "NO" ); wprintw(aw.wmsg, @@ -24,7 +28,7 @@ Don't use curses internals. wclrtoeol(aw.wmsg); } -@@ -238,8 +238,8 @@ +@@ -238,8 +239,8 @@ display_screenful () * Am calling touchwin() since its foolproof (see discussion above) */ touchwin (aw.wmain); diff --git a/net/nocol/patches/patch-ak b/net/nocol/patches/patch-ak index 770c7a8587355..c9476156001bd 100644 --- a/net/nocol/patches/patch-ak +++ b/net/nocol/patches/patch-ak @@ -1,10 +1,20 @@ -$NetBSD: patch-ak,v 1.2 2012/09/09 19:49:45 dholland Exp $ +$NetBSD: patch-ak,v 1.3 2016/03/13 09:06:01 dholland Exp $ -Don't use nonexistent/nonstandard curses interfaces. +- Use standard headers +- Don't use nonexistent/nonstandard curses interfaces. ---- netconsole/setup_display.c 2002/06/28 08:31:30 1.1 -+++ netconsole/setup_display.c 2002/06/28 08:31:50 -@@ -48,8 +48,8 @@ +--- netconsole/setup_display.c.orig 1994-11-29 20:41:10.000000000 +0000 ++++ netconsole/setup_display.c +@@ -31,6 +31,8 @@ + * + * + */ ++#include ++#include + #include "netconsole.h" + + setup_display() +@@ -45,8 +47,8 @@ setup_display() { endwin (); fprintf (stderr, diff --git a/net/nocol/patches/patch-ap b/net/nocol/patches/patch-ap index 955cc375c3e74..b8aeea2d7ab69 100644 --- a/net/nocol/patches/patch-ap +++ b/net/nocol/patches/patch-ap @@ -1,15 +1,17 @@ -$NetBSD: patch-ap,v 1.2 2012/09/09 19:35:20 dholland Exp $ +$NetBSD: patch-ap,v 1.3 2016/03/13 09:06:01 dholland Exp $ - use standard headers - don't declare own errno --- tpmon/tpmon.c.orig 1998-07-31 18:35:34.000000000 +0000 +++ tpmon/tpmon.c -@@ -30,13 +30,15 @@ +@@ -30,13 +30,17 @@ #include #include #include -#include ++#include ++#include +#include #include #include @@ -22,7 +24,7 @@ $NetBSD: patch-ap,v 1.2 2012/09/09 19:35:20 dholland Exp $ #include #ifndef NeXT # include -@@ -47,7 +49,6 @@ +@@ -47,7 +51,6 @@ #include "osdefs.h" /* definition of RAND */ extern char *prognm; diff --git a/net/nocol/patches/patch-ar b/net/nocol/patches/patch-ar index 6274b0934d3a1..8facf2924b64b 100644 --- a/net/nocol/patches/patch-ar +++ b/net/nocol/patches/patch-ar @@ -1,10 +1,15 @@ -$NetBSD: patch-ar,v 1.2 2012/09/09 19:49:45 dholland Exp $ +$NetBSD: patch-ar,v 1.3 2016/03/13 09:06:01 dholland Exp $ -Don't declare own errno. +- Use standard headers. +- Don't declare own errno. ---- trapmon/trapmon.c.orig 2005-12-18 20:36:47.000000000 +0000 +--- trapmon/trapmon.c.orig 2000-01-27 05:16:53.000000000 +0000 +++ trapmon/trapmon.c -@@ -93,4 +93,2 @@ static char rcsid[] = +@@ -44,2 +44,3 @@ + #include ++#include + #include +@@ -93,4 +94,2 @@ static char rcsid[] = -extern int errno; - diff --git a/net/nocol/patches/patch-cmu-snmp_snmp_asn1.c b/net/nocol/patches/patch-cmu-snmp_snmp_asn1.c new file mode 100644 index 0000000000000..95acb4b39d27a --- /dev/null +++ b/net/nocol/patches/patch-cmu-snmp_snmp_asn1.c @@ -0,0 +1,14 @@ +$NetBSD: patch-cmu-snmp_snmp_asn1.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- cmu-snmp/snmp/asn1.c~ 1998-05-29 13:46:30.000000000 +0000 ++++ cmu-snmp/snmp/asn1.c +@@ -36,6 +36,7 @@ + #endif /* HAVE_CONFIG_H */ + + #include ++#include + #include + #ifdef WIN32 + #include diff --git a/net/nocol/patches/patch-eventselect_eventselect.c b/net/nocol/patches/patch-eventselect_eventselect.c new file mode 100644 index 0000000000000..3bb967b6370eb --- /dev/null +++ b/net/nocol/patches/patch-eventselect_eventselect.c @@ -0,0 +1,12 @@ +$NetBSD: patch-eventselect_eventselect.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- eventselect/eventselect.c~ 1998-09-28 20:26:18.000000000 +0000 ++++ eventselect/eventselect.c +@@ -44,4 +44,5 @@ static char rcsid[] = "$Id: eventselect. + #endif + ++#include + #include "nocol.h" + #include /* for O_RDONLY definition */ diff --git a/net/nocol/patches/patch-genmon_genmon_c b/net/nocol/patches/patch-genmon_genmon_c index 14611a2988a4f..8ec991bb4497d 100644 --- a/net/nocol/patches/patch-genmon_genmon_c +++ b/net/nocol/patches/patch-genmon_genmon_c @@ -1,17 +1,19 @@ -$NetBSD: patch-genmon_genmon_c,v 1.1 2012/09/09 19:35:21 dholland Exp $ +$NetBSD: patch-genmon_genmon_c,v 1.2 2016/03/13 09:06:01 dholland Exp $ -Functions returning pointers must be declared before being called. +- Use standard headers. +- Functions returning pointers must be declared before being called. (The function in question does not appear to be in any header file and it isn't clear which if any it should be added to.) ---- genmon/genmon.c~ 1998-07-15 16:27:49.000000000 +0000 +--- genmon/genmon.c.orig 1998-07-15 16:27:49.000000000 +0000 +++ genmon/genmon.c -@@ -56,6 +56,8 @@ +@@ -55,6 +55,9 @@ + #include "nocol.h" #include /* for access() defines */ #include - -+EVENT *logstr_to_event(char *s); ++#include + ++EVENT *logstr_to_event(char *s); + #ifndef SLEEPTIME # define SLEEPTIME 15 /* after each popen() */ - #endif diff --git a/net/nocol/patches/patch-netconsole_netconsole_c b/net/nocol/patches/patch-netconsole_netconsole_c index 270e52ad8f140..e9ac5973511f1 100644 --- a/net/nocol/patches/patch-netconsole_netconsole_c +++ b/net/nocol/patches/patch-netconsole_netconsole_c @@ -1,14 +1,15 @@ -$NetBSD: patch-netconsole_netconsole_c,v 1.1 2012/09/09 19:35:21 dholland Exp $ +$NetBSD: patch-netconsole_netconsole_c,v 1.2 2016/03/13 09:06:01 dholland Exp $ Use standard headers. ---- netconsole/netconsole.c~ 1999-11-01 05:39:53.000000000 +0000 +--- netconsole/netconsole.c.orig 1999-11-01 05:39:53.000000000 +0000 +++ netconsole/netconsole.c -@@ -79,6 +79,8 @@ +@@ -79,6 +79,9 @@ ** INCLUDES */ +#include ++#include + #include "netconsole.h" /* application specific */ diff --git a/net/nocol/patches/patch-netconsole_utils_c b/net/nocol/patches/patch-netconsole_utils_c index 345f2d41796be..f0ed4212290ae 100644 --- a/net/nocol/patches/patch-netconsole_utils_c +++ b/net/nocol/patches/patch-netconsole_utils_c @@ -1,13 +1,14 @@ -$NetBSD: patch-netconsole_utils_c,v 1.1 2012/09/09 19:35:21 dholland Exp $ +$NetBSD: patch-netconsole_utils_c,v 1.2 2016/03/13 09:06:01 dholland Exp $ Use standard headers. ---- netconsole/utils.c~ 2000-01-19 03:51:20.000000000 +0000 +--- netconsole/utils.c.orig 2000-01-19 03:51:20.000000000 +0000 +++ netconsole/utils.c -@@ -16,4 +16,6 @@ +@@ -16,4 +16,7 @@ #endif +#include ++#include + #include "netconsole.h" diff --git a/net/nocol/patches/patch-nsmon_nsmon.c b/net/nocol/patches/patch-nsmon_nsmon.c new file mode 100644 index 0000000000000..997e4910b7b84 --- /dev/null +++ b/net/nocol/patches/patch-nsmon_nsmon.c @@ -0,0 +1,14 @@ +$NetBSD: patch-nsmon_nsmon.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- nsmon/nsmon.c~ 1997-03-21 05:14:43.000000000 +0000 ++++ nsmon/nsmon.c +@@ -36,6 +36,7 @@ + * + */ + ++#include + #include "nsmon.h" + + /* diff --git a/net/nocol/patches/patch-ntpmon_main.c b/net/nocol/patches/patch-ntpmon_main.c new file mode 100644 index 0000000000000..b52140272e537 --- /dev/null +++ b/net/nocol/patches/patch-ntpmon_main.c @@ -0,0 +1,14 @@ +$NetBSD: patch-ntpmon_main.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- ntpmon/main.c~ 1998-06-30 20:26:16.000000000 +0000 ++++ ntpmon/main.c +@@ -26,6 +26,7 @@ + */ + + #include ++#include + #include + #include "nocol.h" + #include "ntpmon.h" diff --git a/net/nocol/patches/patch-ntpmon_ntpmon.c b/net/nocol/patches/patch-ntpmon_ntpmon.c new file mode 100644 index 0000000000000..24498a15ee2c1 --- /dev/null +++ b/net/nocol/patches/patch-ntpmon_ntpmon.c @@ -0,0 +1,14 @@ +$NetBSD: patch-ntpmon_ntpmon.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- ntpmon/ntpmon.c~ 1998-08-13 11:42:06.000000000 +0000 ++++ ntpmon/ntpmon.c +@@ -24,6 +24,7 @@ + * + */ + ++#include + #include "ntpmon.h" + int readconf(); + diff --git a/net/nocol/patches/patch-pingmon_poll__sites.c b/net/nocol/patches/patch-pingmon_poll__sites.c new file mode 100644 index 0000000000000..e192f9e3064ba --- /dev/null +++ b/net/nocol/patches/patch-pingmon_poll__sites.c @@ -0,0 +1,14 @@ +$NetBSD: patch-pingmon_poll__sites.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- pingmon/poll_sites.c~ 1998-08-31 14:44:48.000000000 +0000 ++++ pingmon/poll_sites.c +@@ -76,6 +76,7 @@ + + #include "pingmon.h" + ++#include + #include + #include + diff --git a/net/nocol/patches/patch-radiusmon_main.c b/net/nocol/patches/patch-radiusmon_main.c new file mode 100644 index 0000000000000..ef6b237cfa859 --- /dev/null +++ b/net/nocol/patches/patch-radiusmon_main.c @@ -0,0 +1,16 @@ +$NetBSD: patch-radiusmon_main.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- radiusmon/main.c~ 1999-11-15 06:43:48.000000000 +0000 ++++ radiusmon/main.c +@@ -32,7 +32,9 @@ + */ + + #include ++#include + #include ++#include + + #include "nocol.h" + #include "radiusmon.h" diff --git a/net/nocol/patches/patch-radiusmon_radiusmon.c b/net/nocol/patches/patch-radiusmon_radiusmon.c new file mode 100644 index 0000000000000..b2f2a1a44e27e --- /dev/null +++ b/net/nocol/patches/patch-radiusmon_radiusmon.c @@ -0,0 +1,15 @@ +$NetBSD: patch-radiusmon_radiusmon.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- radiusmon/radiusmon.c~ 1999-11-05 03:37:33.000000000 +0000 ++++ radiusmon/radiusmon.c +@@ -37,6 +37,8 @@ + * + */ + ++#include ++#include + #include "radiusmon.h" + + #ifdef TEST diff --git a/net/nocol/patches/patch-support_rpcping_rpcping.c b/net/nocol/patches/patch-support_rpcping_rpcping.c new file mode 100644 index 0000000000000..c7f4b2ca4cf9e --- /dev/null +++ b/net/nocol/patches/patch-support_rpcping_rpcping.c @@ -0,0 +1,15 @@ +$NetBSD: patch-support_rpcping_rpcping.c,v 1.1 2016/03/13 09:06:01 dholland Exp $ + +Use standard headers. + +--- support/rpcping/rpcping.c~ 1998-07-31 21:20:14.000000000 +0000 ++++ support/rpcping/rpcping.c +@@ -42,6 +42,8 @@ + + + #include ++#include ++#include + #include + #include + #include From 5ea6e8ef30dcb83ea615bb30c928e2ff1a8bca8d Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 13 Mar 2016 09:08:40 +0000 Subject: [PATCH 0010/2457] pkglint. XXX: this package doesn't appear to honor VARBASE. --- net/nocol/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/net/nocol/Makefile b/net/nocol/Makefile index ed130c66c15b3..fbedc0d2ceb1d 100644 --- a/net/nocol/Makefile +++ b/net/nocol/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.43 2016/03/13 08:38:54 dholland Exp $ +# $NetBSD: Makefile,v 1.44 2016/03/13 09:08:40 dholland Exp $ # DISTNAME= nocol-4.3.1 PKGREVISION= 12 CATEGORIES= net -MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/ +MASTER_SITES= http://www.netplex-tech.com/software/nocol/downloads/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.netplex-tech.com/software/nocol/ @@ -52,17 +52,18 @@ SUBST_FILES.answers= answers SUBST_VARS.answers= PREFIX PKGMANDIR FQDN pre-configure: - @${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmp - @${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmpapps - @${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmp - @${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmpapps + ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmp + ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/cmu-snmp/snmpapps + ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmp + ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/cmu-snmp/snmpapps post-install: - for f in critical.wav error.wav warning.wav ; do \ - ${INSTALL_DATA} ${WRKSRC}/webnocol/$$f ${DESTDIR}${PREFIX}/share/nocol; \ + set -e; for f in critical.wav error.wav warning.wav ; do \ + ${INSTALL_DATA} ${WRKSRC}/webnocol/$$f \ + ${DESTDIR}${PREFIX}/share/nocol; \ done - for f in bluesq.gif critical.jpg empty.gif error.jpg \ + set -e; for f in bluesq.gif critical.jpg empty.gif error.jpg \ greensq.gif help.jpg info.jpg redsq.gif warning.jpg \ yellowsq.gif ; do \ ${INSTALL_DATA} ${WRKSRC}/webnocol/gifs/$$f \ From ea115c92ae436e55576b3930ceaf8e0bec1ea209 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 09:35:59 +0000 Subject: [PATCH 0011/2457] Switch default Ruby's version to 2.2 (ruby22). --- lang/ruby/rubyversion.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index bd4a3bf0493da..55c15331b9bd9 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.158 2016/02/16 14:16:43 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.159 2016/03/13 09:35:59 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -11,7 +11,7 @@ # The preferered Ruby version to use. # # Possible values: 18 200 21 22 23 -# Default: 200 +# Default: 22 # # RUBY_BUILD_RDOC # Build rdoc of this package and so that install formated @@ -253,9 +253,9 @@ RUBY_GEMS_PKGSRC_VERS= 2.4.8 RUBY_RDOC_PKGSRC_VERS= 4.2.2 # -RUBY_VERSION_DEFAULT?= 200 +RUBY_VERSION_DEFAULT?= 22 -RUBY_VERSION_SUPPORTED?= 200 21 22 23 +RUBY_VERSION_SUPPORTED?= 22 23 21 200 .if defined(RUBY_VERSION_REQD) . for rv in ${RUBY_VERSION_SUPPORTED} From eb29132a00cbe4ae2f4d6572eb6e1d5843643c0d Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 09:36:58 +0000 Subject: [PATCH 0012/2457] Bump PKGREVISION by chaging default version of Ruby. --- mail/milter-manager/Makefile | 3 ++- misc/ec2-ami-tools/Makefile | 4 ++-- misc/tellico/Makefile | 4 ++-- multimedia/mkvtoolnix/Makefile | 4 ++-- net/dtcp/Makefile | 3 ++- security/libprelude-ruby/Makefile | 4 ++-- security/opendnssec/Makefile | 4 ++-- textproc/dbtoepub/Makefile | 3 ++- textproc/groonga/Makefile | 4 ++-- textproc/migemo-elisp/Makefile | 4 ++-- textproc/migemo/Makefile | 4 ++-- 11 files changed, 22 insertions(+), 19 deletions(-) diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile index 18fcc48dd86ef..df827b829cb9e 100644 --- a/mail/milter-manager/Makefile +++ b/mail/milter-manager/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.41 2015/03/15 20:13:24 hiramatsu Exp $ +# $NetBSD: Makefile,v 1.42 2016/03/13 09:36:58 taca Exp $ # DISTNAME= milter-manager-2.0.5 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=milter-manager/} diff --git a/misc/ec2-ami-tools/Makefile b/misc/ec2-ami-tools/Makefile index ce7a19003746c..8e2f2b63f3d5d 100644 --- a/misc/ec2-ami-tools/Makefile +++ b/misc/ec2-ami-tools/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2014/03/13 17:06:43 taca Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/13 09:36:58 taca Exp $ # PKGNAME= ec2-ami-tools-1.3.57676 DISTNAME= ec2-ami-tools-1.3-57676 -PKGREVISION= 2 +PKGREVISION= 3 .include "../../misc/ec2-api-tools/Makefile.common" diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile index b672b0a0a52be..3135fa3f51d0c 100644 --- a/misc/tellico/Makefile +++ b/misc/tellico/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.105 2016/03/05 11:28:58 jperkin Exp $ +# $NetBSD: Makefile,v 1.106 2016/03/13 09:36:58 taca Exp $ # DISTNAME= tellico-2.3.9 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= misc MASTER_SITES= http://tellico-project.org/files/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 7980e14d2fb38..d24cada4abe69 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2016/03/01 20:12:26 joerg Exp $ +# $NetBSD: Makefile,v 1.77 2016/03/13 09:36:58 taca Exp $ DISTNAME= mkvtoolnix-5.0.1 -PKGREVISION= 26 +PKGREVISION= 27 CATEGORIES= multimedia MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ EXTRACT_SUFX= .tar.bz2 diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile index ca1fae95de97b..0c58ddf2884ab 100644 --- a/net/dtcp/Makefile +++ b/net/dtcp/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2015/03/08 02:20:59 mef Exp $ +# $NetBSD: Makefile,v 1.30 2016/03/13 09:36:58 taca Exp $ # DISTNAME= dtcp-20130602 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.mahoroba.org/~ume/ipv6/ MASTER_SITES+= http://home.jp.FreeBSD.org/~ume/ipv6/ diff --git a/security/libprelude-ruby/Makefile b/security/libprelude-ruby/Makefile index 2c0be07277c1c..777a761e5bfba 100644 --- a/security/libprelude-ruby/Makefile +++ b/security/libprelude-ruby/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2015/08/23 14:30:41 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2016/03/13 09:36:59 taca Exp $ PKGNAME= libprelude-ruby-${VERSION} -PKGREVISION= 7 +PKGREVISION= 8 COMMENT= Ruby bindings to LibPrelude .include "../../security/libprelude/Makefile.common" diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile index 69ecff3ea59b3..29e1a1f5e2e88 100644 --- a/security/opendnssec/Makefile +++ b/security/opendnssec/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.54 2016/03/05 11:29:22 jperkin Exp $ +# $NetBSD: Makefile,v 1.55 2016/03/13 09:36:59 taca Exp $ # DISTNAME= opendnssec-1.4.9 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security net MASTER_SITES= http://www.opendnssec.org/files/source/ diff --git a/textproc/dbtoepub/Makefile b/textproc/dbtoepub/Makefile index 9d675b0ed2855..df3ca5954953f 100644 --- a/textproc/dbtoepub/Makefile +++ b/textproc/dbtoepub/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2015/01/16 11:47:01 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2016/03/13 09:36:59 taca Exp $ .include "../../textproc/docbook-xsl/Makefile.common" PKGNAME= dbtoepub-${DISTNAME:S/docbook-xsl-//} +PKGREVISION= 1 COMMENT= DocBook to epub converter DEPENDS+= \ diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile index d11a96a519a91..df7da9c1c5a9a 100644 --- a/textproc/groonga/Makefile +++ b/textproc/groonga/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.56 2016/03/05 11:29:33 jperkin Exp $ +# $NetBSD: Makefile,v 1.57 2016/03/13 09:36:59 taca Exp $ # DISTNAME= groonga-4.1.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://packages.groonga.org/source/groonga/ diff --git a/textproc/migemo-elisp/Makefile b/textproc/migemo-elisp/Makefile index fd1d4c6ba0130..32e97540e1f00 100644 --- a/textproc/migemo-elisp/Makefile +++ b/textproc/migemo-elisp/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.7 2013/02/17 19:18:09 dholland Exp $ +# $NetBSD: Makefile,v 1.8 2016/03/13 09:36:59 taca Exp $ .include "../../textproc/migemo/Makefile.common" PKGNAME= ${EMACS_PKGNAME_PREFIX}migemo-elisp-${MIGEMO_VERSION} -PKGREVISION= 4 +PKGREVISION= 5 COMMENT= Elisp for migemo diff --git a/textproc/migemo/Makefile b/textproc/migemo/Makefile index fff3721ad92ba..3510c6bbb376b 100644 --- a/textproc/migemo/Makefile +++ b/textproc/migemo/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2012/10/25 06:56:08 asau Exp $ +# $NetBSD: Makefile,v 1.9 2016/03/13 09:36:59 taca Exp $ .include "../../textproc/migemo/Makefile.common" PKGNAME= ${RUBY_PKGPREFIX}-migemo-${MIGEMO_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Japanese text search tool/library From ec094a3f9a16802862108bd6389efa65555e2b41 Mon Sep 17 00:00:00 2001 From: tnn Date: Sun, 13 Mar 2016 10:14:46 +0000 Subject: [PATCH 0013/2457] needs libXrandr>=1.5 --- x11/xrandr/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index 8490a301df5c9..e60131973e9ce 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2016/02/24 15:32:50 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2016/03/13 10:14:46 tnn Exp $ DISTNAME= xrandr-1.5.0 CATEGORIES= x11 @@ -21,7 +21,7 @@ SUBST_FILES.nickle= xkeystone SUBST_STAGE.nickle= post-build SUBST_MESSAGE.nickle= Fixing path to nickle. -BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.4 +BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.5 .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" From a5b056414d970f9417d07b72d5d440c5f325786e Mon Sep 17 00:00:00 2001 From: morr Date: Sun, 13 Mar 2016 11:58:43 +0000 Subject: [PATCH 0014/2457] Update to version 9.22. Changes: - NOTICE: this release updates terminfo. - add terminfo capabilities for various ctrl and shift-ctrl key variants (patch by Sebastian Schmidt). - fix longstanding core font encoding bug where some character ranges could not be mapped from unicode to the font: affected encodings are big5, gb2312, iso8859-8 (hebrew), jis0201 and ksc5601 (reported by Mikachu). - fix crash when the number of columns is 1 and a 0 width character is inserted (reported by Kuang-che Wu). - fix a crash when parsing an invalid color specification (reported by Kuang-che Wu). - fix a buffer overflow in font name parser (reported by Kuang-che Wu). - do not start blinking cursor if the window is unfocused (reported by Devin J. Pohly). - change the width of underline and i-beam cursor to 2 pixels (based on a patch by Omar Sandoval). - add pointerShape resource to change the mouse pointer shape (based on a patch by Brian Watson). - a keysym resource for a key which is already bound to an action now properly rebinds the key. - do not report mouse motion events if Shift is active (patch by Daniel Hahler). - put the alpha component last in responses to OSC color queries (patch by Benjamin Herr). - the key_press hook is now invoked before processing the event, as documented. This change was done in 9.21 but not announced and fixes debian bugs #511377, #531751 and red hat bug #1105069. Note that this change breaks a few scripts, such as mark-yank-urls, which rely on the previous buggy behaviour that urxvt processes the event (in particular keysym bindings) before invoking the hook. - the tabbed extension now properly refreshes the active tab on a key press when the mouse pointer is outside the terminal window. - add 'lookup_keysym' perl method to lookup the action bound to a key combination. - a key combination bound to 'matcher:select' can now be used to cycle through the matches in matcher. - change perl integer accessors (->width et al.) into mutators. --- x11/rxvt-unicode/Makefile | 5 ++--- x11/rxvt-unicode/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 43897b7abf9f6..838fb51f279a7 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.54 2015/06/12 10:52:19 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2016/03/13 11:58:43 morr Exp $ -DISTNAME= rxvt-unicode-9.21 -PKGREVISION= 1 +DISTNAME= rxvt-unicode-9.22 CATEGORIES= x11 MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/ \ http://dist.schmorp.de/rxvt-unicode/Attic/ diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo index 287d25d2da137..454d8eac2642b 100644 --- a/x11/rxvt-unicode/distinfo +++ b/x11/rxvt-unicode/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.27 2015/11/04 03:28:54 agc Exp $ +$NetBSD: distinfo,v 1.28 2016/03/13 11:58:43 morr Exp $ -SHA1 (rxvt-unicode-9.21.tar.bz2) = 33297e5303e45d27e07f40060d3655ae019eefdc -RMD160 (rxvt-unicode-9.21.tar.bz2) = 333d281455b7641a59d424e253832035e95b572d -SHA512 (rxvt-unicode-9.21.tar.bz2) = d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776 -Size (rxvt-unicode-9.21.tar.bz2) = 925293 bytes +SHA1 (rxvt-unicode-9.22.tar.bz2) = e575b869782fbfed955f84f48b204ec888d91ba1 +RMD160 (rxvt-unicode-9.22.tar.bz2) = 83e315f513500c2bf1f31cd4fd3854b508bc8d22 +SHA512 (rxvt-unicode-9.22.tar.bz2) = b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9 +Size (rxvt-unicode-9.22.tar.bz2) = 931198 bytes SHA1 (patch-Makefile.in) = 1c2890e2057d062f823f944fc2ecd2258f14b61e SHA1 (patch-configure) = 8b8c95ea8e39efc2fa35188798d5d3ac53e3abc1 SHA1 (patch-doc_Makefile.in) = 8465193e21878a18ae467dc50a336a65f1bd4de7 From da468634b47c1b0b490262e2b862c73b6ce6e834 Mon Sep 17 00:00:00 2001 From: morr Date: Sun, 13 Mar 2016 12:00:43 +0000 Subject: [PATCH 0015/2457] Note update of x11/rxvt-unicode --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index f6bc83a0d4e50..7c837f7155cba 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1142 2016/03/13 08:49:40 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1143 2016/03/13 12:00:43 morr Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1528,3 +1528,4 @@ Changes to the packages collection and infrastructure in 2016: Updated lang/scala to 2.11.8 [ryoon 2016-03-13] Updated devel/p5-App-cpanminus to 1.7040 [mef 2016-03-13] Updated games/lgogdownloader to 2.27 [wiz 2016-03-13] + Updated x11/rxvt-unicode to 9.22 [morr 2016-03-13] diff --git a/doc/TODO b/doc/TODO index 6f7f0fce2f905..902e3e99c4979 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15586 2016/03/13 03:55:03 mef Exp $ +$NetBSD: TODO,v 1.15587 2016/03/13 12:00:43 morr Exp $ Suggested new packages ====================== @@ -1774,7 +1774,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o ruby-stomp-1.3.5 o ruby-twitter-text-1.13.4 o rump-20131213 - o rxvt-unicode-9.22 o rubber-1.2 o ruby-actionmailer-4.2.5 o ruby-actionpack-4.2.5 From e2b9825e958ffac7803721b2c07531a8c0977fbc Mon Sep 17 00:00:00 2001 From: wen Date: Sun, 13 Mar 2016 12:54:58 +0000 Subject: [PATCH 0016/2457] Import Git-Version-Compare-1.001 as devel/p5-Git-Version-Compare. Git::Version::Compare contains a selection of subroutines that make dealing with Git-related things (like versions) a little bit easier. The strings to compare can be version numbers, tags from git.git or the output of git version or git describe. --- devel/p5-Git-Version-Compare/Makefile | 17 +++++++++++++++++ devel/p5-Git-Version-Compare/distinfo | 6 ++++++ 2 files changed, 23 insertions(+) create mode 100644 devel/p5-Git-Version-Compare/Makefile create mode 100644 devel/p5-Git-Version-Compare/distinfo diff --git a/devel/p5-Git-Version-Compare/Makefile b/devel/p5-Git-Version-Compare/Makefile new file mode 100644 index 0000000000000..5fd24e8042dc2 --- /dev/null +++ b/devel/p5-Git-Version-Compare/Makefile @@ -0,0 +1,17 @@ +# $NetBSD: Makefile,v 1.1 2016/03/13 12:54:58 wen Exp $ + +DISTNAME= Git-Version-Compare-1.001 +PKGNAME= p5-${DISTNAME} +CATEGORIES= devel perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Git/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://search.cpan.org/dist/Git-Version-Compare/ +COMMENT= Functions to compare Git versions +LICENSE= ${PERL5_LICENSE} + +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/Git/Version/Compare/.packlist + +.include "../../lang/perl5/module.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-Git-Version-Compare/distinfo b/devel/p5-Git-Version-Compare/distinfo new file mode 100644 index 0000000000000..a8de7539584bb --- /dev/null +++ b/devel/p5-Git-Version-Compare/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2016/03/13 12:54:58 wen Exp $ + +SHA1 (Git-Version-Compare-1.001.tar.gz) = ce41d55c86046df56491c05e2f03c4f9523b8362 +RMD160 (Git-Version-Compare-1.001.tar.gz) = 6e4be6d90c8a7a256b3ac3550f3a6eef6191129f +SHA512 (Git-Version-Compare-1.001.tar.gz) = a206dc18db0ce1e7d65a0ec8d74770b66ef5cd0db77dd402aa4bcc5e6126b8c78376b439b22919d6865e222ddfc59c9bad901b0b476b2a9dab57a34f33391e8e +Size (Git-Version-Compare-1.001.tar.gz) = 17313 bytes From b03c75870367694fe2b95a27f0ef58ecffc293fe Mon Sep 17 00:00:00 2001 From: wen Date: Sun, 13 Mar 2016 12:56:38 +0000 Subject: [PATCH 0017/2457] Add p5-Git-Version-Compare --- devel/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devel/Makefile b/devel/Makefile index db135c9db0e39..b2b1c1391690a 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2231 2016/03/12 09:26:51 fhajny Exp $ +# $NetBSD: Makefile,v 1.2232 2016/03/13 12:56:38 wen Exp $ # COMMENT= Development utilities @@ -1005,6 +1005,7 @@ SUBDIR+= p5-Getopt-Tabular SUBDIR+= p5-Git-CPAN-Patch SUBDIR+= p5-Git-Repository SUBDIR+= p5-Git-Repository-Plugin-AUTOLOAD +SUBDIR+= p5-Git-Version-Compare SUBDIR+= p5-Git-Wrapper SUBDIR+= p5-Glib-Object-Introspection SUBDIR+= p5-Gnome2 From 281deb3232eb8aa7a00ed776b2bfc2324f6b32da Mon Sep 17 00:00:00 2001 From: wen Date: Sun, 13 Mar 2016 12:58:27 +0000 Subject: [PATCH 0018/2457] Added devel/p5-Git-Version-Compare version 1.001 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 7c837f7155cba..cf8563c6df397 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1143 2016/03/13 12:00:43 morr Exp $ +$NetBSD: CHANGES-2016,v 1.1144 2016/03/13 12:58:27 wen Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1529,3 +1529,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/p5-App-cpanminus to 1.7040 [mef 2016-03-13] Updated games/lgogdownloader to 2.27 [wiz 2016-03-13] Updated x11/rxvt-unicode to 9.22 [morr 2016-03-13] + Added devel/p5-Git-Version-Compare version 1.001 [wen 2016-03-13] From bedc15b73fe34da181388cd827750017306646d8 Mon Sep 17 00:00:00 2001 From: wen Date: Sun, 13 Mar 2016 13:03:14 +0000 Subject: [PATCH 0019/2457] Update to 1.318 Update DEPENDS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream changes: 1.318 2016-03-12 BOOK [ENHANCEMENTS] - Extend version support to all existing version - Let Git::Version::Compare handle all version comparison code - eg/build-git can now build all Git versions since 1.0.0 [DOCUMENTATION] - Minor documentation updates - URL corrections by DOLMEN 1.317 2016-02-13 BOOK [ENHANCEMENTS] - improved git binary detection in Git::Repository::Command - fixed version comparisons for 1.0.0a and 1.0.0b under Perl 5.6 - test_repository( clone => ... ) now dies with a useful message when trying to call it with a broken Git - Git::Repository::Util provides utility functions for Git stuff - eg/build-git: a utility to build and install any Git version [DOCUMENTATION] - Tutorial entry: "Ignore the system and global configuration files" - spelling fix (RT #110027 by Gregor Herrmann) [TEST] - fix RT #89086 (reported by Alex Raguero) - new test: t/test-all-git.t to run the test suite against a directory full of git builds (if available) - tested against 513 versions of git (including all RC), from 1.0.0 to 2.7.1 1.316 2015-12-02 BOOK [ENHANCEMENTS] - avoid a warning if the filehandles have already been closed (related to System::Command 1.114 'interactive' option) [DOCUMENTATION] - add examples for `git log` and using callbacks with `$r->run` in Git::Repository::Tutorial [TESTS] - git-2.5.2 test suite compatibility fix (Petr �abata) --- devel/p5-Git-Repository/Makefile | 5 +++-- devel/p5-Git-Repository/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/devel/p5-Git-Repository/Makefile b/devel/p5-Git-Repository/Makefile index 03497be8bb129..15335c17f4d5b 100644 --- a/devel/p5-Git-Repository/Makefile +++ b/devel/p5-Git-Repository/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2015/09/01 12:21:08 mef Exp $ +# $NetBSD: Makefile,v 1.16 2016/03/13 13:03:14 wen Exp $ -DISTNAME= Git-Repository-1.315 +DISTNAME= Git-Repository-1.318 PKGNAME= p5-${DISTNAME} CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Git/} @@ -12,6 +12,7 @@ LICENSE= ${PERL5_LICENSE} DEPENDS+= git-base-[0-9]*:../../devel/git-base DEPENDS+= p5-System-Command>=1.103:../../devel/p5-System-Command +DEPENDS+= p5-Git-Version-Compare>=1.001:../../devel/p5-Git-Version-Compare USE_LANGUAGES= # empty PERL5_PACKLIST= auto/Git/Repository/.packlist diff --git a/devel/p5-Git-Repository/distinfo b/devel/p5-Git-Repository/distinfo index 14c746a6daffc..c6ea54b04404e 100644 --- a/devel/p5-Git-Repository/distinfo +++ b/devel/p5-Git-Repository/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 03:28:18 agc Exp $ +$NetBSD: distinfo,v 1.11 2016/03/13 13:03:14 wen Exp $ -SHA1 (Git-Repository-1.315.tar.gz) = afd0b2ba58f205e010922faf07840cbe6c88aa05 -RMD160 (Git-Repository-1.315.tar.gz) = 07ce50f2a44e02622ca50aa6727e201ebaafa720 -SHA512 (Git-Repository-1.315.tar.gz) = c0801acff03596b91493f9914e2c23e1ca3a3a860b368d39c3e6817954fccade8a9fd36696e6df705431244fc37b5b699ad37bd7c5adcf8099c420bd6840b5a7 -Size (Git-Repository-1.315.tar.gz) = 49089 bytes +SHA1 (Git-Repository-1.318.tar.gz) = 01211fc12bb3f5c3761fcb3fdc85556e6356b6c4 +RMD160 (Git-Repository-1.318.tar.gz) = 8eed07d98fef9138823456a76eace41ea569510a +SHA512 (Git-Repository-1.318.tar.gz) = 3e70b22ed25942abea8a6b42583ebd59a041db538e70d2d21f7b4a6a5e4d664898c7bf0095b160d43578e7be0812d871d2a104c3f629dfdc40a08b195bbe8836 +Size (Git-Repository-1.318.tar.gz) = 53573 bytes From 137d64c86c7bcc12e31b1eac1b4f402ee71f037c Mon Sep 17 00:00:00 2001 From: wen Date: Sun, 13 Mar 2016 13:04:39 +0000 Subject: [PATCH 0020/2457] Updated devel/p5-Git-Repository to 1.318 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index cf8563c6df397..a89572f36d3b2 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1144 2016/03/13 12:58:27 wen Exp $ +$NetBSD: CHANGES-2016,v 1.1145 2016/03/13 13:04:39 wen Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1530,3 +1530,4 @@ Changes to the packages collection and infrastructure in 2016: Updated games/lgogdownloader to 2.27 [wiz 2016-03-13] Updated x11/rxvt-unicode to 9.22 [morr 2016-03-13] Added devel/p5-Git-Version-Compare version 1.001 [wen 2016-03-13] + Updated devel/p5-Git-Repository to 1.318 [wen 2016-03-13] diff --git a/doc/TODO b/doc/TODO index 902e3e99c4979..931a20a1bd45f 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15587 2016/03/13 12:00:43 morr Exp $ +$NetBSD: TODO,v 1.15588 2016/03/13 13:04:39 wen Exp $ Suggested new packages ====================== @@ -1341,7 +1341,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-GStreamer-0.20 o p5-Geo-IPfree-1.151940 o p5-Git-CPAN-Patch-2.2.1 - o p5-Git-Repository-1.317 o p5-Git-Repository-Plugin-AUTOLOAD-1.002 o p5-Git-Wrapper-0.045 o p5-Glib-Object-Introspection-0.029 From 87a842796203b81a22268e9d5ff468a1b47d4ee0 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 13 Mar 2016 13:40:10 +0000 Subject: [PATCH 0021/2457] Updated pkglint to 5.3.6. Changes since 5.3.5: * Warn about !empty(${VARNAME}), which should be !empty(VARNAME) * Distinguish ${VARNAME} == "value" and ${VARNAME:Mpattern} * Corrected isQuotingNecessary for some variable types * Generally, parse files from mk/, since they define variables used by packages. This avoids wrong warnings about possible spelling mistakes. * Warn about $(VARNAME) (with parentheses instead of braces) * Warn about missing final @ in ${VAR:@var@...@} * Updated list of hardware architectures * Enabled CPU profiling on NetBSD --- pkgtools/pkglint/Makefile | 5 +- pkgtools/pkglint/files/buildlink3.go | 4 +- pkgtools/pkglint/files/main.go | 14 ++- pkgtools/pkglint/files/mkline.go | 47 ++++++-- pkgtools/pkglint/files/mkline_test.go | 13 ++- pkgtools/pkglint/files/package.go | 13 ++- pkgtools/pkglint/files/parser.go | 30 +++--- pkgtools/pkglint/files/parser_test.go | 19 +++- pkgtools/pkglint/files/vardefs.go | 18 ++-- pkgtools/pkglint/files/vartype.go | 2 +- pkgtools/pkglint/files/vartypecheck.go | 113 +++++++++++++++----- pkgtools/pkglint/files/vartypecheck_test.go | 18 ++-- 12 files changed, 208 insertions(+), 88 deletions(-) diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index 446f790b7898b..e8da3006bf384 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.482 2016/02/23 20:18:12 bsiegert Exp $ +# $NetBSD: Makefile,v 1.483 2016/03/13 13:40:10 rillig Exp $ -PKGNAME= pkglint-5.3.5 -PKGREVISION= 1 +PKGNAME= pkglint-5.3.6 DISTFILES= # none CATEGORIES= pkgtools diff --git a/pkgtools/pkglint/files/buildlink3.go b/pkgtools/pkglint/files/buildlink3.go index ab42134c7cd1a..5f93cb48d246c 100644 --- a/pkgtools/pkglint/files/buildlink3.go +++ b/pkgtools/pkglint/files/buildlink3.go @@ -118,7 +118,7 @@ func ChecklinesBuildlink3Mk(mklines *MkLines) { if varname == "BUILDLINK_ABI_DEPENDS."+pkgbase { abiLine = line - parser := NewParser(value) + parser := NewParser(line, value) if dp := parser.Dependency(); dp != nil && parser.EOF() { abi = dp } @@ -126,7 +126,7 @@ func ChecklinesBuildlink3Mk(mklines *MkLines) { } if varname == "BUILDLINK_API_DEPENDS."+pkgbase { apiLine = line - parser := NewParser(value) + parser := NewParser(line, value) if dp := parser.Dependency(); dp != nil && parser.EOF() { api = dp } diff --git a/pkgtools/pkglint/files/main.go b/pkgtools/pkglint/files/main.go index 9d39e47f869f7..959c7a851f71d 100644 --- a/pkgtools/pkglint/files/main.go +++ b/pkgtools/pkglint/files/main.go @@ -5,7 +5,6 @@ import ( "io" "os" "path/filepath" - "runtime" "runtime/pprof" ) @@ -40,14 +39,13 @@ func (pkglint *Pkglint) Main(args ...string) (exitcode int) { } if G.opts.Profiling { - if runtime.GOOS != "netbsd" { // See https://github.com/golang/go/issues/13914 - f, err := os.Create("pkglint.pprof") - if err != nil { - dummyLine.Fatalf("Cannot create profiling file: %s", err) - } - pprof.StartCPUProfile(f) - defer pprof.StopCPUProfile() + f, err := os.Create("pkglint.pprof") + if err != nil { + dummyLine.Fatalf("Cannot create profiling file: %s", err) } + pprof.StartCPUProfile(f) + defer pprof.StopCPUProfile() + G.rematch = NewHistogram() G.renomatch = NewHistogram() G.retime = NewHistogram() diff --git a/pkgtools/pkglint/files/mkline.go b/pkgtools/pkglint/files/mkline.go index aa51d9d4fe2ca..96677eb7b2165 100644 --- a/pkgtools/pkglint/files/mkline.go +++ b/pkgtools/pkglint/files/mkline.go @@ -144,7 +144,7 @@ func (mkline *MkLine) Targets() string { return mkline.xs1 } func (mkline *MkLine) Sources() string { return mkline.xs2 } func (mkline *MkLine) Tokenize(s string) { - p := NewParser(s) + p := NewParser(mkline.Line, s) p.MkTokens() if p.Rest() != "" { mkline.Error1("Invalid Makefile syntax at %q.", p.Rest()) @@ -330,24 +330,24 @@ func (mkline *MkLine) WarnVaruseLocalbase() { "(1) To locate a file or directory from another package.", "(2) To refer to own files after installation.", "", - "In the first case, the example is:", + "Example for (1):", "", " STRLIST= ${LOCALBASE}/bin/strlist", " do-build:", " cd ${WRKSRC} && ${STRLIST} *.str", "", - "This should really be:", + "This should better be:", "", " EVAL_PREFIX= STRLIST_PREFIX=strlist", " STRLIST= ${STRLIST_PREFIX}/bin/strlist", " do-build:", " cd ${WRKSRC} && ${STRLIST} *.str", "", - "In the second case, the example is:", + "Example for (2):", "", " CONFIGURE_ENV+= --with-datafiles=${LOCALBASE}/share/pkgbase", "", - "This should really be:", + "This should better be:", "", " CONFIGURE_ENV+= --with-datafiles=${PREFIX}/share/pkgbase") } @@ -816,7 +816,7 @@ func (mkline *MkLine) CheckCond() { defer tracecall0()() } - p := NewParser(mkline.Args()) + p := NewParser(mkline.Line, mkline.Args()) cond := p.MkCond() if !p.EOF() { mkline.Warn1("Invalid conditional %q.", mkline.Args()) @@ -826,6 +826,21 @@ func (mkline *MkLine) CheckCond() { cond.Visit("empty", func(node *Tree) { varuse := node.args[0].(MkVarUse) varname := varuse.varname + if matches(varname, `^\$.*:[MN]`) { + mkline.Warn0("The empty() function takes a variable name as parameter, not a variable expression.") + Explain( + "Instead of empty(${VARNAME:Mpattern}), you should write either", + "of the following:", + "", + "\tempty(VARNAME:Mpattern)", + "\t${VARNAME:Mpattern} == \"\"", + "", + "Instead of !empty(${VARNAME:Mpattern}), you should write either", + "of the following:", + "", + "\t!empty(VARNAME:Mpattern)", + "\t${VARNAME:Mpattern}") + } for _, modifier := range varuse.modifiers { if modifier[0] == 'M' || modifier[0] == 'N' { mkline.CheckVartype(varname, opUseMatch, modifier[1:], "") @@ -838,7 +853,9 @@ func (mkline *MkLine) CheckCond() { varname := varuse.varname varmods := varuse.modifiers value := node.args[2].(string) - if len(varmods) == 0 || len(varmods) == 1 && matches(varmods[0], `^[MN]`) && value != "" { + if len(varmods) == 0 { + mkline.CheckVartype(varname, opUse, value, "") + } else if len(varmods) == 1 && matches(varmods[0], `^[MN]`) && value != "" { mkline.CheckVartype(varname, opUseMatch, value, "") } }) @@ -976,21 +993,31 @@ func (mkline *MkLine) variableNeedsQuoting(varname string, vuc *VarUseContext) ( isPlainWord := vartype.checker.IsEnum() switch vartype.checker { - case CheckvarDistSuffix, + case CheckvarBuildlinkDepmethod, + CheckvarCategory, + CheckvarDistSuffix, + CheckvarEmulPlatform, CheckvarFileMode, CheckvarFilename, CheckvarIdentifier, + CheckvarInteger, CheckvarOption, CheckvarPathname, + CheckvarPerl5Packlist, CheckvarPkgName, CheckvarPkgOptionsVar, + CheckvarPkgPath, CheckvarPkgRevision, + CheckvarPrefixPathname, + CheckvarPythonDependency, CheckvarRelativePkgDir, CheckvarRelativePkgPath, + CheckvarStage, CheckvarUserGroupName, - CheckvarVarname, CheckvarVersion, - CheckvarWrkdirSubdirectory: + CheckvarWrkdirSubdirectory, + CheckvarYesNo, + CheckvarYesNoIndirectly: isPlainWord = true } if isPlainWord { diff --git a/pkgtools/pkglint/files/mkline_test.go b/pkgtools/pkglint/files/mkline_test.go index 2f71f5d066e53..baace91dfcecf 100644 --- a/pkgtools/pkglint/files/mkline_test.go +++ b/pkgtools/pkglint/files/mkline_test.go @@ -330,6 +330,18 @@ func (s *Suite) TestChecklineMkCondition(c *check.C) { NewMkLine(NewLine("fname", 1, ".if !empty(IS_BUILTIN.Xfixes:M[yY][eE][sS])", nil)).CheckCond() c.Check(s.Output(), equals, "") + + NewMkLine(NewLine("fname", 1, ".if !empty(${IS_BUILTIN.Xfixes:M[yY][eE][sS]})", nil)).CheckCond() + + c.Check(s.Output(), equals, "WARN: fname:1: The empty() function takes a variable name as parameter, not a variable expression.\n") + + NewMkLine(NewLine("fname", 1, ".if ${EMUL_PLATFORM} == \"linux-x386\"", nil)).CheckCond() + + c.Check(s.Output(), equals, "WARN: fname:1: \"x386\" is not valid for the hardware architecture part of EMUL_PLATFORM. Use one of { alpha amd64 arc arm arm32 cobalt convex dreamcast hpcmips hpcsh hppa i386 ia64 m68k m88k mips mips64 mips64eb mips64el mipseb mipsel mipsn32 ns32k pc532 pmax powerpc rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 } instead.\n") + + NewMkLine(NewLine("fname", 1, ".if ${EMUL_PLATFORM:Mlinux-x386}", nil)).CheckCond() + + c.Check(s.Output(), equals, "WARN: fname:1: The pattern \"x386\" cannot match any of { alpha amd64 arc arm arm32 cobalt convex dreamcast hpcmips hpcsh hppa i386 ia64 m68k m88k mips mips64 mips64eb mips64el mipseb mipsel mipsn32 ns32k pc532 pmax powerpc rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 } for the hardware architecture part of EMUL_PLATFORM.\n") } func (s *Suite) TestMkLine_variableNeedsQuoting(c *check.C) { @@ -435,7 +447,6 @@ func (s *Suite) TestMkLine_CheckVarusePermissions(c *check.C) { "WARN: options.mk:2: The user-defined variable GAMES_USER is used but not added to BUILD_DEFS.\n"+ "WARN: options.mk:3: PKGBASE should not be evaluated at load time.\n"+ "WARN: options.mk:4: The variable PYPKGPREFIX may not be set in this file; it would be ok in pyversion.mk.\n"+ - "WARN: options.mk:4: \"${PKGBASE}\" is not valid for PYPKGPREFIX. Use one of { py27 py33 py34 py35 } instead.\n"+ "WARN: options.mk:4: PKGBASE should not be evaluated indirectly at load time.\n"+ "NOTE: options.mk:4: This variable value should be aligned to column 17.\n") } diff --git a/pkgtools/pkglint/files/package.go b/pkgtools/pkglint/files/package.go index 4419db2009292..40232102c7a21 100644 --- a/pkgtools/pkglint/files/package.go +++ b/pkgtools/pkglint/files/package.go @@ -164,6 +164,9 @@ func checkdirPackage(pkgpath string) { } for _, fname := range files { + if containsVarRef(fname) { + continue + } if fname == G.CurrentDir+"/Makefile" { if G.opts.CheckMakefile { pkg.checkfilePackageMakefile(fname, lines) @@ -294,7 +297,8 @@ func readMakefile(fname string, mainLines *MkLines, allLines *MkLines, including G.Pkg.seenMakefileCommon = true } - if !contains(incDir, "/mk/") || strings.HasSuffix(includeFile, "/mk/haskell.mk") || contains(incDir, "/wip/mk/") { + skip := contains(fname, "/mk/") || hasSuffix(includeFile, "/bsd.pkg.mk") || hasSuffix(includeFile, "/bsd.prefs.mk") + if !skip { dirname, _ := path.Split(fname) dirname = cleanpath(dirname) @@ -389,9 +393,10 @@ func (pkg *Package) checkfilePackageMakefile(fname string, mklines *MkLines) { Warnf(fname, noLines, "No COMMENT given.") } - if vardef["USE_IMAKE"] != nil && vardef["USE_X11"] != nil { - vardef["USE_IMAKE"].Note0("USE_IMAKE makes ...") - vardef["USE_X11"].Note0("... USE_X11 superfluous.") + if imake, x11 := vardef["USE_IMAKE"], vardef["USE_X11"]; imake != nil && x11 != nil { + if !hasSuffix(x11.Line.Fname, "/mk/x11.buildlink3.mk") { + imake.Line.Note1("USE_IMAKE makes USE_X11 in %s superfluous.", x11.Line.ReferenceFrom(imake.Line)) + } } pkg.checkUpdate() diff --git a/pkgtools/pkglint/files/parser.go b/pkgtools/pkglint/files/parser.go index 0b8b3b9820634..f33bc1343c5d9 100644 --- a/pkgtools/pkglint/files/parser.go +++ b/pkgtools/pkglint/files/parser.go @@ -5,11 +5,12 @@ import ( ) type Parser struct { + line *Line repl *PrefixReplacer } -func NewParser(s string) *Parser { - return &Parser{NewPrefixReplacer(s)} +func NewParser(line *Line, s string) *Parser { + return &Parser{line, NewPrefixReplacer(s)} } func (p *Parser) EOF() bool { @@ -155,15 +156,16 @@ func (p *Parser) VarUse() *MkVarUse { mark := repl.Mark() if repl.AdvanceStr("${") || repl.AdvanceStr("$(") { - closing := "}" - if repl.Since(mark) == "$(" { - closing = ")" - } + usingRoundParen := repl.Since(mark) == "$(" + closing := ifelseStr(usingRoundParen, ")", "}") varnameMark := repl.Mark() varname := p.Varname() if varname != "" { - modifiers := p.VarUseModifiers(closing) + if usingRoundParen { + p.line.Warn1("Please use curly braces {} instead of round parentheses () for %s.", varname) + } + modifiers := p.VarUseModifiers(varname, closing) if repl.AdvanceStr(closing) { return &MkVarUse{varname, modifiers} } @@ -174,7 +176,7 @@ func (p *Parser) VarUse() *MkVarUse { rest := p.Rest() if hasPrefix(rest, ":L") || hasPrefix(rest, ":sh") || hasPrefix(rest, ":?") { varexpr := repl.Since(varnameMark) - modifiers := p.VarUseModifiers(closing) + modifiers := p.VarUseModifiers(varexpr, closing) if repl.AdvanceStr(closing) { return &MkVarUse{varexpr, modifiers} } @@ -185,7 +187,7 @@ func (p *Parser) VarUse() *MkVarUse { return nil } -func (p *Parser) VarUseModifiers(closing string) []string { +func (p *Parser) VarUseModifiers(varname, closing string) []string { repl := p.repl var modifiers []string @@ -243,12 +245,14 @@ func (p *Parser) VarUseModifiers(closing string) []string { case '@': if repl.AdvanceRegexp(`^@([\w.]+)@`) { + loopvar := repl.m[1] for p.VarUse() != nil || repl.AdvanceRegexp(`^([^$:@`+closing+`\\]|\$\$|\\.)+`) { } - if repl.AdvanceStr("@") { - modifiers = append(modifiers, repl.Since(modifierMark)) - continue + if !repl.AdvanceStr("@") { + p.line.Warn2("Modifier ${%s:@%s@...@} is missing the final \"@\".", varname, loopvar) } + modifiers = append(modifiers, repl.Since(modifierMark)) + continue } case '[': @@ -365,7 +369,7 @@ func (p *Parser) mkCondAtom() *Tree { } case repl.AdvanceRegexp(`^empty\s*\(`): if varname := p.Varname(); varname != "" { - modifiers := p.VarUseModifiers(")") + modifiers := p.VarUseModifiers(varname, ")") if repl.AdvanceStr(")") { return NewTree("empty", MkVarUse{varname, modifiers}) } diff --git a/pkgtools/pkglint/files/parser_test.go b/pkgtools/pkglint/files/parser_test.go index 72dd8b8d12fca..d094250b6826c 100644 --- a/pkgtools/pkglint/files/parser_test.go +++ b/pkgtools/pkglint/files/parser_test.go @@ -6,7 +6,7 @@ import ( func (s *Suite) TestParser_PkgbasePattern(c *check.C) { test := func(pattern, expected, rest string) { - parser := NewParser(pattern) + parser := NewParser(dummyLine, pattern) actual := parser.PkgbasePattern() c.Check(actual, equals, expected) c.Check(parser.Rest(), equals, rest) @@ -22,7 +22,7 @@ func (s *Suite) TestParser_PkgbasePattern(c *check.C) { func (s *Suite) TestParser_Dependency(c *check.C) { testDependencyRest := func(pattern string, expected DependencyPattern, rest string) { - parser := NewParser(pattern) + parser := NewParser(dummyLine, pattern) dp := parser.Dependency() if c.Check(dp, check.NotNil) { c.Check(*dp, equals, expected) @@ -53,7 +53,7 @@ func (s *Suite) TestParser_Dependency(c *check.C) { func (s *Suite) TestParser_MkTokens(c *check.C) { parse := func(input string, expectedTokens []*MkToken, expectedRest string) { - p := NewParser(input) + p := NewParser(dummyLine, input) actualTokens := p.MkTokens() c.Check(actualTokens, deepEquals, expectedTokens) for i, expectedToken := range expectedTokens { @@ -109,7 +109,6 @@ func (s *Suite) TestParser_MkTokens(c *check.C) { token("${_PERL5_VARS_OUT:M${_var_:tl}=*:S/^${_var_:tl}=${_PERL5_PREFIX:=/}//}", varuse("_PERL5_VARS_OUT", "M${_var_:tl}=*", "S/^${_var_:tl}=${_PERL5_PREFIX:=/}//")) token("${RUBY${RUBY_VER}_PATCHLEVEL}", varuse("RUBY${RUBY_VER}_PATCHLEVEL")) token("${DISTFILES:M*.gem}", varuse("DISTFILES", "M*.gem")) - token("$(GNUSTEP_USER_ROOT)", varuse("GNUSTEP_USER_ROOT")) token("${LOCALBASE:S^/^_^}", varuse("LOCALBASE", "S^/^_^")) token("${SOURCES:%.c=%.o}", varuse("SOURCES", "%.c=%.o")) token("${GIT_TEMPLATES:@.t.@ ${EGDIR}/${GIT_TEMPLATEDIR}/${.t.} ${PREFIX}/${GIT_CORE_TEMPLATEDIR}/${.t.} @:M*}", @@ -135,13 +134,21 @@ func (s *Suite) TestParser_MkTokens(c *check.C) { token("${VAR:ts\\000012}", varuse("VAR", "ts\\000012")) // The separator character can be a long octal number. token("${VAR:ts\\124}", varuse("VAR", "ts\\124")) // Or even decimal. + token("$(GNUSTEP_USER_ROOT)", varuse("GNUSTEP_USER_ROOT")) + c.Check(s.Output(), equals, "WARN: Please use curly braces {} instead of round parentheses () for GNUSTEP_USER_ROOT.\n") + parse("${VAR)", nil, "${VAR)") // Opening brace, closing parenthesis parse("$(VAR}", nil, "$(VAR}") // Opening parenthesis, closing brace + c.Check(s.Output(), equals, "WARN: Please use curly braces {} instead of round parentheses () for VAR.\n") + + token("${PLIST_SUBST_VARS:@var@${var}=${${var}:Q}@}", varuse("PLIST_SUBST_VARS", "@var@${var}=${${var}:Q}@")) + token("${PLIST_SUBST_VARS:@var@${var}=${${var}:Q}}", varuse("PLIST_SUBST_VARS", "@var@${var}=${${var}:Q}")) // Missing @ at the end + c.Check(s.Output(), equals, "WARN: Modifier ${PLIST_SUBST_VARS:@var@...@} is missing the final \"@\".\n") } func (s *Suite) TestParser_MkCond_Basics(c *check.C) { condrest := func(input string, expectedTree *Tree, expectedRest string) { - p := NewParser(input) + p := NewParser(dummyLine, input) actualTree := p.MkCond() c.Check(actualTree, deepEquals, expectedTree) c.Check(p.Rest(), equals, expectedRest) @@ -209,6 +216,8 @@ func (s *Suite) TestParser_MkCond_Basics(c *check.C) { NewTree("compareVarNum", varuse("OS_VERSION"), ">=", "6.5")) cond("${OS_VERSION} == 5.3", NewTree("compareVarNum", varuse("OS_VERSION"), "==", "5.3")) + cond("!empty(${OS_VARIANT:MIllumos})", // Probably not intended + NewTree("not", NewTree("empty", varuse("${OS_VARIANT:MIllumos}")))) // Errors condrest("!empty(PKG_OPTIONS:Msndfile) || defined(PKG_OPTIONS:Msamplerate)", diff --git a/pkgtools/pkglint/files/vardefs.go b/pkgtools/pkglint/files/vardefs.go index 3352c07ee9119..394ebaa6676fe 100644 --- a/pkgtools/pkglint/files/vardefs.go +++ b/pkgtools/pkglint/files/vardefs.go @@ -118,8 +118,8 @@ func (gd *GlobalData) InitVartypes() { pkg("BOOTSTRAP_PKG", lkNone, CheckvarYesNo) acl("BROKEN", lkNone, CheckvarMessage, "") pkg("BROKEN_GETTEXT_DETECTION", lkNone, CheckvarYesNo) - pkglist("BROKEN_EXCEPT_ON_PLATFORM", lkShell, CheckvarPlatformTriple) - pkglist("BROKEN_ON_PLATFORM", lkSpace, CheckvarPlatformTriple) + pkglist("BROKEN_EXCEPT_ON_PLATFORM", lkShell, CheckvarPlatformPattern) + pkglist("BROKEN_ON_PLATFORM", lkSpace, CheckvarPlatformPattern) sys("BSD_MAKE_ENV", lkShell, CheckvarShellWord) acl("BUILDLINK_ABI_DEPENDS.*", lkSpace, CheckvarDependency, "*: append") acl("BUILDLINK_API_DEPENDS.*", lkSpace, CheckvarDependency, "*: append") @@ -334,8 +334,8 @@ func (gd *GlobalData) InitVartypes() { pkglist("HEADER_TEMPLATES", lkShell, CheckvarPathname) pkg("HOMEPAGE", lkNone, CheckvarURL) acl("IGNORE_PKG.*", lkNone, CheckvarYes, "*: set, use-loadtime") - acl("INCOMPAT_CURSES", lkSpace, CheckvarPlatformTriple, "Makefile: set, append") - acl("INCOMPAT_ICONV", lkSpace, CheckvarPlatformTriple, "") + acl("INCOMPAT_CURSES", lkSpace, CheckvarPlatformPattern, "Makefile: set, append") + acl("INCOMPAT_ICONV", lkSpace, CheckvarPlatformPattern, "") acl("INFO_DIR", lkNone, CheckvarPathname, "") // relative to PREFIX pkg("INFO_FILES", lkNone, CheckvarYes) sys("INSTALL", lkNone, CheckvarShellCommand) @@ -392,7 +392,7 @@ func (gd *GlobalData) InitVartypes() { sys("LOWER_OPSYS", lkNone, CheckvarIdentifier) acl("LTCONFIG_OVERRIDE", lkShell, CheckvarPathmask, "Makefile: set, append; Makefile.common: append") sys("MACHINE_ARCH", lkNone, CheckvarIdentifier) - sys("MACHINE_GNU_PLATFORM", lkNone, CheckvarPlatformTriple) + sys("MACHINE_GNU_PLATFORM", lkNone, CheckvarPlatformPattern) // This one is actually not a pattern acl("MAINTAINER", lkNone, CheckvarMailAddress, "Makefile: set; Makefile.common: default") sys("MAKE", lkNone, CheckvarShellCommand) pkglist("MAKEFLAGS", lkShell, CheckvarShellWord) @@ -451,7 +451,7 @@ func (gd *GlobalData) InitVartypes() { sys("NM", lkNone, CheckvarShellCommand) sys("NONBINMODE", lkNone, CheckvarFileMode) pkg("NOT_FOR_COMPILER", lkShell, enum("ccache ccc clang distcc f2c gcc hp icc ido mipspro mipspro-ucode pcc sunpro xlc")) - pkglist("NOT_FOR_PLATFORM", lkSpace, CheckvarPlatformTriple) + pkglist("NOT_FOR_PLATFORM", lkSpace, CheckvarPlatformPattern) pkg("NOT_FOR_UNPRIVILEGED", lkNone, CheckvarYesNo) acl("NO_BIN_ON_CDROM", lkNone, CheckvarRestricted, "Makefile, Makefile.common: set") acl("NO_BIN_ON_FTP", lkNone, CheckvarRestricted, "Makefile, Makefile.common: set") @@ -465,7 +465,7 @@ func (gd *GlobalData) InitVartypes() { acl("NO_SRC_ON_CDROM", lkNone, CheckvarRestricted, "Makefile, Makefile.common: set") acl("NO_SRC_ON_FTP", lkNone, CheckvarRestricted, "Makefile, Makefile.common: set") pkglist("ONLY_FOR_COMPILER", lkShell, enum("ccc clang gcc hp icc ido mipspro mipspro-ucode pcc sunpro xlc")) - pkglist("ONLY_FOR_PLATFORM", lkSpace, CheckvarPlatformTriple) + pkglist("ONLY_FOR_PLATFORM", lkSpace, CheckvarPlatformPattern) pkg("ONLY_FOR_UNPRIVILEGED", lkNone, CheckvarYesNo) sys("OPSYS", lkNone, CheckvarIdentifier) acl("OPSYSVARS", lkShell, CheckvarVarname, "Makefile, Makefile.common: append") @@ -537,7 +537,7 @@ func (gd *GlobalData) InitVartypes() { acl("PKG_HACKS", lkShell, CheckvarIdentifier, "hacks.mk: append") sys("PKG_INFO", lkNone, CheckvarShellCommand) sys("PKG_JAVA_HOME", lkNone, CheckvarPathname) - jvms := enum("blackdown-jdk13 jdk jdk14 kaffe run-jdk13 sun-jdk14 sun-jdk15 sun-jdk6 openjdk7 openjdk7-bin sun-jdk7 openjdk8 oracle-jdk8") + jvms := enum("openjdk8 oracle-jdk8 openjdk7 sun-jdk7 sun-jdk6 jdk16 jdk15 kaffe") // See mk/java-vm.mk:/_PKG_JVMS/ sys("PKG_JVM", lkNone, jvms) acl("PKG_JVMS_ACCEPTED", lkShell, jvms, "Makefile: set; Makefile.common: default, set") usr("PKG_JVM_DEFAULT", lkNone, jvms) @@ -724,7 +724,7 @@ func enum(values string) *VarChecker { return } - if !vmap[cv.value] { + if cv.value == cv.valueNovar && !vmap[cv.value] { cv.line.Warnf("%q is not valid for %s. Use one of { %s } instead.", cv.value, cv.varname, values) } }} diff --git a/pkgtools/pkglint/files/vartype.go b/pkgtools/pkglint/files/vartype.go index 686565e8ddaee..f88e548d5c37d 100644 --- a/pkgtools/pkglint/files/vartype.go +++ b/pkgtools/pkglint/files/vartype.go @@ -179,7 +179,7 @@ var ( CheckvarPkgPath = &VarChecker{"PkgPath", (*VartypeCheck).PkgPath} CheckvarPkgOptionsVar = &VarChecker{"PkgOptionsVar", (*VartypeCheck).PkgOptionsVar} CheckvarPkgRevision = &VarChecker{"PkgRevision", (*VartypeCheck).PkgRevision} - CheckvarPlatformTriple = &VarChecker{"PlatformTriple", (*VartypeCheck).PlatformTriple} + CheckvarPlatformPattern = &VarChecker{"PlatformPattern", (*VartypeCheck).PlatformPattern} CheckvarPrefixPathname = &VarChecker{"PrefixPathname", (*VartypeCheck).PrefixPathname} CheckvarPythonDependency = &VarChecker{"PythonDependency", (*VartypeCheck).PythonDependency} CheckvarRelativePkgDir = &VarChecker{"RelativePkgDir", (*VartypeCheck).RelativePkgDir} diff --git a/pkgtools/pkglint/files/vartypecheck.go b/pkgtools/pkglint/files/vartypecheck.go index a91a1ce372dfd..bcf2deb5734aa 100644 --- a/pkgtools/pkglint/files/vartypecheck.go +++ b/pkgtools/pkglint/files/vartypecheck.go @@ -50,6 +50,26 @@ func (op MkOperator) String() string { return [...]string{"=", "!=", ":=", "+=", "?=", "use", "use-loadtime", "use-match"}[op] } +const ( + reEmulPlatform = "" + + "bitrig|bsdos|cygwin|darwin|dragonfly|freebsd|" + + "haiku|hpux|interix|irix|linux|mirbsd|netbsd|openbsd|osf1|solaris" + rePlatformOs = "" + + "Bitrig|BSDOS|Cygwin|Darwin|DragonFly|FreeBSD|" + + "Haiku|HPUX|Interix|IRIX|Linux|MirBSD|NetBSD|OpenBSD|OSF1|QNX|SunOS" + rePlatformArch = "" + + "alpha|amd64|arc|arm|arm32|cobalt|convex|dreamcast|" + + "hpcmips|hpcsh|hppa|i386|ia64|" + + "m68k|m88k|mips|mips64|mips64eb|mips64el|mipseb|mipsel|mipsn32|" + + "ns32k|pc532|pmax|powerpc|rs6000|s390|sh3eb|sh3el|sparc|sparc64|vax|x86_64" +) + +var ( + emulPlatformEnum = enum(strings.Replace(reEmulPlatform, "|", " ", -1)) + platformOsEnum = enum(strings.Replace(rePlatformOs, "|", " ", -1)) + platformArchEnum = enum(strings.Replace(rePlatformArch, "|", " ", -1)) +) + func (cv *VartypeCheck) AwkCommand() { if G.opts.DebugUnchecked { cv.line.Debug1("Unchecked AWK command: %q", cv.value) @@ -137,7 +157,7 @@ func (cv *VartypeCheck) Comment() { func (cv *VartypeCheck) Dependency() { line, value := cv.line, cv.value - parser := NewParser(value) + parser := NewParser(line, value) deppat := parser.Dependency() if deppat != nil && deppat.wildcard == "" && (parser.Rest() == "{,nb*}" || parser.Rest() == "{,nb[0-9]*}") { line.Warn0("Dependency patterns of the form pkgbase>=1.0 don't need the \"{,nb*}\" extension.") @@ -243,16 +263,34 @@ func (cv *VartypeCheck) DistSuffix() { } func (cv *VartypeCheck) EmulPlatform() { + const rePart = `(?:\[[^\]]+\]|[^-\[])+` + const rePair = `^(` + rePart + `)-(` + rePart + `)$` + if m, opsysPattern, archPattern := match2(cv.value, rePair); m { + opsysCv := &VartypeCheck{ + cv.mkline, + cv.line, + "the operating system part of " + cv.varname, + cv.op, + opsysPattern, + opsysPattern, + cv.comment, + cv.listContext, + cv.guessed} + emulPlatformEnum.checker(opsysCv) - if m, opsys, arch := match2(cv.value, `^(\w+)-(\w+)$`); m { - if !matches(opsys, `^(?:bitrig|bsdos|cygwin|darwin|dragonfly|freebsd|haiku|hpux|interix|irix|linux|mirbsd|netbsd|openbsd|osf1|sunos|solaris)$`) { - cv.line.Warn1("Unknown operating system: %s", opsys) - } // no check for os_version - if !matches(arch, `^(?:i386|alpha|amd64|arc|arm|arm32|cobalt|convex|dreamcast|hpcmips|hpcsh|hppa|ia64|m68k|m88k|mips|mips64|mipsel|mipseb|mipsn32|ns32k|pc532|pmax|powerpc|rs6000|s390|sparc|sparc64|vax|x86_64)$`) { - cv.line.Warn1("Unknown hardware architecture: %s", arch) - } + archCv := &VartypeCheck{ + cv.mkline, + cv.line, + "the hardware architecture part of " + cv.varname, + cv.op, + archPattern, + archPattern, + cv.comment, + cv.listContext, + cv.guessed} + platformArchEnum.checker(archCv) } else { cv.line.Warn1("%q is not a valid emulation platform.", cv.value) Explain( @@ -260,7 +298,9 @@ func (cv *VartypeCheck) EmulPlatform() { "OPSYS is the lower-case name of the operating system, and", "MACHINE_ARCH is the hardware architecture.", "", - "Examples: linux-i386, irix-mipsel.") + "Examples:", + "* linux-i386", + "* irix-mipsel") } } @@ -535,31 +575,54 @@ func (cv *VartypeCheck) PkgRevision() { } } -func (cv *VartypeCheck) PlatformTriple() { +func (cv *VartypeCheck) PlatformPattern() { if cv.value != cv.valueNovar { return } - rePart := `(?:\[[^\]]+\]|[^-\[])+` - reTriple := `^(` + rePart + `)-(` + rePart + `)-(` + rePart + `)$` - if m, opsys, _, arch := match3(cv.value, reTriple); m { - if !matches(opsys, `^(?:\*|Bitrig|BSDOS|Cygwin|Darwin|DragonFly|FreeBSD|Haiku|HPUX|Interix|IRIX|Linux|MirBSD|NetBSD|OpenBSD|OSF1|QNX|SunOS)$`) { - cv.line.Warn1("Unknown operating system: %s", opsys) - } + const rePart = `(?:\[[^\]]+\]|[^-\[])+` + const reTriple = `^(` + rePart + `)-(` + rePart + `)-(` + rePart + `)$` + if m, opsysPattern, _, archPattern := match3(cv.value, reTriple); m { + opsysCv := &VartypeCheck{ + cv.mkline, + cv.line, + "the operating system part of " + cv.varname, + opUseMatch, // Always allow patterns, since this is a PlatformPattern. + opsysPattern, + opsysPattern, + cv.comment, + cv.listContext, + cv.guessed} + platformOsEnum.checker(opsysCv) + // no check for os_version - if !matches(arch, `^(?:\*|i386|alpha|amd64|arc|arm|arm32|cobalt|convex|dreamcast|hpcmips|hpcsh|hppa|ia64|m68k|m88k|mips|mips64|mipsel|mipseb|mipsn32|ns32k|pc532|pmax|powerpc|rs6000|s390|sparc|sparc64|vax|x86_64)$`) { - cv.line.Warn1("Unknown hardware architecture: %s", arch) - } + + archCv := &VartypeCheck{ + cv.mkline, + cv.line, + "the hardware architecture part of " + cv.varname, + opUseMatch, // Always allow patterns, since this is a PlatformPattern. + archPattern, + archPattern, + cv.comment, + cv.listContext, + cv.guessed} + platformArchEnum.checker(archCv) } else { - cv.line.Warn1("%q is not a valid platform triple.", cv.value) - Explain3( - "A platform triple has the form --.", + cv.line.Warn1("%q is not a valid platform pattern.", cv.value) + Explain( + "A platform pattern has the form --.", "Each of these components may be a shell globbing expression.", - "Examples: NetBSD-*-i386, *-*-*, Linux-*-*.") + "", + "Examples:", + "* NetBSD-[456].*-i386", + "* *-*-*", + "* Linux-*-*") } } +// A pathname relative to ${PREFIX}. func (cv *VartypeCheck) PrefixPathname() { if m, mansubdir := match1(cv.value, `^man/(.+)`); m { cv.line.Warn2("Please use \"${PKGMANDIR}/%s\" instead of %q.", mansubdir, cv.value) @@ -579,12 +642,12 @@ func (cv *VartypeCheck) PythonDependency() { } } -// Refers to a package directory. +// Refers to a package directory, e.g. ../../category/pkgbase. func (cv *VartypeCheck) RelativePkgDir() { cv.mkline.CheckRelativePkgdir(cv.value) } -// Refers to a file or directory. +// Refers to a file or directory, e.g. ../../category/pkgbase, ../../category/pkgbase/Makefile. func (cv *VartypeCheck) RelativePkgPath() { cv.mkline.CheckRelativePath(cv.value, true) } diff --git a/pkgtools/pkglint/files/vartypecheck_test.go b/pkgtools/pkglint/files/vartypecheck_test.go index 4cf8a54c4f7b8..dcd0615fe32d3 100644 --- a/pkgtools/pkglint/files/vartypecheck_test.go +++ b/pkgtools/pkglint/files/vartypecheck_test.go @@ -166,8 +166,8 @@ func (s *Suite) TestVartypeCheck_EmulPlatform(c *check.C) { "${LINUX}") c.Check(s.Output(), equals, ""+ - "WARN: fname:2: Unknown operating system: nextbsd\n"+ - "WARN: fname:2: Unknown hardware architecture: 8087\n"+ + "WARN: fname:2: \"nextbsd\" is not valid for the operating system part of EMUL_PLATFORM. Use one of { bitrig bsdos cygwin darwin dragonfly freebsd haiku hpux interix irix linux mirbsd netbsd openbsd osf1 solaris } instead.\n"+ + "WARN: fname:2: \"8087\" is not valid for the hardware architecture part of EMUL_PLATFORM. Use one of { alpha amd64 arc arm arm32 cobalt convex dreamcast hpcmips hpcsh hppa i386 ia64 m68k m88k mips mips64 mips64eb mips64el mipseb mipsel mipsn32 ns32k pc532 pmax powerpc rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 } instead.\n"+ "WARN: fname:3: \"${LINUX}\" is not a valid emulation platform.\n") } @@ -287,16 +287,20 @@ func (s *Suite) TestVartypeCheck_PkgRevision(c *check.C) { c.Check(s.Output(), equals, "") } -func (s *Suite) TestVartypeCheck_PlatformTriple(c *check.C) { - runVartypeChecks("ONLY_FOR_PLATFORM", opAssign, (*VartypeCheck).PlatformTriple, +func (s *Suite) TestVartypeCheck_PlatformPattern(c *check.C) { + runVartypeMatchChecks("ONLY_FOR_PLATFORM", (*VartypeCheck).PlatformPattern, "linux-i386", "nextbsd-5.0-8087", + "netbsd-7.0-l*", + "NetBSD-1.6.2-i386", "${LINUX}") c.Check(s.Output(), equals, ""+ - "WARN: fname:1: \"linux-i386\" is not a valid platform triple.\n"+ - "WARN: fname:2: Unknown operating system: nextbsd\n"+ - "WARN: fname:2: Unknown hardware architecture: 8087\n") + "WARN: fname:1: \"linux-i386\" is not a valid platform pattern.\n"+ + "WARN: fname:2: The pattern \"nextbsd\" cannot match any of { Bitrig BSDOS Cygwin Darwin DragonFly FreeBSD Haiku HPUX Interix IRIX Linux MirBSD NetBSD OpenBSD OSF1 QNX SunOS } for the operating system part of ONLY_FOR_PLATFORM.\n"+ + "WARN: fname:2: The pattern \"8087\" cannot match any of { alpha amd64 arc arm arm32 cobalt convex dreamcast hpcmips hpcsh hppa i386 ia64 m68k m88k mips mips64 mips64eb mips64el mipseb mipsel mipsn32 ns32k pc532 pmax powerpc rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 } for the hardware architecture part of ONLY_FOR_PLATFORM.\n"+ + "WARN: fname:3: The pattern \"netbsd\" cannot match any of { Bitrig BSDOS Cygwin Darwin DragonFly FreeBSD Haiku HPUX Interix IRIX Linux MirBSD NetBSD OpenBSD OSF1 QNX SunOS } for the operating system part of ONLY_FOR_PLATFORM.\n"+ + "WARN: fname:3: The pattern \"l*\" cannot match any of { alpha amd64 arc arm arm32 cobalt convex dreamcast hpcmips hpcsh hppa i386 ia64 m68k m88k mips mips64 mips64eb mips64el mipseb mipsel mipsn32 ns32k pc532 pmax powerpc rs6000 s390 sh3eb sh3el sparc sparc64 vax x86_64 } for the hardware architecture part of ONLY_FOR_PLATFORM.\n") } func (s *Suite) TestVartypeCheck_PythonDependency(c *check.C) { From 2a0e08bc6d3b4f2750159f9547da204f881270e5 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 13 Mar 2016 13:42:51 +0000 Subject: [PATCH 0022/2457] Updated pkgtools/pkglint to 5.3.6 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index a89572f36d3b2..023895a47e86f 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1145 2016/03/13 13:04:39 wen Exp $ +$NetBSD: CHANGES-2016,v 1.1146 2016/03/13 13:42:51 rillig Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1531,3 +1531,4 @@ Changes to the packages collection and infrastructure in 2016: Updated x11/rxvt-unicode to 9.22 [morr 2016-03-13] Added devel/p5-Git-Version-Compare version 1.001 [wen 2016-03-13] Updated devel/p5-Git-Repository to 1.318 [wen 2016-03-13] + Updated pkgtools/pkglint to 5.3.6 [rillig 2016-03-13] From 3b88d63a02d1d181f40c37fdb15dbc918a153a75 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:26:51 +0000 Subject: [PATCH 0023/2457] Delete ruby-debugger, ruby-debugger-linecache and ruby-debugger-ruby_core_source. --- devel/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index b2b1c1391690a..b6a84b1a4259c 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2232 2016/03/13 12:56:38 wen Exp $ +# $NetBSD: Makefile,v 1.2233 2016/03/13 15:26:51 taca Exp $ # COMMENT= Development utilities @@ -1905,9 +1905,6 @@ SUBDIR+= ruby-cmd SUBDIR+= ruby-curses SUBDIR+= ruby-curses-gem SUBDIR+= ruby-daemon_controller -SUBDIR+= ruby-debugger -SUBDIR+= ruby-debugger-linecache -SUBDIR+= ruby-debugger-ruby_core_source SUBDIR+= ruby-delayer SUBDIR+= ruby-delayer-deferred SUBDIR+= ruby-deprecated From c419bbb6fc1438458eeee633c71e3448000e22b6 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:28:05 +0000 Subject: [PATCH 0024/2457] Remove ruby-debugger, it dose not catch up to Ruby 2.1 and later. --- devel/ruby-debugger/DESCR | 5 - devel/ruby-debugger/Makefile | 21 ---- devel/ruby-debugger/PLIST | 205 ----------------------------------- devel/ruby-debugger/distinfo | 6 - 4 files changed, 237 deletions(-) delete mode 100644 devel/ruby-debugger/DESCR delete mode 100644 devel/ruby-debugger/Makefile delete mode 100644 devel/ruby-debugger/PLIST delete mode 100644 devel/ruby-debugger/distinfo diff --git a/devel/ruby-debugger/DESCR b/devel/ruby-debugger/DESCR deleted file mode 100644 index 625498bc2d7ca..0000000000000 --- a/devel/ruby-debugger/DESCR +++ /dev/null @@ -1,5 +0,0 @@ -debugger is a fast implementation of the standard Ruby debugger debug.rb. - -It is implemented by utilizing a new Ruby C API hook. The core component -provides support that front-ends can build on. It provides breakpoint -handling, bindings for stack frames among other things. diff --git a/devel/ruby-debugger/Makefile b/devel/ruby-debugger/Makefile deleted file mode 100644 index a7960638547d0..0000000000000 --- a/devel/ruby-debugger/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: Makefile,v 1.7 2015/12/27 12:06:16 taca Exp $ - -DISTNAME= debugger-1.6.8 -PKGREVISION= 1 -CATEGORIES= devel - -MAINTAINER= taca@NetBSD.org -HOMEPAGE= https://github.com/cldwalker/debugger -COMMENT= Fast Ruby debugger - base + cli -LICENSE= mit - -DEPENDS+= ${RUBY_PKGPREFIX}-columnize>=0.3.1:../../misc/ruby-columnize -DEPENDS+= ${RUBY_PKGPREFIX}-debugger-ruby_core_source>=1.3.5<1.4:../../devel/ruby-debugger-ruby_core_source -DEPENDS+= ${RUBY_PKGPREFIX}-debugger-linecache>=1.2.0<1.3:../../devel/ruby-debugger-linecache - -BUILDLINK_PASSTHRU_DIRS+= ${PREFIX}/${GEM_HOME}/gems - -RUBY_VERSION_SUPPORTED= 200 - -.include "../../lang/ruby/gem.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-debugger/PLIST b/devel/ruby-debugger/PLIST deleted file mode 100644 index 9b6528a547ac5..0000000000000 --- a/devel/ruby-debugger/PLIST +++ /dev/null @@ -1,205 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2015/02/04 13:39:43 taca Exp $ -bin/rdebug -${GEM_HOME}/cache/${GEM_NAME}.gem -${GEM_LIBDIR}/.gitignore -${GEM_LIBDIR}/.travis.yml -${GEM_LIBDIR}/AUTHORS -${GEM_LIBDIR}/CHANGELOG.md -${GEM_LIBDIR}/CONTRIBUTING.md -${GEM_LIBDIR}/Gemfile -${GEM_LIBDIR}/LICENSE -${GEM_LIBDIR}/OLDER_CHANGELOG -${GEM_LIBDIR}/OLD_CHANGELOG -${GEM_LIBDIR}/OLD_README -${GEM_LIBDIR}/README.md -${GEM_LIBDIR}/Rakefile -${GEM_LIBDIR}/bin/rdebug -${GEM_LIBDIR}/debugger.gemspec -${GEM_LIBDIR}/doc/.cvsignore -${GEM_LIBDIR}/doc/Makefile.am -${GEM_LIBDIR}/doc/emacs-notes.txt -${GEM_LIBDIR}/doc/hanoi.rb -${GEM_LIBDIR}/doc/primes.rb -${GEM_LIBDIR}/doc/rdebug-emacs.texi -${GEM_LIBDIR}/doc/ruby-debug.texi -${GEM_LIBDIR}/doc/test-tri2.rb -${GEM_LIBDIR}/doc/tri3.rb -${GEM_LIBDIR}/doc/triangle.rb -${GEM_LIBDIR}/emacs/Makefile.am -${GEM_LIBDIR}/emacs/rdebug-annotate.el -${GEM_LIBDIR}/emacs/rdebug-breaks.el -${GEM_LIBDIR}/emacs/rdebug-cmd.el -${GEM_LIBDIR}/emacs/rdebug-core.el -${GEM_LIBDIR}/emacs/rdebug-dbg.el -${GEM_LIBDIR}/emacs/rdebug-error.el -${GEM_LIBDIR}/emacs/rdebug-fns.el -${GEM_LIBDIR}/emacs/rdebug-frames.el -${GEM_LIBDIR}/emacs/rdebug-gud.el -${GEM_LIBDIR}/emacs/rdebug-help.el -${GEM_LIBDIR}/emacs/rdebug-info.el -${GEM_LIBDIR}/emacs/rdebug-layouts.el -${GEM_LIBDIR}/emacs/rdebug-locring.el -${GEM_LIBDIR}/emacs/rdebug-output.el -${GEM_LIBDIR}/emacs/rdebug-regexp.el -${GEM_LIBDIR}/emacs/rdebug-secondary.el -${GEM_LIBDIR}/emacs/rdebug-shortkey.el -${GEM_LIBDIR}/emacs/rdebug-source.el -${GEM_LIBDIR}/emacs/rdebug-track.el -${GEM_LIBDIR}/emacs/rdebug-varbuf.el -${GEM_LIBDIR}/emacs/rdebug-vars.el -${GEM_LIBDIR}/emacs/rdebug-watch.el -${GEM_LIBDIR}/emacs/rdebug.el -${GEM_LIBDIR}/emacs/test/elk-test.el -${GEM_LIBDIR}/emacs/test/test-annotate.el -${GEM_LIBDIR}/emacs/test/test-cmd.el -${GEM_LIBDIR}/emacs/test/test-core.el -${GEM_LIBDIR}/emacs/test/test-fns.el -${GEM_LIBDIR}/emacs/test/test-frames.el -${GEM_LIBDIR}/emacs/test/test-gud.el -${GEM_LIBDIR}/emacs/test/test-indent.el -${GEM_LIBDIR}/emacs/test/test-regexp.el -${GEM_LIBDIR}/emacs/test/test-shortkey.el -${GEM_LIBDIR}/ext/ruby_debug/192/breakpoint.c -${GEM_LIBDIR}/ext/ruby_debug/192/ruby_debug.c -${GEM_LIBDIR}/ext/ruby_debug/192/ruby_debug.h -${GEM_LIBDIR}/ext/ruby_debug/193/breakpoint.c -${GEM_LIBDIR}/ext/ruby_debug/193/ruby_debug.c -${GEM_LIBDIR}/ext/ruby_debug/193/ruby_debug.h -${GEM_LIBDIR}/ext/ruby_debug/200/breakpoint.c -${GEM_LIBDIR}/ext/ruby_debug/200/ruby_debug.c -${GEM_LIBDIR}/ext/ruby_debug/200/ruby_debug.h -${GEM_LIBDIR}/ext/ruby_debug/210/breakpoint.c -${GEM_LIBDIR}/ext/ruby_debug/210/ruby_debug.c -${GEM_LIBDIR}/ext/ruby_debug/210/ruby_debug.h -${GEM_LIBDIR}/ext/ruby_debug/211/breakpoint.c -${GEM_LIBDIR}/ext/ruby_debug/211/ruby_debug.c -${GEM_LIBDIR}/ext/ruby_debug/211/ruby_debug.h -${GEM_LIBDIR}/ext/ruby_debug/extconf.rb -${GEM_LIBDIR}/lib/debugger.rb -${GEM_LIBDIR}/lib/debugger/test.rb -${GEM_LIBDIR}/lib/debugger/test/breakpoint.rb -${GEM_LIBDIR}/lib/debugger/test/context.rb -${GEM_LIBDIR}/lib/debugger/test/matchers.rb -${GEM_LIBDIR}/lib/debugger/test/mocha_extensions.rb -${GEM_LIBDIR}/lib/debugger/test/printer_helpers.rb -${GEM_LIBDIR}/lib/debugger/test/processor.rb -${GEM_LIBDIR}/lib/debugger/test/test_dsl.rb -${GEM_LIBDIR}/lib/debugger/test/test_interface.rb -${GEM_LIBDIR}/lib/debugger/version.rb -${GEM_LIBDIR}/lib/ruby-debug-base.rb -${GEM_LIBDIR}/lib/ruby-debug.rb -${GEM_LIBDIR}/lib/ruby-debug/command.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/breakpoints.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/catchpoint.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/condition.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/continue.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/control.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/display.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/edit.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/enable.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/eval.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/finish.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/frame.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/help.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/info.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/irb.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/jump.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/kill.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/list.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/method.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/quit.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/reload.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/save.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/set.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/show.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/skip.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/source.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/start.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/stepping.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/threads.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/tmate.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/trace.rb -${GEM_LIBDIR}/lib/ruby-debug/commands/variables.rb -${GEM_LIBDIR}/lib/ruby-debug/debugger.rb -${GEM_LIBDIR}/lib/ruby-debug/helper.rb -${GEM_LIBDIR}/lib/ruby-debug/interface.rb -${GEM_LIBDIR}/lib/ruby-debug/printers/base.rb -${GEM_LIBDIR}/lib/ruby-debug/printers/plain.rb -${GEM_LIBDIR}/lib/ruby-debug/printers/texts/base.yml -${GEM_LIBDIR}/lib/ruby-debug/printers/texts/plain.yml -${GEM_LIBDIR}/lib/ruby-debug/processor.rb -${GEM_LIBDIR}/lib/ruby_debug.${RUBY_DLEXT} -${GEM_LIBDIR}/man/rdebug.1 -${GEM_LIBDIR}/old_scripts/Makefile.am -${GEM_LIBDIR}/old_scripts/README.md -${GEM_LIBDIR}/old_scripts/autogen.sh -${GEM_LIBDIR}/old_scripts/configure.ac -${GEM_LIBDIR}/old_scripts/rdbg.rb -${GEM_LIBDIR}/old_scripts/runner.sh -${GEM_LIBDIR}/old_scripts/svn2cl_usermap -${GEM_LIBDIR}/test/.cvsignore -${GEM_LIBDIR}/test/breakpoints_test.rb -${GEM_LIBDIR}/test/conditions_test.rb -${GEM_LIBDIR}/test/continue_test.rb -${GEM_LIBDIR}/test/display_test.rb -${GEM_LIBDIR}/test/edit_test.rb -${GEM_LIBDIR}/test/eval_test.rb -${GEM_LIBDIR}/test/examples/breakpoint1.rb -${GEM_LIBDIR}/test/examples/breakpoint2.rb -${GEM_LIBDIR}/test/examples/conditions.rb -${GEM_LIBDIR}/test/examples/continue.rb -${GEM_LIBDIR}/test/examples/display.rb -${GEM_LIBDIR}/test/examples/edit.rb -${GEM_LIBDIR}/test/examples/edit2.rb -${GEM_LIBDIR}/test/examples/eval.rb -${GEM_LIBDIR}/test/examples/finish.rb -${GEM_LIBDIR}/test/examples/frame.rb -${GEM_LIBDIR}/test/examples/help.rb -${GEM_LIBDIR}/test/examples/info.rb -${GEM_LIBDIR}/test/examples/info2.rb -${GEM_LIBDIR}/test/examples/irb.rb -${GEM_LIBDIR}/test/examples/jump.rb -${GEM_LIBDIR}/test/examples/kill.rb -${GEM_LIBDIR}/test/examples/list.rb -${GEM_LIBDIR}/test/examples/method.rb -${GEM_LIBDIR}/test/examples/post_mortem.rb -${GEM_LIBDIR}/test/examples/quit.rb -${GEM_LIBDIR}/test/examples/reload.rb -${GEM_LIBDIR}/test/examples/restart.rb -${GEM_LIBDIR}/test/examples/save.rb -${GEM_LIBDIR}/test/examples/set.rb -${GEM_LIBDIR}/test/examples/set_annotate.rb -${GEM_LIBDIR}/test/examples/settings.rb -${GEM_LIBDIR}/test/examples/show.rb -${GEM_LIBDIR}/test/examples/source.rb -${GEM_LIBDIR}/test/examples/stepping.rb -${GEM_LIBDIR}/test/examples/thread.rb -${GEM_LIBDIR}/test/examples/tmate.rb -${GEM_LIBDIR}/test/examples/trace.rb -${GEM_LIBDIR}/test/examples/trace_threads.rb -${GEM_LIBDIR}/test/examples/variables.rb -${GEM_LIBDIR}/test/finish_test.rb -${GEM_LIBDIR}/test/frame_test.rb -${GEM_LIBDIR}/test/help_test.rb -${GEM_LIBDIR}/test/info_test.rb -${GEM_LIBDIR}/test/irb_test.rb -${GEM_LIBDIR}/test/jump_test.rb -${GEM_LIBDIR}/test/kill_test.rb -${GEM_LIBDIR}/test/list_test.rb -${GEM_LIBDIR}/test/method_test.rb -${GEM_LIBDIR}/test/new/printers/plain_test.rb -${GEM_LIBDIR}/test/post_mortem_test.rb -${GEM_LIBDIR}/test/quit_test.rb -${GEM_LIBDIR}/test/reload_test.rb -${GEM_LIBDIR}/test/restart_test.rb -${GEM_LIBDIR}/test/save_test.rb -${GEM_LIBDIR}/test/set_test.rb -${GEM_LIBDIR}/test/show_test.rb -${GEM_LIBDIR}/test/source_test.rb -${GEM_LIBDIR}/test/stepping_test.rb -${GEM_LIBDIR}/test/test_helper.rb -${GEM_LIBDIR}/test/thread_test.rb -${GEM_LIBDIR}/test/tmate_test.rb -${GEM_LIBDIR}/test/trace_test.rb -${GEM_LIBDIR}/test/variables_test.rb -${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/devel/ruby-debugger/distinfo b/devel/ruby-debugger/distinfo deleted file mode 100644 index 6b8c054c2149f..0000000000000 --- a/devel/ruby-debugger/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 03:29:21 agc Exp $ - -SHA1 (debugger-1.6.8.gem) = af2fc1f586e1a34b0925a71b9e2ea0f56ad9c459 -RMD160 (debugger-1.6.8.gem) = b79a4885c9abb29c32f575ceafcabafd2d1bcc60 -SHA512 (debugger-1.6.8.gem) = d93b56d26f6c807a460c4c8642221ad62f9e0ca6c8abc68bf88a8b56b586f45055a378e75088d8190d40bc969caaebe1c02655a952c1a49c1dd2020c05e75cee -Size (debugger-1.6.8.gem) = 318976 bytes From 5b38681ed7c7248e8d0549f7037be2507bcf6841 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:30:43 +0000 Subject: [PATCH 0025/2457] Remove ruby-debugger-linecache, it was required by ruby-debugger. --- devel/ruby-debugger-linecache/DESCR | 2 -- devel/ruby-debugger-linecache/Makefile | 14 -------- devel/ruby-debugger-linecache/PLIST | 50 -------------------------- devel/ruby-debugger-linecache/distinfo | 6 ---- 4 files changed, 72 deletions(-) delete mode 100644 devel/ruby-debugger-linecache/DESCR delete mode 100644 devel/ruby-debugger-linecache/Makefile delete mode 100644 devel/ruby-debugger-linecache/PLIST delete mode 100644 devel/ruby-debugger-linecache/distinfo diff --git a/devel/ruby-debugger-linecache/DESCR b/devel/ruby-debugger-linecache/DESCR deleted file mode 100644 index 07cef8e368393..0000000000000 --- a/devel/ruby-debugger-linecache/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -Linecache is a module for reading and caching lines. This may be useful for -example in a debugger where the same lines are shown many times. diff --git a/devel/ruby-debugger-linecache/Makefile b/devel/ruby-debugger-linecache/Makefile deleted file mode 100644 index ef914e93145f4..0000000000000 --- a/devel/ruby-debugger-linecache/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: Makefile,v 1.3 2015/12/27 12:06:16 taca Exp $ - -DISTNAME= debugger-linecache-1.2.0 -CATEGORIES= devel - -MAINTAINER= taca@NetBSD.org -HOMEPAGE= https://github.com/cldwalker/debugger-linecache -COMMENT= Read file with caching -LICENSE= mit - -RUBY_VERSION_SUPPORTED= 200 - -.include "../../lang/ruby/gem.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-debugger-linecache/PLIST b/devel/ruby-debugger-linecache/PLIST deleted file mode 100644 index d18a5269d6390..0000000000000 --- a/devel/ruby-debugger-linecache/PLIST +++ /dev/null @@ -1,50 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2015/02/04 13:36:04 taca Exp $ -${GEM_HOME}/cache/${GEM_NAME}.gem -${GEM_LIBDIR}/.travis.yml -${GEM_LIBDIR}/CHANGELOG.md -${GEM_LIBDIR}/CONTRIBUTING.md -${GEM_LIBDIR}/LICENSE.txt -${GEM_LIBDIR}/OLD_CHANGELOG -${GEM_LIBDIR}/OLD_README -${GEM_LIBDIR}/README.md -${GEM_LIBDIR}/Rakefile -${GEM_LIBDIR}/debugger-linecache.gemspec -${GEM_LIBDIR}/lib/debugger/linecache.rb -${GEM_LIBDIR}/lib/linecache19.rb -${GEM_LIBDIR}/lib/tracelines19.rb -${GEM_LIBDIR}/test/data/begin1.rb -${GEM_LIBDIR}/test/data/begin2.rb -${GEM_LIBDIR}/test/data/begin3.rb -${GEM_LIBDIR}/test/data/block1.rb -${GEM_LIBDIR}/test/data/block2.rb -${GEM_LIBDIR}/test/data/case1.rb -${GEM_LIBDIR}/test/data/case2.rb -${GEM_LIBDIR}/test/data/case3.rb -${GEM_LIBDIR}/test/data/case4.rb -${GEM_LIBDIR}/test/data/case5.rb -${GEM_LIBDIR}/test/data/class1.rb -${GEM_LIBDIR}/test/data/comments1.rb -${GEM_LIBDIR}/test/data/def1.rb -${GEM_LIBDIR}/test/data/each1.rb -${GEM_LIBDIR}/test/data/end.rb -${GEM_LIBDIR}/test/data/for1.rb -${GEM_LIBDIR}/test/data/if1.rb -${GEM_LIBDIR}/test/data/if2.rb -${GEM_LIBDIR}/test/data/if3.rb -${GEM_LIBDIR}/test/data/if4.rb -${GEM_LIBDIR}/test/data/if5.rb -${GEM_LIBDIR}/test/data/if6.rb -${GEM_LIBDIR}/test/data/if7.rb -${GEM_LIBDIR}/test/data/match.rb -${GEM_LIBDIR}/test/data/match3.rb -${GEM_LIBDIR}/test/data/match3a.rb -${GEM_LIBDIR}/test/data/not-lit.rb -${GEM_LIBDIR}/test/lnum-diag.rb -${GEM_LIBDIR}/test/parse-show.rb -${GEM_LIBDIR}/test/rcov-bug.rb -${GEM_LIBDIR}/test/short-file -${GEM_LIBDIR}/test/test-linecache.rb -${GEM_LIBDIR}/test/test-lnum.rb -${GEM_LIBDIR}/test/test-tracelines.rb -${GEM_HOME}/specifications/${GEM_NAME}.gemspec - diff --git a/devel/ruby-debugger-linecache/distinfo b/devel/ruby-debugger-linecache/distinfo deleted file mode 100644 index dc44e74701e9d..0000000000000 --- a/devel/ruby-debugger-linecache/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 03:29:22 agc Exp $ - -SHA1 (debugger-linecache-1.2.0.gem) = c2f6599dadd3f4868b232b66a3c8a474500d9668 -RMD160 (debugger-linecache-1.2.0.gem) = 69900bfa924749c963a0114dcacd7cbd14bb4cfa -SHA512 (debugger-linecache-1.2.0.gem) = deccae8f190da60a4e3b75017bf8bf691bcd3dad904bd153ed73d6b1b147ba710df0eff8b70449470f561f9227d43520faca69a45d765823c68650b2bb3ae65b -Size (debugger-linecache-1.2.0.gem) = 15872 bytes From a0fc529e7c99760b80b0a08c9528c5fd6823cf7a Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:31:10 +0000 Subject: [PATCH 0026/2457] Remove ruby-debugger-ruby_core_source, it was required by ruby-debugger. --- devel/ruby-debugger-ruby_core_source/DESCR | 1 - devel/ruby-debugger-ruby_core_source/Makefile | 20 - devel/ruby-debugger-ruby_core_source/PLIST | 1138 ----------------- devel/ruby-debugger-ruby_core_source/distinfo | 6 - 4 files changed, 1165 deletions(-) delete mode 100644 devel/ruby-debugger-ruby_core_source/DESCR delete mode 100644 devel/ruby-debugger-ruby_core_source/Makefile delete mode 100644 devel/ruby-debugger-ruby_core_source/PLIST delete mode 100644 devel/ruby-debugger-ruby_core_source/distinfo diff --git a/devel/ruby-debugger-ruby_core_source/DESCR b/devel/ruby-debugger-ruby_core_source/DESCR deleted file mode 100644 index 9e33b29acda0d..0000000000000 --- a/devel/ruby-debugger-ruby_core_source/DESCR +++ /dev/null @@ -1 +0,0 @@ -Provide Ruby core source files for C extensions that need them. diff --git a/devel/ruby-debugger-ruby_core_source/Makefile b/devel/ruby-debugger-ruby_core_source/Makefile deleted file mode 100644 index 30afd8ca00468..0000000000000 --- a/devel/ruby-debugger-ruby_core_source/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# $NetBSD: Makefile,v 1.6 2015/12/27 12:07:40 taca Exp $ - -DISTNAME= debugger-ruby_core_source-1.3.8 -PKGREVISION= 2 -CATEGORIES= devel - -MAINTAINER= taca@NetBSD.org -HOMEPAGE= https://github.com/cldwalker/debugger-ruby_core_source -COMMENT= Provide Ruby core source files -LICENSE= mit - -RUBY_VERSION_SUPPORTED= 200 - -post-install: - cd ${DESTDIR}${PREFIX}/${GEM_LIBDIR}/lib/debugger/ruby_core_source && \ - ${LN} -s ruby-2.0.0-p481 \ - ruby-${RUBY200_VERSION}-${RUBY200_PATCHLEVEL} - -.include "../../lang/ruby/gem.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-debugger-ruby_core_source/PLIST b/devel/ruby-debugger-ruby_core_source/PLIST deleted file mode 100644 index a5ce43aebb065..0000000000000 --- a/devel/ruby-debugger-ruby_core_source/PLIST +++ /dev/null @@ -1,1138 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2015/12/27 12:07:40 taca Exp $ -${GEM_HOME}/cache/${GEM_NAME}.gem -${GEM_LIBDIR}/CHANGELOG.md -${GEM_LIBDIR}/README.md -${GEM_LIBDIR}/Rakefile -${GEM_LIBDIR}/debugger-ruby_core_source.gemspec -${GEM_LIBDIR}/lib/debugger/ruby_core_source.rb -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p290/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p318/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p320/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.2-p330/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p0/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p125/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p194/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p286/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p327/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p362/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p374/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p385/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p392/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p426/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p429/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p448/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p484/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p545/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p547/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p550/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-1.9.3-p551/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p0/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p195/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p247/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p353/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p451/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p481/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.0.0-p648 -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/thread_native.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.0-p0/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/thread_native.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.1-p76/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/addr2line.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/constant.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/dln.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/encdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/eval_intern.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/gc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/id.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/insns.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/insns_info.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/internal.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/iseq.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/known_errors.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/method.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/node.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/node_name.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/opt_sc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/optinsn.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/optunifs.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/parse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/probes_helper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/regenc.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/regint.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/regparse.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/revision.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/ruby_atomic.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/siphash.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/thread_native.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/thread_pthread.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/thread_win32.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/timev.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/transcode_data.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/transdb.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/version.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/vm.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/vm_core.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/vm_debug.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/vm_exec.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/vm_insnhelper.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/vm_opts.h -${GEM_LIBDIR}/lib/debugger/ruby_core_source/ruby-2.1.2-p95/vmtc.inc -${GEM_LIBDIR}/lib/debugger/ruby_core_source/version.rb -${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/devel/ruby-debugger-ruby_core_source/distinfo b/devel/ruby-debugger-ruby_core_source/distinfo deleted file mode 100644 index ae5b8a0c4f7b4..0000000000000 --- a/devel/ruby-debugger-ruby_core_source/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 03:29:22 agc Exp $ - -SHA1 (debugger-ruby_core_source-1.3.8.gem) = b2a356d9a1e042994f8efabcd7c27bf684fde56b -RMD160 (debugger-ruby_core_source-1.3.8.gem) = f85eb27cb92b9aad6a4a1657da46f2301cb356fa -SHA512 (debugger-ruby_core_source-1.3.8.gem) = 7dcab4d49c9c950564f30b3e4985e7246ef3b7b191e548fc74cbd54675f61f74eee9f0e12c99cc84164c64b8a1a0f72a677a1222e8775ab02f370daf7b6e2da7 -Size (debugger-ruby_core_source-1.3.8.gem) = 1865216 bytes From 777d74b23c980b19ca27e8d526dbc0ae80a2512b Mon Sep 17 00:00:00 2001 From: khorben Date: Sun, 13 Mar 2016 15:32:06 +0000 Subject: [PATCH 0027/2457] Also determine when compiling from source files This allows fixing an issue with PKGSRC_MKPIE, where "gcc source.c" would not work. Some packages rely on this test to determine if a working compiler is available. --- mk/wrapper/arg-source | 12 +++++++++++- mk/wrapper/cmd-sink-mkpie-gcc | 8 +++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mk/wrapper/arg-source b/mk/wrapper/arg-source index 476de2de56b3d..803f5deddcd52 100644 --- a/mk/wrapper/arg-source +++ b/mk/wrapper/arg-source @@ -1,4 +1,4 @@ -# $NetBSD: arg-source,v 1.17 2016/03/11 23:03:31 khorben Exp $ +# $NetBSD: arg-source,v 1.18 2016/03/13 15:32:06 khorben Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -171,6 +171,16 @@ while $test $# -gt 0; do $debug_log $wrapperlog " (arg-source) push: $arg" ;; ############################################################## + # Determine if we are compiling anything from source. + ############################################################## + *.C|*.CPP|*.c|*.c++|*.cc|*.cp|*.cpp|*.cxx|*.go|\ + *.H|*.HPP|*.h|*.h++|*.hh|*.hp|*.hpp|*.hxx|*.i|*.ii|\ + *.M|*.m|*.mi|*.mii|*.mm|*.S|*.s|*.sx|*.tcc) + has_source=yes + append_queue argbuf "$arg" + $debug_log $wrapperlog " (arg-source) push: $arg" + ;; + ############################################################## # For everything else, just queue it up. ############################################################## *) diff --git a/mk/wrapper/cmd-sink-mkpie-gcc b/mk/wrapper/cmd-sink-mkpie-gcc index 8a1ed864d6d22..288187a6bcbaa 100644 --- a/mk/wrapper/cmd-sink-mkpie-gcc +++ b/mk/wrapper/cmd-sink-mkpie-gcc @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink-mkpie-gcc,v 1.1 2016/03/11 23:03:31 khorben Exp $ +# $NetBSD: cmd-sink-mkpie-gcc,v 1.2 2016/03/13 15:32:06 khorben Exp $ # # Copyright (c) 2016 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,8 +39,10 @@ done # Append any optional flags required when linking binaries. if $test "$dont_link_binary" != "yes"; then - # XXX obtain these flags from _MKPIE_LDFLAGS.gcc - for arg in -pie; do + # XXX obtain these flags from _MKPIE_LDFLAGS.gcc and _MKPIE_CFLAGS.gcc + MKPIE_FLAGS="-pie" + $test "$has_source" = "yes" && MKPIE_FLAGS="-fPIC $MKPIE_FLAGS" + for arg in $MKPIE_FLAGS; do $debug_log $wrapperlog " (cmd-sink-mkpie-gcc) pop: $arg" . $buildcmd done From 6bb7c38180abc64ecf0b1361180c11c3afd522bb Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:32:26 +0000 Subject: [PATCH 0028/2457] Note remove of devel-ruby-debugger and related packages which were supported by Ruby 2.0.0 and prior version. --- doc/CHANGES-2016 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 023895a47e86f..3892d9077da4d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1146 2016/03/13 13:42:51 rillig Exp $ +$NetBSD: CHANGES-2016,v 1.1147 2016/03/13 15:32:26 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1532,3 +1532,6 @@ Changes to the packages collection and infrastructure in 2016: Added devel/p5-Git-Version-Compare version 1.001 [wen 2016-03-13] Updated devel/p5-Git-Repository to 1.318 [wen 2016-03-13] Updated pkgtools/pkglint to 5.3.6 [rillig 2016-03-13] + Removed devel/ruby-debugger [taca 2016-03-13] + Removed devel/ruby-debugger-linecache [taca 2016-03-13] + Removed devel/ruby-debugger-ruby_core_source [taca 2016-03-13] From c4dae13db3bb38fbce1b24b576d01343aa0894ce Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:44:23 +0000 Subject: [PATCH 0029/2457] Delete ruby200 and ruby200-base. --- lang/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lang/Makefile b/lang/Makefile index eac97e9344821..b856ce33ac54f 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.427 2016/03/10 15:01:52 tnn Exp $ +# $NetBSD: Makefile,v 1.428 2016/03/13 15:44:23 taca Exp $ # COMMENT= Programming languages @@ -194,8 +194,6 @@ SUBDIR+= ruby-doc-stdlib SUBDIR+= ruby-execjs SUBDIR+= ruby18 SUBDIR+= ruby18-base -SUBDIR+= ruby200 -SUBDIR+= ruby200-base SUBDIR+= ruby21 SUBDIR+= ruby21-base SUBDIR+= ruby22 From e040493b2aab96650c54270e5ae4455d31c7036e Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:46:37 +0000 Subject: [PATCH 0030/2457] Update lang/ruby200, the package became EOL. --- lang/ruby200/DESCR | 6 ------ lang/ruby200/Makefile | 28 ---------------------------- 2 files changed, 34 deletions(-) delete mode 100644 lang/ruby200/DESCR delete mode 100644 lang/ruby200/Makefile diff --git a/lang/ruby200/DESCR b/lang/ruby200/DESCR deleted file mode 100644 index 2a7f6e243ad5d..0000000000000 --- a/lang/ruby200/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -This a meta package including Ruby 2.0.0 full release. - -It includes ruby200-base, ruby200-gdbm, ruby200-curses, ruby200-fiddle, -ruby200-readline and ruby200-tk package. - -No package should depend on this package directly. diff --git a/lang/ruby200/Makefile b/lang/ruby200/Makefile deleted file mode 100644 index 46c210ea2dfd7..0000000000000 --- a/lang/ruby200/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $NetBSD: Makefile,v 1.2 2014/03/13 17:06:43 taca Exp $ -# - -DISTNAME= # empty -PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_VERSION_FULL} -CATEGORIES= lang ruby -MASTER_SITES= # empty -DISTFILES= # empty - -MAINTAINER= taca@NetBSD.org -HOMEPAGE= http://www.ruby-lang.org/en/ -COMMENT= Ruby programming language ${RUBY_VERSION} meta package -LICENSE= gnu-gpl-v2 OR ruby-license - -META_PACKAGE= yes - -DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION_FULL}:${RUBY_SRCDIR} -DEPENDS+= ${RUBY_PKGPREFIX}-gdbm>=${RUBY_VERSION_FULL}:../../databases/ruby-gdbm -DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION_FULL}:../../devel/ruby-curses -DEPENDS+= ${RUBY_PKGPREFIX}-fiddle>=${RUBY_VERSION_FULL}:../../devel/ruby-fiddle -DEPENDS+= ${RUBY_PKGPREFIX}-readline>=${RUBY_VERSION_FULL}:../../devel/ruby-readline -DEPENDS+= ${RUBY_PKGPREFIX}-tk>=${RUBY_VERSION_FULL}:../../x11/ruby-tk - -RUBY_VERSION_SUPPORTED= 200 - -.include "../../lang/ruby/rubyversion.mk" -.include "../../lang/ruby/Makefile.common" -.include "../../mk/bsd.pkg.mk" From 3c0a49b07d4f4ba4d6bab3e92a7fa87e47df86b9 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:46:57 +0000 Subject: [PATCH 0031/2457] Update lang/ruby200-base, the package became EOL. --- lang/ruby200-base/ALTERNATIVES | 6 - lang/ruby200-base/DEINSTALL | 14 - lang/ruby200-base/DESCR | 19 - lang/ruby200-base/INSTALL | 14 - lang/ruby200-base/MESSAGE | 15 - lang/ruby200-base/Makefile | 213 ---- lang/ruby200-base/PLIST | 1066 ----------------- lang/ruby200-base/distinfo | 39 - lang/ruby200-base/hacks.mk | 37 - lang/ruby200-base/options.mk | 16 - lang/ruby200-base/patches/patch-configure | 162 --- .../patches/patch-defs_default__gems | 14 - .../patches/patch-ext_dbm_extconf.rb | 15 - .../patches/patch-ext_openssl_extconf.rb | 16 - .../patches/patch-ext_openssl_ossl_ssl.c | 19 - .../patches/patch-ext_tk_extconf.rb | 19 - .../patches/patch-ext_tk_lib_tk.rb | 56 - .../patches/patch-ext_tk_lib_tk_autoload.rb | 15 - .../patch-ext_tk_lib_tk_fontchooser.rb | 17 - .../patches/patch-ext_tk_lib_tk_tk__mac.rb | 165 --- ...ch-ext_tk_lib_tkextlib_tcllib_validator.rb | 72 -- ...patch-ext_tk_lib_tkextlib_tile_treeview.rb | 50 - .../patch-ext_tk_lib_tkextlib_tkimg_dted.rb | 40 - .../patch-ext_tk_lib_tkextlib_tkimg_raw.rb | 40 - .../patches/patch-ext_tk_tcltklib.c | 179 --- .../patches/patch-lib_rdoc_ri_driver.rb | 37 - .../patches/patch-lib_rubygems.rb | 41 - ...ch-lib_rubygems_commands_setup__command.rb | 41 - ...h-lib_rubygems_commands_unpack__command.rb | 27 - .../patch-lib_rubygems_config__file.rb | 40 - .../patches/patch-lib_rubygems_defaults.rb | 15 - ...atch-lib_rubygems_dependency__installer.rb | 53 - ...h-lib_rubygems_install__update__options.rb | 19 - .../patches/patch-lib_rubygems_installer.rb | 49 - .../patches/patch-lib_rubygems_platform.rb | 14 - .../patch-lib_rubygems_specification.rb | 61 - lang/ruby200-base/patches/patch-man_erb.1 | 24 - lang/ruby200-base/patches/patch-man_irb.1 | 24 - lang/ruby200-base/patches/patch-man_ri.1 | 24 - lang/ruby200-base/patches/patch-man_ruby.1 | 24 - lang/ruby200-base/patches/patch-pack.c | 42 - .../patches/patch-test_rubygems_test__gem.rb | 22 - .../patches/patch-tool_rbinstall.rb | 15 - 43 files changed, 2890 deletions(-) delete mode 100644 lang/ruby200-base/ALTERNATIVES delete mode 100644 lang/ruby200-base/DEINSTALL delete mode 100644 lang/ruby200-base/DESCR delete mode 100644 lang/ruby200-base/INSTALL delete mode 100644 lang/ruby200-base/MESSAGE delete mode 100644 lang/ruby200-base/Makefile delete mode 100644 lang/ruby200-base/PLIST delete mode 100644 lang/ruby200-base/distinfo delete mode 100644 lang/ruby200-base/hacks.mk delete mode 100644 lang/ruby200-base/options.mk delete mode 100644 lang/ruby200-base/patches/patch-configure delete mode 100644 lang/ruby200-base/patches/patch-defs_default__gems delete mode 100644 lang/ruby200-base/patches/patch-ext_dbm_extconf.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_openssl_extconf.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_openssl_ossl_ssl.c delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_extconf.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_lib_tk.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_lib_tk_autoload.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_lib_tk_fontchooser.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_lib_tk_tk__mac.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_lib_tkextlib_tcllib_validator.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_lib_tkextlib_tile_treeview.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_lib_tkextlib_tkimg_dted.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_lib_tkextlib_tkimg_raw.rb delete mode 100644 lang/ruby200-base/patches/patch-ext_tk_tcltklib.c delete mode 100644 lang/ruby200-base/patches/patch-lib_rdoc_ri_driver.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_commands_setup__command.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_commands_unpack__command.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_config__file.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_defaults.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_install__update__options.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_installer.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_platform.rb delete mode 100644 lang/ruby200-base/patches/patch-lib_rubygems_specification.rb delete mode 100644 lang/ruby200-base/patches/patch-man_erb.1 delete mode 100644 lang/ruby200-base/patches/patch-man_irb.1 delete mode 100644 lang/ruby200-base/patches/patch-man_ri.1 delete mode 100644 lang/ruby200-base/patches/patch-man_ruby.1 delete mode 100644 lang/ruby200-base/patches/patch-pack.c delete mode 100644 lang/ruby200-base/patches/patch-test_rubygems_test__gem.rb delete mode 100644 lang/ruby200-base/patches/patch-tool_rbinstall.rb diff --git a/lang/ruby200-base/ALTERNATIVES b/lang/ruby200-base/ALTERNATIVES deleted file mode 100644 index 7c797c4cd3a2f..0000000000000 --- a/lang/ruby200-base/ALTERNATIVES +++ /dev/null @@ -1,6 +0,0 @@ -bin/erb @PREFIX@/bin/erb@RUBY_SUFFIX@ -bin/gem @PREFIX@/bin/gem@RUBY_SUFFIX@ -bin/irb @PREFIX@/bin/irb@RUBY_SUFFIX@ -bin/rake @PREFIX@/bin/rake@RUBY_SUFFIX@ -bin/ruby @PREFIX@/bin/@RUBY_NAME@ -bin/testrb @PREFIX@/bin/testrb@RUBY_SUFFIX@ diff --git a/lang/ruby200-base/DEINSTALL b/lang/ruby200-base/DEINSTALL deleted file mode 100644 index 00702725f8e05..0000000000000 --- a/lang/ruby200-base/DEINSTALL +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: DEINSTALL,v 1.1 2013/07/21 02:32:58 taca Exp $ - -RUBY_GEM_BASE="${PREFIX}/@RUBY_GEM_BASE@" -RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@" - -case ${STAGE} in -DEINSTALL) - ${RM} -f ${RUBY_SITERIDIR}/created.rid - ;; -POST-DEINSTALL) - ${RM} -rf ${GEM_HOME} - ${RMDIR} ${RUBY_GEM_BASE} 2>/dev/null || true - ;; -esac diff --git a/lang/ruby200-base/DESCR b/lang/ruby200-base/DESCR deleted file mode 100644 index ac47ff44c66b7..0000000000000 --- a/lang/ruby200-base/DESCR +++ /dev/null @@ -1,19 +0,0 @@ -Ruby is the interpreted scripting language for quick and -easy object-oriented programming. It has many features to -process text files and to do system management tasks (as in -Perl). It is simple, straight-forward, and extensible. - -Features of Ruby are shown below. - - + Simple Syntax - + *Normal* Object-Oriented features (ex. class, method calls) - + *Advanced* Object-Oriented features (ex. Mix-in, Singleton-method) - + Operator Overloading - + Exception Handling - + Iterators and Closures - + Garbage Collection - + Dynamic Loading of Object files (on some architecture) - + Highly Portable (works on many UNIX machines, and on DOS, - Windows, Mac, BeOS etc.) - -This package is Ruby 2.0.0 release minimum base package. diff --git a/lang/ruby200-base/INSTALL b/lang/ruby200-base/INSTALL deleted file mode 100644 index 9f9c3b8224536..0000000000000 --- a/lang/ruby200-base/INSTALL +++ /dev/null @@ -1,14 +0,0 @@ -# $NetBSD: INSTALL,v 1.1 2013/07/21 02:32:58 taca Exp $ - -DATE="@DATE@" -RUBY_SITERIDIR="${PREFIX}/@RUBY_SITERIDIR@" -rid="${RUBY_SITERIDIR}/created.rid" - -case ${STAGE} in -POST-INSTALL) - if [ -d ${RUBY_SITERIDIR} ]; then - ${DATE} > ${rid} - fi - ;; -esac - diff --git a/lang/ruby200-base/MESSAGE b/lang/ruby200-base/MESSAGE deleted file mode 100644 index d52d77ebf69ac..0000000000000 --- a/lang/ruby200-base/MESSAGE +++ /dev/null @@ -1,15 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2013/07/21 02:32:58 taca Exp $ - -Note that this is a minimal package. - -The original ${RUBY_DISTNAME} distribution includes more extension -libraries, some of which are provided as separate packages: - - databases/ruby-gdbm: GDBM module - devel/ruby-curses: Curses module - devel/ruby-fiddle: Fiddle module - devel/ruby-readline: readline module - x11/ruby-tk: Tk modules - -=========================================================================== diff --git a/lang/ruby200-base/Makefile b/lang/ruby200-base/Makefile deleted file mode 100644 index eba0f4fdc4093..0000000000000 --- a/lang/ruby200-base/Makefile +++ /dev/null @@ -1,213 +0,0 @@ -# $NetBSD: Makefile,v 1.24 2016/03/05 11:28:44 jperkin Exp $ -# - -DISTNAME= ${RUBY_DISTNAME} -PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 1 -CATEGORIES= lang ruby -MASTER_SITES= ${MASTER_SITE_RUBY} - -MAINTAINER= taca@NetBSD.org -HOMEPAGE= ${RUBY_HOMEPAGE} -COMMENT= Ruby ${RUBY_VERSION} release minimum base package -LICENSE= ${RUBY_LICENSE} - -RUBY_VERSION_SUPPORTED= 200 - -USE_LANGUAGES= c c99 -USE_TOOLS+= pax yacc pkg-config -GNU_CONFIGURE= yes -TEST_TARGET= test -CONFIGURE_ARGS+= --enable-shared -WRKSRC= ${RUBY_WRKSRC} - -MAKE_DIRS= ${RUBY_SITEARCHLIB} ${RUBY_VENDORARCHLIB} - -# On platforms where DTrace is available, we need to invoke dtrace(1) -# with the original PATH. Otherwise it gets confused in the presence -# of our cc wrapper because it tries to invoke the system-default gcc -# with argv[0] set to "gcc", not the absolute path to gcc. -.if exists(/usr/sbin/dtrace) -# NOTE: This should probably be handled by ../../mk/bsd.wrapper.mk -post-wrapper: - ${RUN}(${ECHO} '#!${SH}'; \ - ${ECHO} 'PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH'; \ - ${ECHO} '/usr/sbin/dtrace $$@') \ - > "${WRAPPER_BINDIR}/dtrace" - ${RUN}${CHMOD} +x "${WRAPPER_BINDIR}/dtrace" -.endif - -# -# Don't reference pkgsrc's INSTALL macro since Ruby expect it could -# execute by unprivileged user. -# -CONFIGURE_ENV+= INSTALL="${INSTALL} ${COPY}" \ - INSTALL_DATA= INSTALL_PROGRAM= INSTALL_SCRIPT= - -CONFIGURE_ENV+= ac_cv_prog_PKG_CONFIG="" - -.include "../../mk/compiler.mk" - -# /usr/bin/dtrace is not DTrace. -.if ${OPSYS} == "Linux" && exists(/usr/bin/dtrace) -CONFIGURE_ARGS+= --disable-dtrace -.endif - -.if !empty(PKGSRC_COMPILER:Msunpro) -LIBS.SunOS+= -B static -lsunmath -B dynamic -lm -LDFLAGS.SunOS+= -L${SUNWSPROBASE}/lib -Wl,-R${SUNWSPROBASE}/lib -CONFIGURE_ENV+= LDSHARED="${CC} -G" -.else -LIBS.SunOS+= -lm -.endif - -CONFIGURE_ENV.SunOS+= OBJCOPY=: - -# if present, an unsupported sysconf call is used -CONFIGURE_ENV.MirBSD+= ac_cv_func_getgrnam_r=no - -.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" -USE_TOOLS+= bash -CONFIG_SHELL= ${TOOLS_PATH.bash} -.endif - -.if ${OPSYS} == "Cygwin" -USE_TOOLS+= gmake -MAKE_FILE= GNUmakefile -.endif - -# Ruby build process depends on config.status's content -CONFIG_STATUS_OVERRIDE= # empty - -MAKE_DIRS+= ${RUBY_SITERIDIR} -FILES_SUBST+= DATE=${DATE:Q} - -REQD_DIRS+= ${GEM_HOME}/cache -REQD_DIRS+= ${GEM_HOME}/doc - -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-install -SUBST_FILES.conf= lib/rubygems/config_file.rb -SUBST_SED.conf= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" -SUBST_MESSAGE.conf= Fixing configuration files. - -.include "options.mk" - -.include "../../lang/ruby/rubyversion.mk" - -.if !empty(RUBY_SUFFIX) -CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX} -CONFIGURE_ARGS+= --with-soname=${RUBY_NAME} -CONFIGURE_ARGS+= --with-ruby-version=${RUBY_VERSION} -CONFIGURE_ARGS+= --with-ruby-pc="ruby-${RUBY_VERSION}.pc" -.endif - -# -# Ruby 2.0 don't like Apple's builtin OpenSSL. -# -.if ${OPSYS} == "Darwin" -USE_BUILTIN.openssl= no -.endif - -# -# Win32 support (for Cygwin) -# -PLIST_VARS+= win32 -.if ${OPSYS} == "Cygwin" -PLIST.win32= yes -.endif - -# -# IRIX work around which should be fixed. -# -PLIST_VARS+= io -.if ${OPSYS} != "IRIX" -PLIST.io= yes -.endif - -# -# Work around for getucontext(3) -# -.if ${OPSYS} == "DragonFly" && ${OS_VERSION} == "1.8.0" -CONFIGURE_ENV+= ac_cv_header_ucontext_h=no -.endif - -# -# prevent unwanted mkdir recorded in rbconfig.rb -# -CONFIGURE_ENV+= MKDIR_P=${MKDIR:Q} - -DOCS= \ - COPYING COPYING.ja ChangeLog LEGAL NEWS README README.EXT \ - README.EXT.ja README.ja doc/ChangeLog-1.8.0 doc/ChangeLog-1.9.3 \ - doc/ChangeLog-YARV doc/NEWS-1.8.7 doc/NEWS-1.9.1 doc/NEWS-1.9.2 \ - doc/NEWS-1.9.3 doc/etc.rd.ja doc/forwardable.rd.ja doc/globals.rdoc \ - doc/images/boottime-classes.png doc/irb/irb-tools.rd.ja \ - doc/irb/irb.rd.ja doc/pty/README.expect.ja doc/pty/README.ja \ - doc/re.rdoc doc/security.rdoc doc/shell.rd.ja \ - doc/standard_library.rdoc doc/syntax/assignment.rdoc \ - doc/syntax/calling_methods.rdoc doc/syntax/control_expressions.rdoc \ - doc/syntax/exceptions.rdoc doc/syntax/literals.rdoc \ - doc/syntax/methods.rdoc doc/syntax/miscellaneous.rdoc \ - doc/syntax/modules_and_classes.rdoc doc/syntax/precedence.rdoc \ - doc/syntax/refinements.rdoc doc/syntax.rdoc -EXT_DOCS= syslog/syslog.txt - -BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb -OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb certstore.rb cipher.rb \ - crlstore.rb echo_cli.rb echo_svr.rb gen_csr.rb \ - smime_read.rb smime_write.rb wget.rb - -REPLACE_RUBY= bin/erb bin/gem bin/irb bin/rake bin/rdoc \ - bin/ri bin/testrb -REPLACE_RUBY_DIRS= ext lib sample -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${RUBY_DOC}/images \ - ${RUBY_DOC}/irb ${RUBY_DOC}/pty ${RUBY_DOC}/ripper \ - ${RUBY_DOC}/stringio ${RUBY_DOC}/syntax \ - ${RUBY_EG}/bigdecimal ${RUBY_EG}/pty -# ${RUBY_ARCHINC} ${RUBY_ARCHLIB} -EMPTY_DIRS= generator/template markup/simple_markup - -pre-configure: - ${RM} -f ${WRKSRC}/ext/curses/extconf.rb - ${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb - ${RM} -f ${WRKSRC}/ext/fiddle/extconf.rb - ${RM} -f ${WRKSRC}/ext/readline/extconf.rb - ${RM} -f ${WRKSRC}/ext/tk/extconf.rb - -pre-install: - cd ${WRKSRC}/bin; for f in *; do ${LN} -f $$f $${f}${RUBY_SUFFIX}; done - cd ${WRKSRC}/lib; \ - ${FIND} . \( -name '*.orig' -o -name '*.orig_dist' \) \ - -exec ${RM} -f {} \; -.for f in ${EMPTY_DIRS} - ${RMDIR} ${WRKSRC}/lib/rdoc/${f} 2>/dev/null || ${TRUE} -.endfor - -post-install: -.for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC}/${f:C/^doc\///} -.endfor -.for f in ${EXT_DOCS} - ${INSTALL_DATA} ${WRKSRC}/ext/${f} ${DESTDIR}${PREFIX}/${RUBY_DOC} -.endfor - cd ${WRKSRC}/ext/ripper; ${PAX} -rw README ${DESTDIR}${PREFIX}/${RUBY_DOC}/ripper - cd ${WRKSRC}/ext/stringio; ${PAX} -rw README ${DESTDIR}${PREFIX}/${RUBY_DOC}/stringio - cd ${WRKSRC}/sample; ${PAX} -rw . ${DESTDIR}${PREFIX}/${RUBY_EG} -.for f in ${BIGDECIMAL_EXAMPLES} - ${INSTALL_DATA} ${RUBY_WRKSRC}/ext/bigdecimal/sample/${f} \ - ${DESTDIR}${PREFIX}/${RUBY_EG}/bigdecimal -.endfor -.for f in ${OPENSSL_EXAMPLES} - ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \ - ${DESTDIR}${PREFIX}/${RUBY_EG}/openssl -.endfor - ${RUBY_GENERATE_PLIST} - -.include "../../mk/bdb.buildlink3.mk" -.include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../security/openssl/buildlink3.mk" -.include "../../textproc/libyaml/buildlink3.mk" -.include "../../lang/ruby/Makefile.common" -.include "../../mk/bsd.pkg.mk" diff --git a/lang/ruby200-base/PLIST b/lang/ruby200-base/PLIST deleted file mode 100644 index 0db1a4274804e..0000000000000 --- a/lang/ruby200-base/PLIST +++ /dev/null @@ -1,1066 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2015/03/08 14:59:12 taca Exp $ -bin/erb${RUBY_VER} -bin/gem${RUBY_VER} -bin/irb${RUBY_VER} -bin/rake${RUBY_VER} -bin/rdoc${RUBY_VER} -bin/ri${RUBY_VER} -bin/${RUBY_NAME} -${PLIST.win32}bin/rubyw${RUBY_VER} -bin/testrb${RUBY_VER} -${RUBY_INC}/ruby.h -${RUBY_INC}/ruby/backward/classext.h -${RUBY_INC}/ruby/backward/rubyio.h -${RUBY_INC}/ruby/backward/rubysig.h -${RUBY_INC}/ruby/backward/st.h -${RUBY_INC}/ruby/backward/util.h -${RUBY_INC}/ruby/debug.h -${RUBY_INC}/ruby/defines.h -${RUBY_INC}/ruby/digest.h -${RUBY_INC}/ruby/dl.h -${RUBY_INC}/ruby/encoding.h -${RUBY_INC}/ruby/intern.h -${RUBY_INC}/ruby/io.h -${RUBY_INC}/ruby/missing.h -${RUBY_INC}/ruby/oniguruma.h -${RUBY_INC}/ruby/re.h -${RUBY_INC}/ruby/regex.h -${RUBY_INC}/ruby/ruby.h -${RUBY_INC}/ruby/st.h -${RUBY_INC}/ruby/subst.h -${RUBY_INC}/ruby/thread.h -${RUBY_INC}/ruby/util.h -${RUBY_INC}/ruby/version.h -${RUBY_INC}/ruby/vm.h -${RUBY_ARCHINC}/ruby/config.h -lib/libruby${RUBY_STATICLIB} -lib/libruby${RUBY_VER}.${RUBY_SLEXT} -${RUBY_SHLIBALIAS} -lib/libruby${RUBY_SHLIB} -lib/pkgconfig/ruby-${RUBY_VERSION}.pc -${RUBY_LIB}/English.rb -${RUBY_LIB}/abbrev.rb -${RUBY_LIB}/base64.rb -${RUBY_LIB}/benchmark.rb -${RUBY_LIB}/bigdecimal/jacobian.rb -${RUBY_LIB}/bigdecimal/ludcmp.rb -${RUBY_LIB}/bigdecimal/math.rb -${RUBY_LIB}/bigdecimal/newton.rb -${RUBY_LIB}/bigdecimal/util.rb -${RUBY_LIB}/cgi.rb -${RUBY_LIB}/cgi/cookie.rb -${RUBY_LIB}/cgi/core.rb -${RUBY_LIB}/cgi/html.rb -${RUBY_LIB}/cgi/session.rb -${RUBY_LIB}/cgi/session/pstore.rb -${RUBY_LIB}/cgi/util.rb -${RUBY_LIB}/cmath.rb -${RUBY_LIB}/complex.rb -${RUBY_LIB}/csv.rb -${RUBY_LIB}/date.rb -${RUBY_LIB}/date/format.rb -${RUBY_LIB}/debug.rb -${RUBY_LIB}/delegate.rb -${RUBY_LIB}/digest.rb -${RUBY_LIB}/digest/hmac.rb -${RUBY_LIB}/digest/sha2.rb -${RUBY_LIB}/dl.rb -${RUBY_LIB}/dl/callback.rb -${RUBY_LIB}/dl/cparser.rb -${RUBY_LIB}/dl/func.rb -${RUBY_LIB}/dl/import.rb -${RUBY_LIB}/dl/pack.rb -${RUBY_LIB}/dl/stack.rb -${RUBY_LIB}/dl/struct.rb -${RUBY_LIB}/dl/types.rb -${RUBY_LIB}/dl/value.rb -${RUBY_LIB}/drb.rb -${RUBY_LIB}/drb/acl.rb -${RUBY_LIB}/drb/drb.rb -${RUBY_LIB}/drb/eq.rb -${RUBY_LIB}/drb/extserv.rb -${RUBY_LIB}/drb/extservm.rb -${RUBY_LIB}/drb/gw.rb -${RUBY_LIB}/drb/invokemethod.rb -${RUBY_LIB}/drb/observer.rb -${RUBY_LIB}/drb/ssl.rb -${RUBY_LIB}/drb/timeridconv.rb -${RUBY_LIB}/drb/unix.rb -${RUBY_LIB}/e2mmap.rb -${RUBY_LIB}/erb.rb -${RUBY_LIB}/expect.rb -${RUBY_LIB}/fileutils.rb -${RUBY_LIB}/find.rb -${RUBY_LIB}/forwardable.rb -${RUBY_LIB}/getoptlong.rb -${RUBY_LIB}/gserver.rb -${PLIST.io}${RUBY_LIB}/io/console/size.rb -${RUBY_LIB}/ipaddr.rb -${RUBY_LIB}/irb.rb -${RUBY_LIB}/irb/cmd/chws.rb -${RUBY_LIB}/irb/cmd/fork.rb -${RUBY_LIB}/irb/cmd/help.rb -${RUBY_LIB}/irb/cmd/load.rb -${RUBY_LIB}/irb/cmd/nop.rb -${RUBY_LIB}/irb/cmd/pushws.rb -${RUBY_LIB}/irb/cmd/subirb.rb -${RUBY_LIB}/irb/completion.rb -${RUBY_LIB}/irb/context.rb -${RUBY_LIB}/irb/ext/change-ws.rb -${RUBY_LIB}/irb/ext/history.rb -${RUBY_LIB}/irb/ext/loader.rb -${RUBY_LIB}/irb/ext/math-mode.rb -${RUBY_LIB}/irb/ext/multi-irb.rb -${RUBY_LIB}/irb/ext/save-history.rb -${RUBY_LIB}/irb/ext/tracer.rb -${RUBY_LIB}/irb/ext/use-loader.rb -${RUBY_LIB}/irb/ext/workspaces.rb -${RUBY_LIB}/irb/extend-command.rb -${RUBY_LIB}/irb/frame.rb -${RUBY_LIB}/irb/help.rb -${RUBY_LIB}/irb/init.rb -${RUBY_LIB}/irb/input-method.rb -${RUBY_LIB}/irb/inspector.rb -${RUBY_LIB}/irb/lc/error.rb -${RUBY_LIB}/irb/lc/help-message -${RUBY_LIB}/irb/lc/ja/encoding_aliases.rb -${RUBY_LIB}/irb/lc/ja/error.rb -${RUBY_LIB}/irb/lc/ja/help-message -${RUBY_LIB}/irb/locale.rb -${RUBY_LIB}/irb/magic-file.rb -${RUBY_LIB}/irb/notifier.rb -${RUBY_LIB}/irb/output-method.rb -${RUBY_LIB}/irb/ruby-lex.rb -${RUBY_LIB}/irb/ruby-token.rb -${RUBY_LIB}/irb/slex.rb -${RUBY_LIB}/irb/src_encoding.rb -${RUBY_LIB}/irb/version.rb -${RUBY_LIB}/irb/workspace.rb -${RUBY_LIB}/irb/ws-for-case-2.rb -${RUBY_LIB}/irb/xmp.rb -${RUBY_LIB}/json.rb -${RUBY_LIB}/json/add/bigdecimal.rb -${RUBY_LIB}/json/add/complex.rb -${RUBY_LIB}/json/add/core.rb -${RUBY_LIB}/json/add/date.rb -${RUBY_LIB}/json/add/date_time.rb -${RUBY_LIB}/json/add/exception.rb -${RUBY_LIB}/json/add/ostruct.rb -${RUBY_LIB}/json/add/range.rb -${RUBY_LIB}/json/add/rational.rb -${RUBY_LIB}/json/add/regexp.rb -${RUBY_LIB}/json/add/struct.rb -${RUBY_LIB}/json/add/symbol.rb -${RUBY_LIB}/json/add/time.rb -${RUBY_LIB}/json/common.rb -${RUBY_LIB}/json/ext.rb -${RUBY_LIB}/json/generic_object.rb -${RUBY_LIB}/json/version.rb -${RUBY_LIB}/kconv.rb -${RUBY_LIB}/logger.rb -${RUBY_LIB}/mathn.rb -${RUBY_LIB}/matrix.rb -${RUBY_LIB}/matrix/eigenvalue_decomposition.rb -${RUBY_LIB}/matrix/lup_decomposition.rb -${RUBY_LIB}/minitest/autorun.rb -${RUBY_LIB}/minitest/benchmark.rb -${RUBY_LIB}/minitest/hell.rb -${RUBY_LIB}/minitest/mock.rb -${RUBY_LIB}/minitest/parallel_each.rb -${RUBY_LIB}/minitest/pride.rb -${RUBY_LIB}/minitest/spec.rb -${RUBY_LIB}/minitest/unit.rb -${RUBY_LIB}/mkmf.rb -${RUBY_LIB}/monitor.rb -${RUBY_LIB}/mutex_m.rb -${RUBY_LIB}/net/ftp.rb -${RUBY_LIB}/net/http.rb -${RUBY_LIB}/net/http/backward.rb -${RUBY_LIB}/net/http/exceptions.rb -${RUBY_LIB}/net/http/generic_request.rb -${RUBY_LIB}/net/http/header.rb -${RUBY_LIB}/net/http/proxy_delta.rb -${RUBY_LIB}/net/http/request.rb -${RUBY_LIB}/net/http/requests.rb -${RUBY_LIB}/net/http/response.rb -${RUBY_LIB}/net/http/responses.rb -${RUBY_LIB}/net/https.rb -${RUBY_LIB}/net/imap.rb -${RUBY_LIB}/net/pop.rb -${RUBY_LIB}/net/protocol.rb -${RUBY_LIB}/net/smtp.rb -${RUBY_LIB}/net/telnet.rb -${RUBY_LIB}/observer.rb -${RUBY_LIB}/open-uri.rb -${RUBY_LIB}/open3.rb -${RUBY_LIB}/openssl.rb -${RUBY_LIB}/openssl/bn.rb -${RUBY_LIB}/openssl/buffering.rb -${RUBY_LIB}/openssl/cipher.rb -${RUBY_LIB}/openssl/config.rb -${RUBY_LIB}/openssl/digest.rb -${RUBY_LIB}/openssl/ssl.rb -${RUBY_LIB}/openssl/x509.rb -${RUBY_LIB}/optparse.rb -${RUBY_LIB}/optparse/ac.rb -${RUBY_LIB}/optparse/date.rb -${RUBY_LIB}/optparse/shellwords.rb -${RUBY_LIB}/optparse/time.rb -${RUBY_LIB}/optparse/uri.rb -${RUBY_LIB}/optparse/version.rb -${RUBY_LIB}/ostruct.rb -${RUBY_LIB}/pathname.rb -${RUBY_LIB}/pp.rb -${RUBY_LIB}/prettyprint.rb -${RUBY_LIB}/prime.rb -${RUBY_LIB}/profile.rb -${RUBY_LIB}/profiler.rb -${RUBY_LIB}/pstore.rb -${RUBY_LIB}/psych.rb -${RUBY_LIB}/psych/coder.rb -${RUBY_LIB}/psych/core_ext.rb -${RUBY_LIB}/psych/deprecated.rb -${RUBY_LIB}/psych/handler.rb -${RUBY_LIB}/psych/handlers/document_stream.rb -${RUBY_LIB}/psych/handlers/recorder.rb -${RUBY_LIB}/psych/json/ruby_events.rb -${RUBY_LIB}/psych/json/stream.rb -${RUBY_LIB}/psych/json/tree_builder.rb -${RUBY_LIB}/psych/json/yaml_events.rb -${RUBY_LIB}/psych/nodes.rb -${RUBY_LIB}/psych/nodes/alias.rb -${RUBY_LIB}/psych/nodes/document.rb -${RUBY_LIB}/psych/nodes/mapping.rb -${RUBY_LIB}/psych/nodes/node.rb -${RUBY_LIB}/psych/nodes/scalar.rb -${RUBY_LIB}/psych/nodes/sequence.rb -${RUBY_LIB}/psych/nodes/stream.rb -${RUBY_LIB}/psych/omap.rb -${RUBY_LIB}/psych/parser.rb -${RUBY_LIB}/psych/scalar_scanner.rb -${RUBY_LIB}/psych/set.rb -${RUBY_LIB}/psych/stream.rb -${RUBY_LIB}/psych/streaming.rb -${RUBY_LIB}/psych/syntax_error.rb -${RUBY_LIB}/psych/tree_builder.rb -${RUBY_LIB}/psych/visitors.rb -${RUBY_LIB}/psych/visitors/depth_first.rb -${RUBY_LIB}/psych/visitors/emitter.rb -${RUBY_LIB}/psych/visitors/json_tree.rb -${RUBY_LIB}/psych/visitors/to_ruby.rb -${RUBY_LIB}/psych/visitors/visitor.rb -${RUBY_LIB}/psych/visitors/yaml_tree.rb -${RUBY_LIB}/psych/y.rb -${RUBY_LIB}/racc/parser.rb -${RUBY_LIB}/rake.rb -${RUBY_LIB}/rake/alt_system.rb -${RUBY_LIB}/rake/application.rb -${RUBY_LIB}/rake/backtrace.rb -${RUBY_LIB}/rake/classic_namespace.rb -${RUBY_LIB}/rake/clean.rb -${RUBY_LIB}/rake/cloneable.rb -${RUBY_LIB}/rake/contrib/compositepublisher.rb -${RUBY_LIB}/rake/contrib/ftptools.rb -${RUBY_LIB}/rake/contrib/publisher.rb -${RUBY_LIB}/rake/contrib/rubyforgepublisher.rb -${RUBY_LIB}/rake/contrib/sshpublisher.rb -${RUBY_LIB}/rake/contrib/sys.rb -${RUBY_LIB}/rake/default_loader.rb -${RUBY_LIB}/rake/dsl_definition.rb -${RUBY_LIB}/rake/early_time.rb -${RUBY_LIB}/rake/ext/core.rb -${RUBY_LIB}/rake/ext/module.rb -${RUBY_LIB}/rake/ext/string.rb -${RUBY_LIB}/rake/ext/time.rb -${RUBY_LIB}/rake/file_creation_task.rb -${RUBY_LIB}/rake/file_list.rb -${RUBY_LIB}/rake/file_task.rb -${RUBY_LIB}/rake/file_utils.rb -${RUBY_LIB}/rake/file_utils_ext.rb -${RUBY_LIB}/rake/gempackagetask.rb -${RUBY_LIB}/rake/invocation_chain.rb -${RUBY_LIB}/rake/invocation_exception_mixin.rb -${RUBY_LIB}/rake/lib/project.rake -${RUBY_LIB}/rake/loaders/makefile.rb -${RUBY_LIB}/rake/multi_task.rb -${RUBY_LIB}/rake/name_space.rb -${RUBY_LIB}/rake/packagetask.rb -${RUBY_LIB}/rake/pathmap.rb -${RUBY_LIB}/rake/phony.rb -${RUBY_LIB}/rake/private_reader.rb -${RUBY_LIB}/rake/promise.rb -${RUBY_LIB}/rake/pseudo_status.rb -${RUBY_LIB}/rake/rake_module.rb -${RUBY_LIB}/rake/rake_test_loader.rb -${RUBY_LIB}/rake/rdoctask.rb -${RUBY_LIB}/rake/ruby182_test_unit_fix.rb -${RUBY_LIB}/rake/rule_recursion_overflow_error.rb -${RUBY_LIB}/rake/runtest.rb -${RUBY_LIB}/rake/task.rb -${RUBY_LIB}/rake/task_argument_error.rb -${RUBY_LIB}/rake/task_arguments.rb -${RUBY_LIB}/rake/task_manager.rb -${RUBY_LIB}/rake/tasklib.rb -${RUBY_LIB}/rake/testtask.rb -${RUBY_LIB}/rake/thread_history_display.rb -${RUBY_LIB}/rake/thread_pool.rb -${RUBY_LIB}/rake/trace_output.rb -${RUBY_LIB}/rake/version.rb -${RUBY_LIB}/rake/win32.rb -${RUBY_LIB}/rational.rb -${RUBY_LIB}/rbconfig/datadir.rb -${RUBY_LIB}/rbconfig/obsolete.rb -${RUBY_LIB}/rdoc.rb -${RUBY_LIB}/rdoc/alias.rb -${RUBY_LIB}/rdoc/anon_class.rb -${RUBY_LIB}/rdoc/any_method.rb -${RUBY_LIB}/rdoc/attr.rb -${RUBY_LIB}/rdoc/class_module.rb -${RUBY_LIB}/rdoc/code_object.rb -${RUBY_LIB}/rdoc/code_objects.rb -${RUBY_LIB}/rdoc/comment.rb -${RUBY_LIB}/rdoc/constant.rb -${RUBY_LIB}/rdoc/context.rb -${RUBY_LIB}/rdoc/context/section.rb -${RUBY_LIB}/rdoc/cross_reference.rb -${RUBY_LIB}/rdoc/encoding.rb -${RUBY_LIB}/rdoc/erb_partial.rb -${RUBY_LIB}/rdoc/erbio.rb -${RUBY_LIB}/rdoc/extend.rb -${RUBY_LIB}/rdoc/generator.rb -${RUBY_LIB}/rdoc/generator/darkfish.rb -${RUBY_LIB}/rdoc/generator/json_index.rb -${RUBY_LIB}/rdoc/generator/markup.rb -${RUBY_LIB}/rdoc/generator/ri.rb -${RUBY_LIB}/rdoc/generator/template/darkfish/_footer.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_head.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_VCS_info.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_classes.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_extends.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_in_files.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_includes.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_installed.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_methods.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_navigation.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_pages.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_parent.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_search.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_sections.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/class.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/images/add.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/arrow_up.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/brick.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/brick_link.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/bug.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/bullet_black.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/bullet_toggle_minus.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/bullet_toggle_plus.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/date.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/delete.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/find.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/loadingAnimation.gif -${RUBY_LIB}/rdoc/generator/template/darkfish/images/macFFBgHack.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/package.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/page_green.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/page_white_text.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/page_white_width.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/plugin.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/ruby.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/tag_blue.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/tag_green.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/transparent.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/wrench.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/wrench_orange.png -${RUBY_LIB}/rdoc/generator/template/darkfish/images/zoom.png -${RUBY_LIB}/rdoc/generator/template/darkfish/index.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/js/darkfish.js -${RUBY_LIB}/rdoc/generator/template/darkfish/js/jquery.js -${RUBY_LIB}/rdoc/generator/template/darkfish/js/search.js -${RUBY_LIB}/rdoc/generator/template/darkfish/page.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/rdoc.css -${RUBY_LIB}/rdoc/generator/template/darkfish/servlet_not_found.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/servlet_root.rhtml -${RUBY_LIB}/rdoc/generator/template/darkfish/table_of_contents.rhtml -${RUBY_LIB}/rdoc/generator/template/json_index/js/navigation.js -${RUBY_LIB}/rdoc/generator/template/json_index/js/searcher.js -${RUBY_LIB}/rdoc/ghost_method.rb -${RUBY_LIB}/rdoc/include.rb -${RUBY_LIB}/rdoc/known_classes.rb -${RUBY_LIB}/rdoc/markdown.rb -${RUBY_LIB}/rdoc/markdown/entities.rb -${RUBY_LIB}/rdoc/markdown/literals_1_9.rb -${RUBY_LIB}/rdoc/markup.rb -${RUBY_LIB}/rdoc/markup/attr_changer.rb -${RUBY_LIB}/rdoc/markup/attr_span.rb -${RUBY_LIB}/rdoc/markup/attribute_manager.rb -${RUBY_LIB}/rdoc/markup/attributes.rb -${RUBY_LIB}/rdoc/markup/blank_line.rb -${RUBY_LIB}/rdoc/markup/block_quote.rb -${RUBY_LIB}/rdoc/markup/document.rb -${RUBY_LIB}/rdoc/markup/formatter.rb -${RUBY_LIB}/rdoc/markup/formatter_test_case.rb -${RUBY_LIB}/rdoc/markup/hard_break.rb -${RUBY_LIB}/rdoc/markup/heading.rb -${RUBY_LIB}/rdoc/markup/include.rb -${RUBY_LIB}/rdoc/markup/indented_paragraph.rb -${RUBY_LIB}/rdoc/markup/inline.rb -${RUBY_LIB}/rdoc/markup/list.rb -${RUBY_LIB}/rdoc/markup/list_item.rb -${RUBY_LIB}/rdoc/markup/paragraph.rb -${RUBY_LIB}/rdoc/markup/parser.rb -${RUBY_LIB}/rdoc/markup/pre_process.rb -${RUBY_LIB}/rdoc/markup/raw.rb -${RUBY_LIB}/rdoc/markup/rule.rb -${RUBY_LIB}/rdoc/markup/special.rb -${RUBY_LIB}/rdoc/markup/text_formatter_test_case.rb -${RUBY_LIB}/rdoc/markup/to_ansi.rb -${RUBY_LIB}/rdoc/markup/to_bs.rb -${RUBY_LIB}/rdoc/markup/to_html.rb -${RUBY_LIB}/rdoc/markup/to_html_crossref.rb -${RUBY_LIB}/rdoc/markup/to_html_snippet.rb -${RUBY_LIB}/rdoc/markup/to_joined_paragraph.rb -${RUBY_LIB}/rdoc/markup/to_label.rb -${RUBY_LIB}/rdoc/markup/to_markdown.rb -${RUBY_LIB}/rdoc/markup/to_rdoc.rb -${RUBY_LIB}/rdoc/markup/to_table_of_contents.rb -${RUBY_LIB}/rdoc/markup/to_test.rb -${RUBY_LIB}/rdoc/markup/to_tt_only.rb -${RUBY_LIB}/rdoc/markup/verbatim.rb -${RUBY_LIB}/rdoc/meta_method.rb -${RUBY_LIB}/rdoc/method_attr.rb -${RUBY_LIB}/rdoc/normal_class.rb -${RUBY_LIB}/rdoc/normal_module.rb -${RUBY_LIB}/rdoc/options.rb -${RUBY_LIB}/rdoc/parser.rb -${RUBY_LIB}/rdoc/parser/c.rb -${RUBY_LIB}/rdoc/parser/changelog.rb -${RUBY_LIB}/rdoc/parser/markdown.rb -${RUBY_LIB}/rdoc/parser/rd.rb -${RUBY_LIB}/rdoc/parser/ruby.rb -${RUBY_LIB}/rdoc/parser/ruby_tools.rb -${RUBY_LIB}/rdoc/parser/simple.rb -${RUBY_LIB}/rdoc/parser/text.rb -${RUBY_LIB}/rdoc/rd.rb -${RUBY_LIB}/rdoc/rd/block_parser.rb -${RUBY_LIB}/rdoc/rd/inline.rb -${RUBY_LIB}/rdoc/rd/inline_parser.rb -${RUBY_LIB}/rdoc/rdoc.rb -${RUBY_LIB}/rdoc/require.rb -${RUBY_LIB}/rdoc/ri.rb -${RUBY_LIB}/rdoc/ri/driver.rb -${RUBY_LIB}/rdoc/ri/formatter.rb -${RUBY_LIB}/rdoc/ri/paths.rb -${RUBY_LIB}/rdoc/ri/store.rb -${RUBY_LIB}/rdoc/ruby_lex.rb -${RUBY_LIB}/rdoc/ruby_token.rb -${RUBY_LIB}/rdoc/rubygems_hook.rb -${RUBY_LIB}/rdoc/servlet.rb -${RUBY_LIB}/rdoc/single_class.rb -${RUBY_LIB}/rdoc/stats.rb -${RUBY_LIB}/rdoc/stats/normal.rb -${RUBY_LIB}/rdoc/stats/quiet.rb -${RUBY_LIB}/rdoc/stats/verbose.rb -${RUBY_LIB}/rdoc/store.rb -${RUBY_LIB}/rdoc/task.rb -${RUBY_LIB}/rdoc/test_case.rb -${RUBY_LIB}/rdoc/text.rb -${RUBY_LIB}/rdoc/token_stream.rb -${RUBY_LIB}/rdoc/tom_doc.rb -${RUBY_LIB}/rdoc/top_level.rb -${RUBY_LIB}/resolv-replace.rb -${RUBY_LIB}/resolv.rb -${RUBY_LIB}/rexml/attlistdecl.rb -${RUBY_LIB}/rexml/attribute.rb -${RUBY_LIB}/rexml/cdata.rb -${RUBY_LIB}/rexml/child.rb -${RUBY_LIB}/rexml/comment.rb -${RUBY_LIB}/rexml/doctype.rb -${RUBY_LIB}/rexml/document.rb -${RUBY_LIB}/rexml/dtd/attlistdecl.rb -${RUBY_LIB}/rexml/dtd/dtd.rb -${RUBY_LIB}/rexml/dtd/elementdecl.rb -${RUBY_LIB}/rexml/dtd/entitydecl.rb -${RUBY_LIB}/rexml/dtd/notationdecl.rb -${RUBY_LIB}/rexml/element.rb -${RUBY_LIB}/rexml/encoding.rb -${RUBY_LIB}/rexml/entity.rb -${RUBY_LIB}/rexml/formatters/default.rb -${RUBY_LIB}/rexml/formatters/pretty.rb -${RUBY_LIB}/rexml/formatters/transitive.rb -${RUBY_LIB}/rexml/functions.rb -${RUBY_LIB}/rexml/instruction.rb -${RUBY_LIB}/rexml/light/node.rb -${RUBY_LIB}/rexml/namespace.rb -${RUBY_LIB}/rexml/node.rb -${RUBY_LIB}/rexml/output.rb -${RUBY_LIB}/rexml/parent.rb -${RUBY_LIB}/rexml/parseexception.rb -${RUBY_LIB}/rexml/parsers/baseparser.rb -${RUBY_LIB}/rexml/parsers/lightparser.rb -${RUBY_LIB}/rexml/parsers/pullparser.rb -${RUBY_LIB}/rexml/parsers/sax2parser.rb -${RUBY_LIB}/rexml/parsers/streamparser.rb -${RUBY_LIB}/rexml/parsers/treeparser.rb -${RUBY_LIB}/rexml/parsers/ultralightparser.rb -${RUBY_LIB}/rexml/parsers/xpathparser.rb -${RUBY_LIB}/rexml/quickpath.rb -${RUBY_LIB}/rexml/rexml.rb -${RUBY_LIB}/rexml/sax2listener.rb -${RUBY_LIB}/rexml/source.rb -${RUBY_LIB}/rexml/streamlistener.rb -${RUBY_LIB}/rexml/syncenumerator.rb -${RUBY_LIB}/rexml/text.rb -${RUBY_LIB}/rexml/undefinednamespaceexception.rb -${RUBY_LIB}/rexml/validation/relaxng.rb -${RUBY_LIB}/rexml/validation/validation.rb -${RUBY_LIB}/rexml/validation/validationexception.rb -${RUBY_LIB}/rexml/xmldecl.rb -${RUBY_LIB}/rexml/xmltokens.rb -${RUBY_LIB}/rexml/xpath.rb -${RUBY_LIB}/rexml/xpath_parser.rb -${RUBY_LIB}/rinda/rinda.rb -${RUBY_LIB}/rinda/ring.rb -${RUBY_LIB}/rinda/tuplespace.rb -${RUBY_LIB}/ripper.rb -${RUBY_LIB}/ripper/core.rb -${RUBY_LIB}/ripper/filter.rb -${RUBY_LIB}/ripper/lexer.rb -${RUBY_LIB}/ripper/sexp.rb -${RUBY_LIB}/rss.rb -${RUBY_LIB}/rss/0.9.rb -${RUBY_LIB}/rss/1.0.rb -${RUBY_LIB}/rss/2.0.rb -${RUBY_LIB}/rss/atom.rb -${RUBY_LIB}/rss/content.rb -${RUBY_LIB}/rss/content/1.0.rb -${RUBY_LIB}/rss/content/2.0.rb -${RUBY_LIB}/rss/converter.rb -${RUBY_LIB}/rss/dublincore.rb -${RUBY_LIB}/rss/dublincore/1.0.rb -${RUBY_LIB}/rss/dublincore/2.0.rb -${RUBY_LIB}/rss/dublincore/atom.rb -${RUBY_LIB}/rss/image.rb -${RUBY_LIB}/rss/itunes.rb -${RUBY_LIB}/rss/maker.rb -${RUBY_LIB}/rss/maker/0.9.rb -${RUBY_LIB}/rss/maker/1.0.rb -${RUBY_LIB}/rss/maker/2.0.rb -${RUBY_LIB}/rss/maker/atom.rb -${RUBY_LIB}/rss/maker/base.rb -${RUBY_LIB}/rss/maker/content.rb -${RUBY_LIB}/rss/maker/dublincore.rb -${RUBY_LIB}/rss/maker/entry.rb -${RUBY_LIB}/rss/maker/feed.rb -${RUBY_LIB}/rss/maker/image.rb -${RUBY_LIB}/rss/maker/itunes.rb -${RUBY_LIB}/rss/maker/slash.rb -${RUBY_LIB}/rss/maker/syndication.rb -${RUBY_LIB}/rss/maker/taxonomy.rb -${RUBY_LIB}/rss/maker/trackback.rb -${RUBY_LIB}/rss/parser.rb -${RUBY_LIB}/rss/rexmlparser.rb -${RUBY_LIB}/rss/rss.rb -${RUBY_LIB}/rss/slash.rb -${RUBY_LIB}/rss/syndication.rb -${RUBY_LIB}/rss/taxonomy.rb -${RUBY_LIB}/rss/trackback.rb -${RUBY_LIB}/rss/utils.rb -${RUBY_LIB}/rss/xml-stylesheet.rb -${RUBY_LIB}/rss/xml.rb -${RUBY_LIB}/rss/xmlparser.rb -${RUBY_LIB}/rss/xmlscanner.rb -${RUBY_LIB}/rubygems.rb -${RUBY_LIB}/rubygems/available_set.rb -${RUBY_LIB}/rubygems/command.rb -${RUBY_LIB}/rubygems/command_manager.rb -${RUBY_LIB}/rubygems/commands/build_command.rb -${RUBY_LIB}/rubygems/commands/cert_command.rb -${RUBY_LIB}/rubygems/commands/check_command.rb -${RUBY_LIB}/rubygems/commands/cleanup_command.rb -${RUBY_LIB}/rubygems/commands/contents_command.rb -${RUBY_LIB}/rubygems/commands/dependency_command.rb -${RUBY_LIB}/rubygems/commands/environment_command.rb -${RUBY_LIB}/rubygems/commands/fetch_command.rb -${RUBY_LIB}/rubygems/commands/generate_index_command.rb -${RUBY_LIB}/rubygems/commands/help_command.rb -${RUBY_LIB}/rubygems/commands/install_command.rb -${RUBY_LIB}/rubygems/commands/list_command.rb -${RUBY_LIB}/rubygems/commands/lock_command.rb -${RUBY_LIB}/rubygems/commands/mirror_command.rb -${RUBY_LIB}/rubygems/commands/outdated_command.rb -${RUBY_LIB}/rubygems/commands/owner_command.rb -${RUBY_LIB}/rubygems/commands/pristine_command.rb -${RUBY_LIB}/rubygems/commands/push_command.rb -${RUBY_LIB}/rubygems/commands/query_command.rb -${RUBY_LIB}/rubygems/commands/rdoc_command.rb -${RUBY_LIB}/rubygems/commands/search_command.rb -${RUBY_LIB}/rubygems/commands/server_command.rb -${RUBY_LIB}/rubygems/commands/setup_command.rb -${RUBY_LIB}/rubygems/commands/sources_command.rb -${RUBY_LIB}/rubygems/commands/specification_command.rb -${RUBY_LIB}/rubygems/commands/stale_command.rb -${RUBY_LIB}/rubygems/commands/uninstall_command.rb -${RUBY_LIB}/rubygems/commands/unpack_command.rb -${RUBY_LIB}/rubygems/commands/update_command.rb -${RUBY_LIB}/rubygems/commands/which_command.rb -${RUBY_LIB}/rubygems/commands/yank_command.rb -${RUBY_LIB}/rubygems/compatibility.rb -${RUBY_LIB}/rubygems/config_file.rb -${RUBY_LIB}/rubygems/core_ext/kernel_gem.rb -${RUBY_LIB}/rubygems/core_ext/kernel_require.rb -${RUBY_LIB}/rubygems/defaults.rb -${RUBY_LIB}/rubygems/dependency.rb -${RUBY_LIB}/rubygems/dependency_installer.rb -${RUBY_LIB}/rubygems/dependency_list.rb -${RUBY_LIB}/rubygems/dependency_resolver.rb -${RUBY_LIB}/rubygems/deprecate.rb -${RUBY_LIB}/rubygems/doctor.rb -${RUBY_LIB}/rubygems/errors.rb -${RUBY_LIB}/rubygems/exceptions.rb -${RUBY_LIB}/rubygems/ext.rb -${RUBY_LIB}/rubygems/ext/builder.rb -${RUBY_LIB}/rubygems/ext/cmake_builder.rb -${RUBY_LIB}/rubygems/ext/configure_builder.rb -${RUBY_LIB}/rubygems/ext/ext_conf_builder.rb -${RUBY_LIB}/rubygems/ext/rake_builder.rb -${RUBY_LIB}/rubygems/gem_runner.rb -${RUBY_LIB}/rubygems/gemcutter_utilities.rb -${RUBY_LIB}/rubygems/indexer.rb -${RUBY_LIB}/rubygems/install_message.rb -${RUBY_LIB}/rubygems/install_update_options.rb -${RUBY_LIB}/rubygems/installer.rb -${RUBY_LIB}/rubygems/installer_test_case.rb -${RUBY_LIB}/rubygems/local_remote_options.rb -${RUBY_LIB}/rubygems/mock_gem_ui.rb -${RUBY_LIB}/rubygems/name_tuple.rb -${RUBY_LIB}/rubygems/package.rb -${RUBY_LIB}/rubygems/package/digest_io.rb -${RUBY_LIB}/rubygems/package/old.rb -${RUBY_LIB}/rubygems/package/tar_header.rb -${RUBY_LIB}/rubygems/package/tar_reader.rb -${RUBY_LIB}/rubygems/package/tar_reader/entry.rb -${RUBY_LIB}/rubygems/package/tar_test_case.rb -${RUBY_LIB}/rubygems/package/tar_writer.rb -${RUBY_LIB}/rubygems/package_task.rb -${RUBY_LIB}/rubygems/path_support.rb -${RUBY_LIB}/rubygems/platform.rb -${RUBY_LIB}/rubygems/psych_additions.rb -${RUBY_LIB}/rubygems/psych_tree.rb -${RUBY_LIB}/rubygems/rdoc.rb -${RUBY_LIB}/rubygems/remote_fetcher.rb -${RUBY_LIB}/rubygems/request_set.rb -${RUBY_LIB}/rubygems/requirement.rb -${RUBY_LIB}/rubygems/security.rb -${RUBY_LIB}/rubygems/security/policies.rb -${RUBY_LIB}/rubygems/security/policy.rb -${RUBY_LIB}/rubygems/security/signer.rb -${RUBY_LIB}/rubygems/security/trust_dir.rb -${RUBY_LIB}/rubygems/server.rb -${RUBY_LIB}/rubygems/source.rb -${RUBY_LIB}/rubygems/source_list.rb -${RUBY_LIB}/rubygems/source_local.rb -${RUBY_LIB}/rubygems/source_specific_file.rb -${RUBY_LIB}/rubygems/spec_fetcher.rb -${RUBY_LIB}/rubygems/specification.rb -${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem -${RUBY_LIB}/rubygems/ssl_certs/AddTrustExternalCARoot.pem -${RUBY_LIB}/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem -${RUBY_LIB}/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem -${RUBY_LIB}/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem -${RUBY_LIB}/rubygems/ssl_certs/GeoTrustGlobalCA.pem -${RUBY_LIB}/rubygems/syck_hack.rb -${RUBY_LIB}/rubygems/test_case.rb -${RUBY_LIB}/rubygems/test_utilities.rb -${RUBY_LIB}/rubygems/text.rb -${RUBY_LIB}/rubygems/uninstaller.rb -${RUBY_LIB}/rubygems/user_interaction.rb -${RUBY_LIB}/rubygems/validator.rb -${RUBY_LIB}/rubygems/version.rb -${RUBY_LIB}/rubygems/version_option.rb -${RUBY_LIB}/scanf.rb -${RUBY_LIB}/securerandom.rb -${RUBY_LIB}/set.rb -${RUBY_LIB}/shell.rb -${RUBY_LIB}/shell/builtin-command.rb -${RUBY_LIB}/shell/command-processor.rb -${RUBY_LIB}/shell/error.rb -${RUBY_LIB}/shell/filter.rb -${RUBY_LIB}/shell/process-controller.rb -${RUBY_LIB}/shell/system-command.rb -${RUBY_LIB}/shell/version.rb -${RUBY_LIB}/shellwords.rb -${RUBY_LIB}/singleton.rb -${RUBY_LIB}/socket.rb -${RUBY_LIB}/sync.rb -${RUBY_LIB}/syslog/logger.rb -${RUBY_LIB}/tempfile.rb -${RUBY_LIB}/test/unit.rb -${RUBY_LIB}/test/unit/assertions.rb -${RUBY_LIB}/test/unit/parallel.rb -${RUBY_LIB}/test/unit/testcase.rb -${RUBY_LIB}/thread.rb -${RUBY_LIB}/thwait.rb -${RUBY_LIB}/time.rb -${RUBY_LIB}/timeout.rb -${RUBY_LIB}/tmpdir.rb -${RUBY_LIB}/tracer.rb -${RUBY_LIB}/tsort.rb -${RUBY_LIB}/ubygems.rb -${RUBY_LIB}/un.rb -${RUBY_LIB}/uri.rb -${RUBY_LIB}/uri/common.rb -${RUBY_LIB}/uri/ftp.rb -${RUBY_LIB}/uri/generic.rb -${RUBY_LIB}/uri/http.rb -${RUBY_LIB}/uri/https.rb -${RUBY_LIB}/uri/ldap.rb -${RUBY_LIB}/uri/ldaps.rb -${RUBY_LIB}/uri/mailto.rb -${RUBY_LIB}/weakref.rb -${RUBY_LIB}/webrick.rb -${RUBY_LIB}/webrick/accesslog.rb -${RUBY_LIB}/webrick/cgi.rb -${RUBY_LIB}/webrick/compat.rb -${RUBY_LIB}/webrick/config.rb -${RUBY_LIB}/webrick/cookie.rb -${RUBY_LIB}/webrick/htmlutils.rb -${RUBY_LIB}/webrick/httpauth.rb -${RUBY_LIB}/webrick/httpauth/authenticator.rb -${RUBY_LIB}/webrick/httpauth/basicauth.rb -${RUBY_LIB}/webrick/httpauth/digestauth.rb -${RUBY_LIB}/webrick/httpauth/htdigest.rb -${RUBY_LIB}/webrick/httpauth/htgroup.rb -${RUBY_LIB}/webrick/httpauth/htpasswd.rb -${RUBY_LIB}/webrick/httpauth/userdb.rb -${RUBY_LIB}/webrick/httpproxy.rb -${RUBY_LIB}/webrick/httprequest.rb -${RUBY_LIB}/webrick/httpresponse.rb -${RUBY_LIB}/webrick/https.rb -${RUBY_LIB}/webrick/httpserver.rb -${RUBY_LIB}/webrick/httpservlet.rb -${RUBY_LIB}/webrick/httpservlet/abstract.rb -${RUBY_LIB}/webrick/httpservlet/cgi_runner.rb -${RUBY_LIB}/webrick/httpservlet/cgihandler.rb -${RUBY_LIB}/webrick/httpservlet/erbhandler.rb -${RUBY_LIB}/webrick/httpservlet/filehandler.rb -${RUBY_LIB}/webrick/httpservlet/prochandler.rb -${RUBY_LIB}/webrick/httpstatus.rb -${RUBY_LIB}/webrick/httputils.rb -${RUBY_LIB}/webrick/httpversion.rb -${RUBY_LIB}/webrick/log.rb -${RUBY_LIB}/webrick/server.rb -${RUBY_LIB}/webrick/ssl.rb -${RUBY_LIB}/webrick/utils.rb -${RUBY_LIB}/webrick/version.rb -${PLIST.win32}${RUBY_LIB}/win32/registry.rb -${PLIST.win32}${RUBY_LIB}/win32/resolv.rb -${PLIST.win32}${RUBY_LIB}/win32/sspi.rb -${PLIST.win32}${RUBY_LIB}/win32/sspi.rb -${PLIST.win32}${RUBY_LIB}/Win32API.rb -${PLIST.win32}${RUBY_LIB}/win32ole.rb -${PLIST.win32}${RUBY_LIB}/win32ole/property.rb -${RUBY_LIB}/xmlrpc.rb -${RUBY_LIB}/xmlrpc/base64.rb -${RUBY_LIB}/xmlrpc/client.rb -${RUBY_LIB}/xmlrpc/config.rb -${RUBY_LIB}/xmlrpc/create.rb -${RUBY_LIB}/xmlrpc/datetime.rb -${RUBY_LIB}/xmlrpc/httpserver.rb -${RUBY_LIB}/xmlrpc/marshal.rb -${RUBY_LIB}/xmlrpc/parser.rb -${RUBY_LIB}/xmlrpc/server.rb -${RUBY_LIB}/xmlrpc/utils.rb -${RUBY_LIB}/yaml.rb -${RUBY_LIB}/yaml/dbm.rb -${RUBY_LIB}/yaml/store.rb -${RUBY_ARCHLIB}/bigdecimal.${RUBY_DLEXT} -${RUBY_ARCHLIB}/continuation.${RUBY_DLEXT} -${RUBY_ARCHLIB}/coverage.${RUBY_DLEXT} -${RUBY_ARCHLIB}/date_core.${RUBY_DLEXT} -${RUBY_ARCHLIB}/dbm.${RUBY_DLEXT} -${RUBY_ARCHLIB}/digest.${RUBY_DLEXT} -${RUBY_ARCHLIB}/digest/bubblebabble.${RUBY_DLEXT} -${RUBY_ARCHLIB}/digest/md5.${RUBY_DLEXT} -${RUBY_ARCHLIB}/digest/rmd160.${RUBY_DLEXT} -${RUBY_ARCHLIB}/digest/sha1.${RUBY_DLEXT} -${RUBY_ARCHLIB}/digest/sha2.${RUBY_DLEXT} -${RUBY_ARCHLIB}/dl.${RUBY_DLEXT} -${RUBY_ARCHLIB}/dl/callback.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/big5.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/cp949.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/emacs_mule.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/encdb.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/euc_jp.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/euc_kr.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/euc_tw.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/gb18030.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/gb2312.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/gbk.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_1.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_10.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_11.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_13.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_14.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_15.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_16.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_2.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_3.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_4.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_5.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_6.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_7.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_8.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/iso_8859_9.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/koi8_r.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/koi8_u.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/shift_jis.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/big5.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/chinese.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/emoji.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/emoji_iso2022_kddi.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/emoji_sjis_docomo.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/emoji_sjis_kddi.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/emoji_sjis_softbank.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/escape.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/gb18030.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/gbk.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/iso2022.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/japanese.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/japanese_euc.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/japanese_sjis.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/korean.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/single_byte.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/transdb.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/utf8_mac.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/trans/utf_16_32.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/utf_16be.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/utf_16le.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/utf_32be.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/utf_32le.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/windows_1251.${RUBY_DLEXT} -${RUBY_ARCHLIB}/enc/windows_31j.${RUBY_DLEXT} -${RUBY_ARCHLIB}/etc.${RUBY_DLEXT} -${RUBY_ARCHLIB}/fcntl.${RUBY_DLEXT} -${RUBY_ARCHLIB}/fiber.${RUBY_DLEXT} -${PLIST.io}${RUBY_ARCHLIB}/io/console.${RUBY_DLEXT} -${PLIST.io}${RUBY_ARCHLIB}/io/nonblock.${RUBY_DLEXT} -${PLIST.io}${RUBY_ARCHLIB}/io/wait.${RUBY_DLEXT} -${RUBY_ARCHLIB}/json/ext/generator.${RUBY_DLEXT} -${RUBY_ARCHLIB}/json/ext/parser.${RUBY_DLEXT} -${RUBY_ARCHLIB}/mathn/complex.${RUBY_DLEXT} -${RUBY_ARCHLIB}/mathn/rational.${RUBY_DLEXT} -${RUBY_ARCHLIB}/nkf.${RUBY_DLEXT} -${RUBY_ARCHLIB}/objspace.${RUBY_DLEXT} -${RUBY_ARCHLIB}/openssl.${RUBY_DLEXT} -${RUBY_ARCHLIB}/pathname.${RUBY_DLEXT} -${RUBY_ARCHLIB}/psych.${RUBY_DLEXT} -${RUBY_ARCHLIB}/pty.${RUBY_DLEXT} -${RUBY_ARCHLIB}/racc/cparse.${RUBY_DLEXT} -${RUBY_ARCHLIB}/rbconfig.rb -${RUBY_ARCHLIB}/ripper.${RUBY_DLEXT} -${RUBY_ARCHLIB}/sdbm.${RUBY_DLEXT} -${RUBY_ARCHLIB}/socket.${RUBY_DLEXT} -${RUBY_ARCHLIB}/stringio.${RUBY_DLEXT} -${RUBY_ARCHLIB}/strscan.${RUBY_DLEXT} -${RUBY_ARCHLIB}/syslog.${RUBY_DLEXT} -${PLIST.win32}${RUBY_ARCHLIB}/win32ole.${RUBY_DLEXT} -${RUBY_ARCHLIB}/zlib.${RUBY_DLEXT} -${GEM_HOME}/gems/rake-0.9.6/bin/rake${RUBY_VER} -${GEM_HOME}/gems/rdoc-4.0.0/bin/rdoc${RUBY_VER} -${GEM_HOME}/gems/rdoc-4.0.0/bin/ri${RUBY_VER} -${GEM_HOME}/gems/test-unit-2.0.0.0/bin/testrb -${GEM_HOME}/specifications/default/bigdecimal-1.2.0.gemspec -${GEM_HOME}/specifications/default/io-console-0.4.2.gemspec -${GEM_HOME}/specifications/default/json-1.7.7.gemspec -${GEM_HOME}/specifications/default/minitest-4.3.2.gemspec -${GEM_HOME}/specifications/default/psych-2.0.0.gemspec -${GEM_HOME}/specifications/default/rake-0.9.6.gemspec -${GEM_HOME}/specifications/default/rdoc-4.0.0.gemspec -${GEM_HOME}/specifications/default/test-unit-2.0.0.0.gemspec -man/man1/erb${RUBY_VER}.1 -man/man1/irb${RUBY_VER}.1 -man/man1/rake${RUBY_VER}.1 -man/man1/ri${RUBY_VER}.1 -man/man1/${RUBY_NAME}.1 -${RUBY_DOC}/COPYING -${RUBY_DOC}/COPYING.ja -${RUBY_DOC}/ChangeLog -${RUBY_DOC}/ChangeLog-1.8.0 -${RUBY_DOC}/ChangeLog-1.9.3 -${RUBY_DOC}/ChangeLog-YARV -${RUBY_DOC}/LEGAL -${RUBY_DOC}/NEWS -${RUBY_DOC}/NEWS-1.8.7 -${RUBY_DOC}/NEWS-1.9.1 -${RUBY_DOC}/NEWS-1.9.2 -${RUBY_DOC}/NEWS-1.9.3 -${RUBY_DOC}/README -${RUBY_DOC}/README.EXT -${RUBY_DOC}/README.EXT.ja -${RUBY_DOC}/README.ja -${RUBY_DOC}/etc.rd.ja -${RUBY_DOC}/forwardable.rd.ja -${RUBY_DOC}/globals.rdoc -${RUBY_DOC}/images/boottime-classes.png -${RUBY_DOC}/irb/irb-tools.rd.ja -${RUBY_DOC}/irb/irb.rd.ja -${RUBY_DOC}/pty/README.expect.ja -${RUBY_DOC}/pty/README.ja -${RUBY_DOC}/re.rdoc -${RUBY_DOC}/ripper/README -${RUBY_DOC}/security.rdoc -${RUBY_DOC}/shell.rd.ja -${RUBY_DOC}/standard_library.rdoc -${RUBY_DOC}/stringio/README -${RUBY_DOC}/syntax.rdoc -${RUBY_DOC}/syntax/assignment.rdoc -${RUBY_DOC}/syntax/calling_methods.rdoc -${RUBY_DOC}/syntax/control_expressions.rdoc -${RUBY_DOC}/syntax/exceptions.rdoc -${RUBY_DOC}/syntax/literals.rdoc -${RUBY_DOC}/syntax/methods.rdoc -${RUBY_DOC}/syntax/miscellaneous.rdoc -${RUBY_DOC}/syntax/modules_and_classes.rdoc -${RUBY_DOC}/syntax/precedence.rdoc -${RUBY_DOC}/syntax/refinements.rdoc -${RUBY_DOC}/syslog.txt -${RUBY_EG}/README -${RUBY_EG}/bigdecimal/linear.rb -${RUBY_EG}/bigdecimal/nlsolve.rb -${RUBY_EG}/bigdecimal/pi.rb -${RUBY_EG}/biorhythm.rb -${RUBY_EG}/cal.rb -${RUBY_EG}/cbreak.rb -${RUBY_EG}/clnt.rb -${RUBY_EG}/coverage.rb -${RUBY_EG}/dir.rb -${RUBY_EG}/drb/README.rd -${RUBY_EG}/drb/README.rd.ja -${RUBY_EG}/drb/darray.rb -${RUBY_EG}/drb/darrayc.rb -${RUBY_EG}/drb/dbiff.rb -${RUBY_EG}/drb/dcdbiff.rb -${RUBY_EG}/drb/dchatc.rb -${RUBY_EG}/drb/dchats.rb -${RUBY_EG}/drb/dhasen.rb -${RUBY_EG}/drb/dhasenc.rb -${RUBY_EG}/drb/dlogc.rb -${RUBY_EG}/drb/dlogd.rb -${RUBY_EG}/drb/dqin.rb -${RUBY_EG}/drb/dqlib.rb -${RUBY_EG}/drb/dqout.rb -${RUBY_EG}/drb/dqueue.rb -${RUBY_EG}/drb/drbc.rb -${RUBY_EG}/drb/drbch.rb -${RUBY_EG}/drb/drbm.rb -${RUBY_EG}/drb/drbmc.rb -${RUBY_EG}/drb/drbs-acl.rb -${RUBY_EG}/drb/drbs.rb -${RUBY_EG}/drb/drbssl_c.rb -${RUBY_EG}/drb/drbssl_s.rb -${RUBY_EG}/drb/extserv_test.rb -${RUBY_EG}/drb/gw_ct.rb -${RUBY_EG}/drb/gw_cu.rb -${RUBY_EG}/drb/gw_s.rb -${RUBY_EG}/drb/holderc.rb -${RUBY_EG}/drb/holders.rb -${RUBY_EG}/drb/http0.rb -${RUBY_EG}/drb/http0serv.rb -${RUBY_EG}/drb/name.rb -${RUBY_EG}/drb/namec.rb -${RUBY_EG}/drb/old_tuplespace.rb -${RUBY_EG}/drb/rinda_ts.rb -${RUBY_EG}/drb/rindac.rb -${RUBY_EG}/drb/rindas.rb -${RUBY_EG}/drb/ring_echo.rb -${RUBY_EG}/drb/ring_inspect.rb -${RUBY_EG}/drb/ring_place.rb -${RUBY_EG}/drb/simpletuple.rb -${RUBY_EG}/drb/speedc.rb -${RUBY_EG}/drb/speeds.rb -${RUBY_EG}/dualstack-fetch.rb -${RUBY_EG}/dualstack-httpd.rb -${RUBY_EG}/eval.rb -${RUBY_EG}/export.rb -${RUBY_EG}/exyacc.rb -${RUBY_EG}/fact.rb -${RUBY_EG}/fib.awk -${RUBY_EG}/fib.pl -${RUBY_EG}/fib.py -${RUBY_EG}/fib.rb -${RUBY_EG}/fib.scm -${RUBY_EG}/freq.rb -${RUBY_EG}/from.rb -${RUBY_EG}/fullpath.rb -${RUBY_EG}/less.rb -${RUBY_EG}/list.rb -${RUBY_EG}/list2.rb -${RUBY_EG}/list3.rb -${RUBY_EG}/logger/app.rb -${RUBY_EG}/logger/log.rb -${RUBY_EG}/logger/shifting.rb -${RUBY_EG}/mine.rb -${RUBY_EG}/mkproto.rb -${RUBY_EG}/mpart.rb -${RUBY_EG}/observ.rb -${RUBY_EG}/occur.pl -${RUBY_EG}/occur.rb -${RUBY_EG}/occur2.rb -${RUBY_EG}/openssl/c_rehash.rb -${RUBY_EG}/openssl/cert2text.rb -${RUBY_EG}/openssl/certstore.rb -${RUBY_EG}/openssl/cipher.rb -${RUBY_EG}/openssl/crlstore.rb -${RUBY_EG}/openssl/echo_cli.rb -${RUBY_EG}/openssl/echo_svr.rb -${RUBY_EG}/openssl/gen_csr.rb -${RUBY_EG}/openssl/smime_read.rb -${RUBY_EG}/openssl/smime_write.rb -${RUBY_EG}/openssl/wget.rb -${RUBY_EG}/optparse/opttest.rb -${RUBY_EG}/optparse/subcommand.rb -${RUBY_EG}/philos.rb -${RUBY_EG}/pi.rb -${RUBY_EG}/pty/expect_sample.rb -${RUBY_EG}/pty/script.rb -${RUBY_EG}/pty/shl.rb -${RUBY_EG}/rcs.awk -${RUBY_EG}/rcs.dat -${RUBY_EG}/rcs.rb -${RUBY_EG}/rdoc/markup/rdoc2latex.rb -${RUBY_EG}/rdoc/markup/sample.rb -${RUBY_EG}/ripper/ruby2html.rb -${RUBY_EG}/ripper/strip-comment.rb -${RUBY_EG}/rss/blend.rb -${RUBY_EG}/rss/convert.rb -${RUBY_EG}/rss/list_description.rb -${RUBY_EG}/rss/re_read.rb -${RUBY_EG}/rss/rss_recent.rb -${RUBY_EG}/sieve.rb -${RUBY_EG}/svr.rb -${RUBY_EG}/test.rb -${RUBY_EG}/testunit/adder.rb -${RUBY_EG}/testunit/subtracter.rb -${RUBY_EG}/testunit/tc_adder.rb -${RUBY_EG}/testunit/tc_subtracter.rb -${RUBY_EG}/testunit/ts_examples.rb -${RUBY_EG}/time.rb -${RUBY_EG}/timeout.rb -${RUBY_EG}/trojan.rb -${RUBY_EG}/tsvr.rb -${RUBY_EG}/uumerge.rb -${RUBY_EG}/webrick/demo-app.rb -${RUBY_EG}/webrick/demo-multipart.cgi -${RUBY_EG}/webrick/demo-servlet.rb -${RUBY_EG}/webrick/demo-urlencoded.cgi -${RUBY_EG}/webrick/hello.cgi -${RUBY_EG}/webrick/hello.rb -${RUBY_EG}/webrick/httpd.rb -${RUBY_EG}/webrick/httpproxy.rb -${RUBY_EG}/webrick/httpsd.rb -@pkgdir ${RUBY_SITEARCHLIB} -@pkgdir ${RUBY_VENDORARCHLIB} -@pkgdir ${GEM_HOME}/cache -@pkgdir ${GEM_HOME}/doc -@pkgdir ${RUBY_SITERIDIR} diff --git a/lang/ruby200-base/distinfo b/lang/ruby200-base/distinfo deleted file mode 100644 index 82cf71e1a618b..0000000000000 --- a/lang/ruby200-base/distinfo +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: distinfo,v 1.30 2015/12/16 16:00:40 taca Exp $ - -SHA1 (ruby-2.0.0-p648.tar.bz2) = 504be2eae6cdfe93aa7ed02ec55e35043d067ad5 -RMD160 (ruby-2.0.0-p648.tar.bz2) = 3b6fd5d89e6e53fb71f512f44b710148698a6e29 -SHA512 (ruby-2.0.0-p648.tar.bz2) = 609acf6d6352c9746e21cd7f0e7d29f5eb522e6fff2d5fad0431d63c568cc084ed5b7141f84cd33512d8213200d2d1a22e8d7df71469a980a3a92886133fea38 -Size (ruby-2.0.0-p648.tar.bz2) = 10785918 bytes -SHA1 (patch-configure) = aaa93fd2e4f130bb2cb852b15b58a1840e57dba5 -SHA1 (patch-defs_default__gems) = 28a47952e27c22055bac6ad151d092572b96b1ec -SHA1 (patch-ext_dbm_extconf.rb) = 7322637de769b7d01650e1ed566e891801ce3e92 -SHA1 (patch-ext_openssl_extconf.rb) = b286b3e3f31aca73ec644b42474e7cba63a4c363 -SHA1 (patch-ext_openssl_ossl_ssl.c) = e27602441729bb03e2927d0c9449a2d668af27a0 -SHA1 (patch-ext_tk_extconf.rb) = b5141d995afc455e4d64b578200f01d9dc75c310 -SHA1 (patch-ext_tk_lib_tk.rb) = 78034ed6fa0f24099ce06a717da2423731b276cb -SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 -SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323 -SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 9c43e59c48157de7c1540514df47c2670cf44d97 -SHA1 (patch-ext_tk_lib_tkextlib_tcllib_validator.rb) = b80d595866a360931ba46dbccc2bdde3d382e6f0 -SHA1 (patch-ext_tk_lib_tkextlib_tile_treeview.rb) = e31201b5d0f5c333f14b795ac5e670fdb9a250cf -SHA1 (patch-ext_tk_lib_tkextlib_tkimg_dted.rb) = a330891af14e69f7b7ebcdba33ac81afcd8eba12 -SHA1 (patch-ext_tk_lib_tkextlib_tkimg_raw.rb) = 21fcc547c7317d8110ed39d1559d2eaba31e3ec9 -SHA1 (patch-ext_tk_tcltklib.c) = fda2652b0a3acc0047004cc43077a393f93c5554 -SHA1 (patch-lib_rdoc_ri_driver.rb) = 53ce4055b4c008c8ee13d38a81334d4846debdbc -SHA1 (patch-lib_rubygems.rb) = 0f0b8f14745998f5ed0ade9b0b5cdefc8f30d988 -SHA1 (patch-lib_rubygems_commands_setup__command.rb) = 46991d63256d0d3cc2f707fb286d1691331ad40e -SHA1 (patch-lib_rubygems_commands_unpack__command.rb) = 58af5f0d1a185183ff9a4b4828ef1ca9fc074e05 -SHA1 (patch-lib_rubygems_config__file.rb) = 0d863d3f886c1ed83585d96064725e7db7bec1bc -SHA1 (patch-lib_rubygems_defaults.rb) = 1af4161a83c0bf5b894c4ab3f4a77d4ee4183985 -SHA1 (patch-lib_rubygems_dependency__installer.rb) = f4e40727d231b336c1d4c2303ac1c1e2b50f2710 -SHA1 (patch-lib_rubygems_install__update__options.rb) = 22cfafe090db72211253b8528937e5be0e677ebf -SHA1 (patch-lib_rubygems_installer.rb) = 7ce68eaa5893c83780f7b4e1af44a88ae63a39cf -SHA1 (patch-lib_rubygems_platform.rb) = 135f2e9d6c0c529da9ffcea4b96507675cdf1f16 -SHA1 (patch-lib_rubygems_specification.rb) = 2a283cb7854580616df2b35357281c0a881cedf1 -SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116 -SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7 -SHA1 (patch-man_ri.1) = af855135020f18c361cc55af676adc75e26bf4d3 -SHA1 (patch-man_ruby.1) = 499c2d5525498845b2ede651b7830e15c784b765 -SHA1 (patch-pack.c) = e2d005512c18b2fae32c1620f223b6c365023424 -SHA1 (patch-test_rubygems_test__gem.rb) = 32ba1a7a2e9f6174297de969fc0b7cdcd083c764 -SHA1 (patch-tool_rbinstall.rb) = 287064ed2bc90e92cdc1b38fc4031d65819d3843 diff --git a/lang/ruby200-base/hacks.mk b/lang/ruby200-base/hacks.mk deleted file mode 100644 index 0944c416aed69..0000000000000 --- a/lang/ruby200-base/hacks.mk +++ /dev/null @@ -1,37 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2014/12/15 11:46:35 jperkin Exp $ - -.if !defined(RUBY200_BASE_HACKS_MK) -RUBY200_BASE_HACKS_MK= defined - -.include "../../mk/compiler.mk" - -### [ Sun Jun 5 10:05:39 CEST 2005 : seb ] -### On NetBSD/sparc64, gcc optimisation, at least for version 3.3.3, -### produces segmentation faulting miniruby binary. -### Also note that `-O' level optimisation produces a miniruby -### binary that loops while running the installation scripts. -### -.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) -. if !empty(CC_VERSION:Mgcc-3.3.*) -PKG_HACKS+= optimisation -BUILDLINK_TRANSFORM+= rm:-O[0-9]* -. endif -### ruby193 binary built on NetBSD/sparc64 with gcc 4.5.1 and the default -O2 -### dumps core during generating RDocs. -### Using -O1 works around. -. if !empty(CC_VERSION:Mgcc-4.5.*) -PKG_HACKS+= optimisation -BUILDLINK_TRANSFORM+= opt:-O2:-O1 -. endif -.endif - -# On NetBSD/sh3el 6.0, the default -Os causes an error on compiling node.c: -# {standard input}: Assembler messages: {standard input}:1458: \ -# Error: pcrel too far -# and -O1 works around. -.if !empty(MACHINE_PLATFORM:MNetBSD-*-sh3*) && !empty(CC_VERSION:Mgcc-4.5.*) -PKG_HACKS+= optimisation -BUILDLINK_TRANSFORM+= opt:-Os:-O1 rm:-freorder-blocks -.endif - -.endif # RUBY200_BASE_HACKS_MK diff --git a/lang/ruby200-base/options.mk b/lang/ruby200-base/options.mk deleted file mode 100644 index 7aad5b2353a55..0000000000000 --- a/lang/ruby200-base/options.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2013/07/21 02:32:58 taca Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.ruby -PKG_SUPPORTED_OPTIONS= ruby-build-ri-db -PKG_SUGGESTED_OPTIONS= ruby-build-ri-db - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mruby-build-ri-db) -#PRIVILEGED_STAGES+= clean -RUBY_DYNAMIC_DIRS+= ${RUBY_SYSRIDIR} -# Use huge memory. -UNLIMIT_RESOURCES+= datasize -.else -CONFIGURE_ARGS+= --enable-install-doc=no -.endif diff --git a/lang/ruby200-base/patches/patch-configure b/lang/ruby200-base/patches/patch-configure deleted file mode 100644 index 737ce44053e0b..0000000000000 --- a/lang/ruby200-base/patches/patch-configure +++ /dev/null @@ -1,162 +0,0 @@ -$NetBSD: patch-configure,v 1.7 2015/04/03 09:01:11 jperkin Exp $ - -* Adding Interix and MirBSD support. -* Ignore doxygen. - ---- configure.orig 2015-02-25 10:52:37.000000000 +0000 -+++ configure -@@ -5193,7 +5193,7 @@ esac - else - if test x"$target_alias" = x; then - case "$target_os" in #( -- darwin*) : -+ notdarwin*) : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 - $as_echo_n "checking for real target cpu... " >&6; } -@@ -8385,6 +8385,10 @@ esac - superux*) : - ac_cv_func_setitimer=no - ;; #( -+ interix*) : -+ LIBS="-lm $LIBS" -+ ac_cv_func_getpgrp_void=yes -+ ;; #( - nacl) : - - LIBS="-lm $LIBS" -@@ -14972,7 +14976,7 @@ _ACEOF - fi - - case "$target_os" in #( -- openbsd*) : -+ openbsd*|mirbsd*) : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for heap align log on openbsd" >&5 - $as_echo_n "checking for heap align log on openbsd... " >&6; } -@@ -15246,6 +15250,8 @@ else - # ifdef _MSC_VER - # include - # define alloca _alloca -+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) -+# include - # else - # ifdef HAVE_ALLOCA_H - # include -@@ -17252,7 +17258,7 @@ done - MAINLIBS="-pthread $MAINLIBS" ;; #( - *) : - case "$target_os" in #( -- openbsd*) : -+ openbsd*|mirbsd*) : - LIBS="-pthread $LIBS" ;; #( - *) : - LIBS="-l$pthread_lib $LIBS" ;; -@@ -17625,7 +17631,9 @@ esac ;; #( - interix*) : - : ${LDSHARED='$(CC) -shared'} - XLDFLAGS="$XLDFLAGS -Wl,-E" -+ DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' - LIBPATHFLAG=" -L%1\$-s" -+ RPATHFLAG=' -Wl,-R%1$-s' - rb_cv_dlopen=yes ;; #( - freebsd*|dragonfly*) : - -@@ -18448,7 +18456,7 @@ esac - freebsd*|dragonfly*) : - - SOLIBS='$(LIBS)' -- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' -+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)$(TEENY)' - if test "$rb_cv_binary_elf" != "yes" ; then - LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" - LIBRUBY_ALIASES='' -@@ -18465,7 +18473,7 @@ esac - LIBRUBY_ALIASES="" - fi - ;; #( -- openbsd*) : -+ openbsd*|mirbsd*) : - - SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}` -@@ -18526,7 +18534,12 @@ esac - ;; #( - interix*) : - -- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' -+ SOLIBS='$(LIBS)' -+ LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' -+ # link explicitly to 0x48000000 -+ LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' -+ LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' -+ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' - ;; #( - mingw*|cygwin*|mswin*) : - -@@ -18684,7 +18697,7 @@ esac - esac - if test "$enable_rpath" = yes; then - test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS " -- LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L\$(libdir)" -+ LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${PREFIX}/lib -L\$(libdir)" - LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" - LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC" - fi -@@ -18855,11 +18868,7 @@ if test "$install_doc" != no; then - else - RDOCTARGET="nodoc" - fi -- if test "$install_capi" != no -a -n "$DOXYGEN"; then -- CAPITARGET="capi" -- else -- CAPITARGET="nodoc" -- fi -+ CAPITARGET="nodoc" - else - RDOCTARGET="nodoc" - CAPITARGET="nodoc" -@@ -19410,9 +19419,13 @@ unexpand_shvar() { - test "$#" -eq 0 && return - for n do - eval v='"$'$n'"' -- v="`echo \"$v\" | sed -e 's/${[^${}\"]*}/\"&\"/g' -e 's/[][$|.\\?*]/\\\\&/g'`" -+ v="`echo \"$v\" | sed -e 's/\${[^${}\"]*}/\"&\"/g' -e 's/[][$|.\\?*]/\\\\&/g'`" - if test -n "$v"; then -- expr="${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g" -+ if test -n "$expr"; then -+ expr="${expr};s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g" -+ else -+ expr="s|"'\("[^$"]*\)'"$v|\\1\${$n}\"|g" -+ fi - case "$v" in #( - *'${'*'}'*) : - expr="$expr;s|$v|\"\${$n}\"|g" ;; #( -@@ -19421,7 +19434,7 @@ unexpand_shvar() { - esac - fi - done -- expr='s/${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g' -+ expr='s/\${[^${}"]*}/"&"/g;'"${expr};"'s/"\(\${[^${}"]*}\)"/\1/g' - eval $var='"`echo \"\\\"${'$var'}\\\"\" | sed \"$expr;s/\\\"//g\"`"' - } - -@@ -21084,17 +21097,7 @@ which seems to be undefined. Please mak - "Makefile":F) - tmpmk=confmk$$.tmp - { -- if test ${VCS+set}; then -- : -- elif svn info "$srcdir" > /dev/null 2>&1; then -- VCS='svn' -- elif test -d "$srcdir/.git/svn"; then -- VCS='git svn' -- elif test -d "$srcdir/.git"; then -- VCS='git' -- else -- VCS='echo cannot' -- fi -+ VCS='echo cannot' - case "$VCS" in #( - svn) : - VCSUP='$(VCS) up $(SVNUPOPTIONS)' ;; #( diff --git a/lang/ruby200-base/patches/patch-defs_default__gems b/lang/ruby200-base/patches/patch-defs_default__gems deleted file mode 100644 index 66513859b9f11..0000000000000 --- a/lang/ruby200-base/patches/patch-defs_default__gems +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-defs_default__gems,v 1.1 2013/07/21 02:32:58 taca Exp $ - -* Add suffix to default gem's executables files. - ---- defs/default_gems.orig 2012-12-01 03:35:36.000000000 +0000 -+++ defs/default_gems -@@ -1,5 +1,5 @@ - # gem base directory versioning file [executable files under bin] --rake lib/rake lib/rake/version.rb [rake] --rdoc lib/rdoc lib/rdoc.rb [rdoc ri] -+rake lib/rake lib/rake/version.rb [rake200] -+rdoc lib/rdoc lib/rdoc.rb [rdoc200 ri200] - minitest lib/minitest lib/minitest/unit.rb - json ext/json ext/json/lib/json/version.rb diff --git a/lang/ruby200-base/patches/patch-ext_dbm_extconf.rb b/lang/ruby200-base/patches/patch-ext_dbm_extconf.rb deleted file mode 100644 index 4f8236deedfca..0000000000000 --- a/lang/ruby200-base/patches/patch-ext_dbm_extconf.rb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ext_dbm_extconf.rb,v 1.1 2015/01/07 10:37:11 taca Exp $ - -Fix for Mac OS X 10.4 Tiger. - ---- ext/dbm/extconf.rb.orig 2012-09-04 00:57:31.000000000 +0000 -+++ ext/dbm/extconf.rb -@@ -119,7 +119,7 @@ def headers.db_check2(db, hdr) - have_library("gdbm") or return false - end - -- if !have_type("DBM", hdr, hsearch) -+ if !have_type("DBM", ["db.h", hdr], hsearch) - return false - end - diff --git a/lang/ruby200-base/patches/patch-ext_openssl_extconf.rb b/lang/ruby200-base/patches/patch-ext_openssl_extconf.rb deleted file mode 100644 index 1b9a1f109238a..0000000000000 --- a/lang/ruby200-base/patches/patch-ext_openssl_extconf.rb +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ext_openssl_extconf.rb,v 1.1 2015/10/14 18:43:11 sevan Exp $ - -Check for SSLv3 support as it may nolonger be available. - ---- ext/openssl/extconf.rb.orig Sat Oct 10 17:10:39 2015 -+++ ext/openssl/extconf.rb -@@ -103,6 +103,9 @@ have_func("OPENSSL_cleanse") - have_func("SSLv2_method") - have_func("SSLv2_server_method") - have_func("SSLv2_client_method") -+have_func("SSLv3_method") -+have_func("SSLv3_server_method") -+have_func("SSLv3_client_method") - have_func("TLSv1_1_method") - have_func("TLSv1_1_server_method") - have_func("TLSv1_1_client_method") diff --git a/lang/ruby200-base/patches/patch-ext_openssl_ossl_ssl.c b/lang/ruby200-base/patches/patch-ext_openssl_ossl_ssl.c deleted file mode 100644 index 7c6ee9da92460..0000000000000 --- a/lang/ruby200-base/patches/patch-ext_openssl_ossl_ssl.c +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ext_openssl_ossl_ssl.c,v 1.1 2015/10/14 18:43:11 sevan Exp $ - -Only enable SSLv3 methods if library provides support. - ---- ext/openssl/ossl_ssl.c.orig Sat Oct 10 17:17:33 2015 -+++ ext/openssl/ossl_ssl.c -@@ -129,9 +129,12 @@ struct { - OSSL_SSL_METHOD_ENTRY(SSLv2_server), - OSSL_SSL_METHOD_ENTRY(SSLv2_client), - #endif -+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \ -+ defined(HAVE_SSLV3_CLIENT_METHOD) - OSSL_SSL_METHOD_ENTRY(SSLv3), - OSSL_SSL_METHOD_ENTRY(SSLv3_server), - OSSL_SSL_METHOD_ENTRY(SSLv3_client), -+#endif - OSSL_SSL_METHOD_ENTRY(SSLv23), - OSSL_SSL_METHOD_ENTRY(SSLv23_server), - OSSL_SSL_METHOD_ENTRY(SSLv23_client), diff --git a/lang/ruby200-base/patches/patch-ext_tk_extconf.rb b/lang/ruby200-base/patches/patch-ext_tk_extconf.rb deleted file mode 100644 index 33ee3dd9baa61..0000000000000 --- a/lang/ruby200-base/patches/patch-ext_tk_extconf.rb +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ext_tk_extconf.rb,v 1.3 2014/12/14 14:00:06 taca Exp $ - -* Add tcl/tk 8.6 support. - ---- ext/tk/extconf.rb.orig 2014-02-02 12:51:14.000000000 +0000 -+++ ext/tk/extconf.rb -@@ -9,10 +9,10 @@ TkLib_Config['search_versions'] = - # %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2] - # %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0] - # %w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps -- %w[8.5 8.4] # At present, Tcl/Tk8.6 is not supported. -+ %w[8.6 8.5 8.4] - - TkLib_Config['unsupported_versions'] = -- %w[8.8 8.7 8.6] # At present, Tcl/Tk8.6 is not supported. -+ %w[8.8 8.7] - - TkLib_Config['major_nums'] = '87' - diff --git a/lang/ruby200-base/patches/patch-ext_tk_lib_tk.rb b/lang/ruby200-base/patches/patch-ext_tk_lib_tk.rb deleted file mode 100644 index cb3d828605b98..0000000000000 --- a/lang/ruby200-base/patches/patch-ext_tk_lib_tk.rb +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-ext_tk_lib_tk.rb,v 1.1 2014/12/14 14:00:06 taca Exp $ - -* Add tcl/tk 8.6 support. - ---- ext/tk/lib/tk.rb.orig 2011-05-26 23:36:33.000000000 +0000 -+++ ext/tk/lib/tk.rb -@@ -1309,8 +1309,12 @@ EOS - end - - unless interp.deleted? -- #Thread.current[:status].value = TclTkLib.mainloop(false) -- Thread.current[:status].value = interp.mainloop(false) -+ begin -+ #Thread.current[:status].value = TclTkLib.mainloop(false) -+ Thread.current[:status].value = interp.mainloop(false) -+ rescue Exception=>e -+ puts "ignore exception on interp: #{e.inspect}\n" if $DEBUG -+ end - end - - ensure -@@ -1569,7 +1573,15 @@ EOS - EOL - =end - -- at_exit{ INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME) } -+ if !WITH_RUBY_VM || RUN_EVENTLOOP_ON_MAIN_THREAD ### check Ruby 1.9 !!!!!!! -+ at_exit{ INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME) } -+ else -+ at_exit{ -+ Tk.root.destroy -+ INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME) -+ INTERP_THREAD.kill.join -+ } -+ end - - EventFlag = TclTkLib::EventFlag - -@@ -5197,6 +5209,8 @@ class TkWindow= 8 -+ -+#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 6 - Tcl_CmdInfo orig_info; - - if (!Tcl_GetCommandInfo(interp, "namespace", &(orig_info))) { -@@ -6105,6 +6136,11 @@ ip_wrap_namespace_command(interp) - orig_info.deleteProc); - } - -+#else /* tcl8.6 or later */ -+ Tcl_GlobalEval(interp, "rename namespace __orig_namespace_command__"); -+ -+#endif -+ - Tcl_CreateObjCommand(interp, "namespace", ip_rbNamespaceObjCmd, - (ClientData) 0, (Tcl_CmdDeleteProc *)NULL); - #endif -@@ -8487,15 +8523,28 @@ invoke_tcl_proc(arg) - #endif - { - struct invoke_info *inf = (struct invoke_info *)arg; -+ -+#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION < 6 - int i, len; --#if TCL_MAJOR_VERSION >= 8 - int argc = inf->objc; - char **argv = (char **)NULL; - #endif - -+ DUMP1("call invoke_tcl_proc"); -+ -+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 6) -+ -+ /* eval */ -+ inf->ptr->return_value = Tcl_EvalObjv(inf->ptr->ip, inf->objc, inf->objv, TCL_EVAL_DIRECT); -+ /* inf->ptr->return_value = Tcl_EvalObjv(inf->ptr->ip, inf->objc, inf->objv, 0); */ -+ -+#else /* Tcl/Tk 7.x, 8.0 -- 8.5 */ -+ - /* memory allocation for arguments of this command */ --#if TCL_MAJOR_VERSION >= 8 -+#if TCL_MAJOR_VERSION == 8 -+ /* Tcl/Tk 8.0 -- 8.5 */ - if (!inf->cmdinfo.isNativeObjectProc) { -+ DUMP1("called proc is not a native-obj-proc"); - /* string interface */ - /* argv = (char **)ALLOC_N(char *, argc+1);*/ /* XXXXXXXXXX */ - argv = RbTk_ALLOC_N(char *, (argc+1)); -@@ -8509,11 +8558,14 @@ invoke_tcl_proc(arg) - } - #endif - -+ DUMP1("reset result of tcl-interp"); - Tcl_ResetResult(inf->ptr->ip); - - /* Invoke the C procedure */ --#if TCL_MAJOR_VERSION >= 8 -+#if TCL_MAJOR_VERSION == 8 -+ /* Tcl/Tk 8.0 -- 8.5 */ - if (inf->cmdinfo.isNativeObjectProc) { -+ DUMP1("call tcl_proc as a native-obj-proc"); - inf->ptr->return_value - = (*(inf->cmdinfo.objProc))(inf->cmdinfo.objClientData, - inf->ptr->ip, inf->objc, inf->objv); -@@ -8521,7 +8573,9 @@ invoke_tcl_proc(arg) - else - #endif - { --#if TCL_MAJOR_VERSION >= 8 -+#if TCL_MAJOR_VERSION == 8 -+ /* Tcl/Tk 8.0 -- 8.5 */ -+ DUMP1("call tcl_proc as not a native-obj-proc"); - inf->ptr->return_value - = (*(inf->cmdinfo.proc))(inf->cmdinfo.clientData, inf->ptr->ip, - argc, (CONST84 char **)argv); -@@ -8544,6 +8598,9 @@ invoke_tcl_proc(arg) - #endif - } - -+#endif /* Tcl/Tk 8.6 or later || Tcl 7.x, 8.0 -- 8.5 */ -+ -+ DUMP1("end of invoke_tcl_proc"); - return Qnil; - } - -@@ -8572,7 +8629,6 @@ ip_invoke_core(interp, argc, argv) - #if 1 /* wrap tcl-proc call */ - struct invoke_info inf; - int status; -- VALUE ret; - #else - #if TCL_MAJOR_VERSION >= 8 - int argc = objc; -@@ -8684,7 +8740,9 @@ ip_invoke_core(interp, argc, argv) - #endif - - /* invoke tcl-proc */ -- ret = rb_protect(invoke_tcl_proc, (VALUE)&inf, &status); -+ DUMP1("invoke tcl-proc"); -+ rb_protect(invoke_tcl_proc, (VALUE)&inf, &status); -+ DUMP2("status of tcl-proc, %d", status); - switch(status) { - case TAG_RAISE: - if (NIL_P(rb_errinfo())) { diff --git a/lang/ruby200-base/patches/patch-lib_rdoc_ri_driver.rb b/lang/ruby200-base/patches/patch-lib_rdoc_ri_driver.rb deleted file mode 100644 index f2d713dcb2d1e..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rdoc_ri_driver.rb +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-lib_rdoc_ri_driver.rb,v 1.1 2013/07/21 02:32:58 taca Exp $ - -* Defer loading readline, when it is really needed. - Some unknown reason: - -1. build devel/ruby-readline with editline(3). -2. Execute a ruby script loading readline in background from shell. -3. When the script output something to stdout, it got SIGTSTP and suspends. - -There is no such problem when build devel/ruby-readline with GNU's readline. - ---- lib/rdoc/ri/driver.rb.orig 2012-12-03 23:32:39.000000000 +0000 -+++ lib/rdoc/ri/driver.rb -@@ -2,11 +2,6 @@ require 'abbrev' - require 'optparse' - - begin -- require 'readline' --rescue LoadError --end -- --begin - require 'win32console' - rescue LoadError - end -@@ -1053,6 +1048,11 @@ The ri pager can be set with the 'RI_PAG - # Runs ri interactively using Readline if it is available. - - def interactive -+ begin -+ require 'readline' -+ rescue LoadError -+ end -+ - puts "\nEnter the method name you want to look up." - - if defined? Readline then diff --git a/lang/ruby200-base/patches/patch-lib_rubygems.rb b/lang/ruby200-base/patches/patch-lib_rubygems.rb deleted file mode 100644 index beccf75bb9dd9..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems.rb +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-lib_rubygems.rb,v 1.3 2014/02/19 15:52:05 taca Exp $ - -* Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems.rb.orig 2013-11-13 02:59:08.000000000 +0000 -+++ lib/rubygems.rb -@@ -291,7 +291,10 @@ module Gem - ## - # The path where gem executables are to be installed. - -- def self.bindir(install_dir=Gem.dir) -+ def self.bindir(install_dir=Gem.dir, install_root=nil) -+ unless install_root.nil? or install_root.empty? -+ install_dir = install_dir.sub(install_root, "") -+ end - # TODO: move to Gem::Dirs - return File.join install_dir, 'bin' unless - install_dir.to_s == Gem.default_dir.to_s -@@ -551,12 +554,12 @@ module Gem - ## - # The index to insert activated gem paths into the $LOAD_PATH. - # -- # Defaults to the site lib directory unless gem_prelude.rb has loaded paths, -+ # Defaults to the vendor lib directory unless gem_prelude.rb has loaded paths, - # then it inserts the activated gem's paths before the gem_prelude.rb paths - # so you can override the gem_prelude.rb default $LOAD_PATH paths. - - def self.load_path_insert_index -- index = $LOAD_PATH.index ConfigMap[:sitelibdir] -+ index = $LOAD_PATH.index ConfigMap[:vendorlibdir] - - index - end -@@ -729,6 +732,7 @@ module Gem - prefix = File.dirname RUBYGEMS_DIR - - if prefix != File.expand_path(ConfigMap[:sitelibdir]) and -+ prefix != File.expand_path(ConfigMap[:vendorlibdir]) and - prefix != File.expand_path(ConfigMap[:libdir]) and - 'lib' == File.basename(RUBYGEMS_DIR) then - prefix diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_commands_setup__command.rb b/lang/ruby200-base/patches/patch-lib_rubygems_commands_setup__command.rb deleted file mode 100644 index 1e52e76616601..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_commands_setup__command.rb +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-lib_rubygems_commands_setup__command.rb,v 1.2 2013/11/24 14:22:03 taca Exp $ - -* Make sure to setup under DESTDIR. - ---- lib/rubygems/commands/setup_command.rb.orig 2013-07-22 16:33:18.000000000 +0000 -+++ lib/rubygems/commands/setup_command.rb -@@ -145,7 +145,7 @@ By default, this RubyGems will install g - - uninstall_old_gemcutter - -- documentation_success = install_rdoc -+ documentation_success = install_rdoc install_destdir - - say - if @verbose then -@@ -284,11 +284,15 @@ TEXT - end - end - -- def install_rdoc -+ def install_rdoc(install_destdir) - gem_doc_dir = File.join Gem.dir, 'doc' - rubygems_name = "rubygems-#{Gem::VERSION}" - rubygems_doc_dir = File.join gem_doc_dir, rubygems_name - -+ unless install_destdir.empty? -+ FileUtils.mkdir_p gem_doc_dir unless File.exist?(gem_doc_dir) -+ end -+ - begin - Gem.ensure_gem_subdirectories Gem.dir - rescue SystemCallError -@@ -299,7 +303,7 @@ TEXT - (not File.exist? rubygems_doc_dir or - File.writable? rubygems_doc_dir) then - say "Removing old RubyGems RDoc and ri" if @verbose -- Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir| -+ Dir[File.join(gem_doc_dir, 'rubygems-[0-9]*')].each do |dir| - rm_rf dir - end - diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_commands_unpack__command.rb b/lang/ruby200-base/patches/patch-lib_rubygems_commands_unpack__command.rb deleted file mode 100644 index 08787215bdb6d..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_commands_unpack__command.rb +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-lib_rubygems_commands_unpack__command.rb,v 1.1 2013/07/21 02:32:58 taca Exp $ - -* Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems/commands/unpack_command.rb.orig 2012-11-29 06:52:18.000000000 +0000 -+++ lib/rubygems/commands/unpack_command.rb -@@ -14,6 +14,10 @@ class Gem::Commands::UnpackCommand < Gem - :version => Gem::Requirement.default, - :target => Dir.pwd - -+ add_option('--install-root DIR', 'Root directory for gem files on extract') do |value, options| -+ options[:install_root] = value -+ end -+ - add_option('--target=DIR', - 'target directory for unpacking') do |value, options| - options[:target] = value -@@ -69,6 +73,9 @@ class Gem::Commands::UnpackCommand < Gem - else - basename = File.basename path, '.gem' - target_dir = File.expand_path basename, options[:target] -+ if options[:install_root] -+ target_dir = File.join(options[:install_root], target_dir) -+ end - - package = Gem::Package.new path - package.extract_files target_dir diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_config__file.rb b/lang/ruby200-base/patches/patch-lib_rubygems_config__file.rb deleted file mode 100644 index a9b573614ee88..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_config__file.rb +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-lib_rubygems_config__file.rb,v 1.2 2013/11/24 14:22:03 taca Exp $ - -* Don't hard code config file's path for gem. - ---- lib/rubygems/config_file.rb.orig 2013-10-24 14:31:17.000000000 +0000 -+++ lib/rubygems/config_file.rb -@@ -57,32 +57,7 @@ class Gem::ConfigFile - - # :stopdoc: - -- system_config_path = -- begin -- require "etc" -- Etc.sysconfdir -- rescue LoadError, NoMethodError -- begin -- # TODO: remove after we drop 1.8.7 and 1.9.1 -- require 'Win32API' -- -- CSIDL_COMMON_APPDATA = 0x0023 -- path = 0.chr * 260 -- if RUBY_VERSION > '1.9' then -- SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP', -- 'L', :stdcall -- SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path -- else -- SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP', -- 'L' -- SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path -- end -- -- path.strip -- rescue LoadError -- RbConfig::CONFIG["sysconfdir"] || "/etc" -- end -- end -+ system_config_path = '@PKG_SYSCONFDIR@' - - # :startdoc: - diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_defaults.rb b/lang/ruby200-base/patches/patch-lib_rubygems_defaults.rb deleted file mode 100644 index 999659f33eaa2..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_defaults.rb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib_rubygems_defaults.rb,v 1.1 2013/07/21 02:32:58 taca Exp $ - -* Use vendordir instead of sitedir. - ---- lib/rubygems/defaults.rb.orig 2013-06-21 16:16:31.000000000 +0000 -+++ lib/rubygems/defaults.rb -@@ -21,7 +21,7 @@ module Gem - def self.default_dir - path = if defined? RUBY_FRAMEWORK_VERSION then - [ -- File.dirname(ConfigMap[:sitedir]), -+ File.dirname(ConfigMap[:vendordir]), - 'Gems', - ConfigMap[:ruby_version] - ] diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb b/lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb deleted file mode 100644 index 8892ac797beb5..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_dependency__installer.rb +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-lib_rubygems_dependency__installer.rb,v 1.3 2014/02/19 15:52:05 taca Exp $ - -* Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems/dependency_installer.rb.orig 2013-11-13 02:59:08.000000000 +0000 -+++ lib/rubygems/dependency_installer.rb -@@ -50,6 +50,7 @@ class Gem::DependencyInstaller - # :format_executable:: See Gem::Installer#initialize. - # :ignore_dependencies:: Don't install any dependencies. - # :install_dir:: See Gem::Installer#install. -+ # :install_root:: See Gem::Installer#install. - # :prerelease:: Allow prerelease versions. See #install. - # :security_policy:: See Gem::Installer::new and Gem::Security. - # :user_install:: See Gem::Installer.new -@@ -57,12 +58,14 @@ class Gem::DependencyInstaller - # :build_args:: See Gem::Installer::new - - def initialize(options = {}) -- @install_dir = options[:install_dir] || Gem.dir -- - if options[:install_dir] then -+ @install_dir = options[:install_dir] -+ - # HACK shouldn't change the global settings, needed for -i behavior - # maybe move to the install command? See also github #442 - Gem::Specification.dirs = @install_dir -+ else -+ @install_dir = Gem.dir - end - - options = DEFAULT_OPTIONS.merge options -@@ -91,7 +94,12 @@ class Gem::DependencyInstaller - @installed_gems = [] - @toplevel_specs = nil - -- @cache_dir = options[:cache_dir] || @install_dir -+ @install_root = options[:install_root] || "" -+ install_dir = @install_dir -+ unless @install_root.nil? or @install_root.empty? -+ install_dir = File.join(@install_root, install_dir) -+ end -+ @cache_dir = options[:cache_dir] || install_dir - - # Set with any errors that SpecFetcher finds while search through - # gemspecs for a dep -@@ -371,6 +379,7 @@ class Gem::DependencyInstaller - :format_executable => @format_executable, - :ignore_dependencies => @ignore_dependencies, - :install_dir => @install_dir, -+ :install_root => @install_root, - :security_policy => @security_policy, - :user_install => @user_install, - :wrappers => @wrappers, diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_install__update__options.rb b/lang/ruby200-base/patches/patch-lib_rubygems_install__update__options.rb deleted file mode 100644 index 6550c9a1942fd..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_install__update__options.rb +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-lib_rubygems_install__update__options.rb,v 1.1 2013/07/21 02:32:58 taca Exp $ - -* Add install_root option for pkgsrc's rubygems support. - ---- lib/rubygems/install_update_options.rb.orig 2012-11-29 06:52:18.000000000 +0000 -+++ lib/rubygems/install_update_options.rb -@@ -33,6 +33,12 @@ module Gem::InstallUpdateOptions - value - end - -+ add_option(:"Install/Update", '-B', '--install-root DIR', -+ 'Root directory for gem files on install') do |value, options| -+ options[:install_root] = File.expand_path(value) -+ Gem.ensure_gem_subdirectories File.join options[:install_root], Gem.dir -+ end -+ - add_option(:"Install/Update", '-i', '--install-dir DIR', - 'Gem repository directory to get installed', - 'gems') do |value, options| diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb b/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb deleted file mode 100644 index 7ab99f1a25e45..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_installer.rb +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-lib_rubygems_installer.rb,v 1.4 2014/02/19 15:52:05 taca Exp $ - -* Add install_root option for pkgsrc's rubygems support. -* Tweak build_info directory with destdir to store build_args. - ---- lib/rubygems/installer.rb.orig 2013-08-16 15:35:06.000000000 +0000 -+++ lib/rubygems/installer.rb -@@ -98,6 +98,9 @@ class Gem::Installer - # foo_exec18. - # :ignore_dependencies:: Don't raise if a dependency is missing. - # :install_dir:: The directory to install the gem into. -+ # :install_root:: The directory to use as a buildroot for "destdir"-style -+ # installation. All paths during installation are relative -+ # to the buildroot. - # :security_policy:: Use the specified security policy. See Gem::Security - # :user_install:: Indicate that the gem should be unpacked into the users - # personal gem directory. -@@ -558,12 +561,20 @@ class Gem::Installer - @format_executable = options[:format_executable] - @security_policy = options[:security_policy] - @wrappers = options[:wrappers] -+ install_root = options[:install_root] -+ unless install_root.nil? or install_root == "" -+ @install_root = File.expand_path install_root -+ @gem_home = File.join(@install_root, @gem_home) -+ end - @only_install_dir = options[:only_install_dir] - - # If the user has asked for the gem to be installed in a directory that is - # the system gem directory, then use the system bin directory, else create - # (or use) a new bin dir under the gem_home. -- @bin_dir = options[:bin_dir] || Gem.bindir(gem_home) -+ @bin_dir = options[:bin_dir] || Gem.bindir(gem_home, @install_root) -+ unless @install_root.nil? or @install_root.empty? -+ @bin_dir = File.join(@install_root, @bin_dir) -+ end - @development = options[:development] - - @build_args = options[:build_args] || Gem::Command.build_args -@@ -786,6 +797,9 @@ EOF - return if @build_args.empty? - - build_info_dir = File.join gem_home, 'build_info' -+ unless @install_root.nil? or @install_root.empty? -+ build_info_dir = File.join @gem_home, "build_info" -+ end - - FileUtils.mkdir_p build_info_dir - diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_platform.rb b/lang/ruby200-base/patches/patch-lib_rubygems_platform.rb deleted file mode 100644 index d4bcde1221eb4..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_platform.rb +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-lib_rubygems_platform.rb,v 1.1 2014/03/13 18:00:02 taca Exp $ - -Allow simple "netbsd" as Gem::Platform. - ---- lib/rubygems/platform.rb.orig 2013-07-22 16:33:18.000000000 +0000 -+++ lib/rubygems/platform.rb -@@ -83,6 +83,7 @@ class Gem::Platform - os, version = $1, $3 - @cpu = 'x86' if @cpu.nil? and os =~ /32$/ - [os, version] - when /netbsdelf/ then [ 'netbsdelf', nil ] -+ when /netbsd/ then [ 'netbsd', nil ] - when /openbsd(\d+\.\d+)?/ then [ 'openbsd', $1 ] - when /solaris(\d+\.\d+)?/ then [ 'solaris', $1 ] diff --git a/lang/ruby200-base/patches/patch-lib_rubygems_specification.rb b/lang/ruby200-base/patches/patch-lib_rubygems_specification.rb deleted file mode 100644 index 88df228c23808..0000000000000 --- a/lang/ruby200-base/patches/patch-lib_rubygems_specification.rb +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-lib_rubygems_specification.rb,v 1.3 2015/03/08 14:59:12 taca Exp $ - -* Changes for pkgsrc environment: - - - Allow some attributes to nil. - - Relax date/time format. - -And allow multiple conditions for requirement from Ruby 2.0.0 and -Rubygem 1.8.25. - ---- lib/rubygems/specification.rb.orig 2013-11-13 02:59:08.000000000 +0000 -+++ lib/rubygems/specification.rb -@@ -162,6 +162,12 @@ class Gem::Specification - @@default_value[k].nil? - } - -+ # under pkgsrc environment -+ @@pkgsrc_nil_attributes = {} -+ [:authors, :cert_chain, :executables, :extensions, :extra_rdoc_files, :licenses, :required_rubygems_version, :test_files].each do |k| -+ @@pkgsrc_nil_attributes[k] = true -+ end -+ - ###################################################################### - # :section: Required gemspec attributes - -@@ -2334,7 +2340,24 @@ class Gem::Specification - normalize - - nil_attributes = self.class.non_nil_attributes.find_all do |name| -- instance_variable_get("@#{name}").nil? -+ val = instance_variable_get("@#{name}") -+ if val.nil? -+ if @@pkgsrc_nil_attributes.key?(name) -+ case name -+ when :required_rubygems_version -+ val = Gem::Requirement.default -+ else -+ val = [] -+ end -+ instance_variable_set("@#{name}", val) -+ false -+ end -+ end -+ if name == :authors and val.empty? -+ val = ['not specified'] -+ self.authors = val -+ false -+ end - end - - unless nil_attributes.empty? then -@@ -2474,8 +2474,7 @@ class Gem::Specification - - if homepage and not homepage.empty? and - homepage !~ /\A[a-z][a-z\d+.-]*:/i then -- raise Gem::InvalidSpecificationException, -- "\"#{homepage}\" is not a URI" -+ wann "\"#{homepage}\" is not a URI" - end - - # Warnings diff --git a/lang/ruby200-base/patches/patch-man_erb.1 b/lang/ruby200-base/patches/patch-man_erb.1 deleted file mode 100644 index 1c0c5146d500b..0000000000000 --- a/lang/ruby200-base/patches/patch-man_erb.1 +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-man_erb.1,v 1.1 2013/07/21 02:32:58 taca Exp $ - -* Fix mdoc markup. - ---- man/erb.1.orig 2012-11-15 04:22:44.000000000 +0000 -+++ man/erb.1 -@@ -143,12 +143,12 @@ class. - .Pp - .Sh REPORTING BUGS - .Bl -bullet --.Li Security vulnerabilities should be reported via an email to --.Aq security@ruby-lang.org Ns --.Li . -+.It -+Security vulnerabilities should be reported via an email to -+.Aq security@ruby-lang.org . - Reported problems will be published after being fixed. --.Pp --.Li And you can report other bugs and feature requests via the -+.It -+You can report other bugs and feature requests via the - Ruby Issue Tracking System (http://bugs.ruby-lang.org). - Do not report security vulnerabilities - via the system because it publishes the vulnerabilities immediately. diff --git a/lang/ruby200-base/patches/patch-man_irb.1 b/lang/ruby200-base/patches/patch-man_irb.1 deleted file mode 100644 index c5c30c578e633..0000000000000 --- a/lang/ruby200-base/patches/patch-man_irb.1 +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-man_irb.1,v 1.1 2013/07/21 02:32:58 taca Exp $ - -* Fix mdoc markup. - ---- man/irb.1.orig 2012-11-15 04:22:44.000000000 +0000 -+++ man/irb.1 -@@ -159,12 +159,12 @@ Personal irb initialization. - .Pp - .Sh REPORTING BUGS - .Bl -bullet --.Li Security vulnerabilities should be reported via an email to --.Aq security@ruby-lang.org Ns --.Li . -+.It -+Security vulnerabilities should be reported via an email to -+.Aq security@ruby-lang.org . - Reported problems will be published after being fixed. --.Pp --.Li And you can report other bugs and feature requests via the -+.It -+You can report other bugs and feature requests via the - Ruby Issue Tracking System (http://bugs.ruby-lang.org). - Do not report security vulnerabilities - via the system because it publishes the vulnerabilities immediately. diff --git a/lang/ruby200-base/patches/patch-man_ri.1 b/lang/ruby200-base/patches/patch-man_ri.1 deleted file mode 100644 index eb887a42cb6ff..0000000000000 --- a/lang/ruby200-base/patches/patch-man_ri.1 +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-man_ri.1,v 1.2 2013/11/24 14:22:03 taca Exp $ - -* Fix mdoc markup. - ---- man/ri.1.orig 2013-07-13 15:17:18.000000000 +0000 -+++ man/ri.1 -@@ -166,12 +166,12 @@ Searches user-wide documents here. - .Pp - .Sh REPORTING BUGS - .Bl -bullet --.Li Security vulnerabilities should be reported via an email to --.Aq security@ruby-lang.org Ns --.Li . -+.It -+Security vulnerabilities should be reported via an email to -+.Aq security@ruby-lang.org . - Reported problems will be published after being fixed. --.Pp --.Li And you can report other bugs and feature requests via the -+.It -+You can report other bugs and feature requests via the - Ruby Issue Tracking System (http://bugs.ruby-lang.org). - Do not report security vulnerabilities - via the system because it publishes the vulnerabilities immediately. diff --git a/lang/ruby200-base/patches/patch-man_ruby.1 b/lang/ruby200-base/patches/patch-man_ruby.1 deleted file mode 100644 index 96da42552755b..0000000000000 --- a/lang/ruby200-base/patches/patch-man_ruby.1 +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-man_ruby.1,v 1.2 2015/03/08 14:59:12 taca Exp $ - -* Fix mdoc markup. - ---- man/ruby.1.orig 2014-07-07 03:49:23.000000000 +0000 -+++ man/ruby.1 -@@ -497,12 +497,12 @@ Ruby Application Archive. - .Pp - .Sh REPORTING BUGS - .Bl -bullet --.Li Security vulnerabilities should be reported via an email to --.Aq security@ruby-lang.org Ns --.Li . -+.It -+Security vulnerabilities should be reported via an email to -+.Aq security@ruby-lang.org . - Reported problems will be published after they've been fixed. --.Pp --.Li And you can report other bugs and feature requests via the -+.It -+You can report other bugs and feature requests via the - Ruby Issue Tracking System (http://bugs.ruby-lang.org). - Do not report security vulnerabilities - via the system because it publishes the vulnerabilities immediately. diff --git a/lang/ruby200-base/patches/patch-pack.c b/lang/ruby200-base/patches/patch-pack.c deleted file mode 100644 index 864eaedc949b3..0000000000000 --- a/lang/ruby200-base/patches/patch-pack.c +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-pack.c,v 1.3 2015/03/08 14:59:12 taca Exp $ - -Fix for CVE-2014-4975 from revision #46806 in ruby_2_1 branch. - ---- pack.c.orig 2015-01-30 07:42:52.000000000 +0000 -+++ pack.c -@@ -1088,7 +1088,8 @@ static const char b64_table[] = - static void - encodes(VALUE str, const char *s, long len, int type, int tail_lf) - { -- char buff[4096]; -+ enum {buff_size = 4096, encoded_unit = 4}; -+ char buff[buff_size + 1]; /* +1 for tail_lf */ - long i = 0; - const char *trans = type == 'u' ? uu_table : b64_table; - char padding; -@@ -1101,7 +1102,7 @@ encodes(VALUE str, const char *s, long l - padding = '='; - } - while (len >= 3) { -- while (len >= 3 && sizeof(buff)-i >= 4) { -+ while (len >= 3 && buff_size-i >= encoded_unit) { - buff[i++] = trans[077 & (*s >> 2)]; - buff[i++] = trans[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))]; - buff[i++] = trans[077 & (((s[1] << 2) & 074) | ((s[2] >> 6) & 03))]; -@@ -1109,7 +1110,7 @@ encodes(VALUE str, const char *s, long l - s += 3; - len -= 3; - } -- if (sizeof(buff)-i < 4) { -+ if (buff_size-i < encoded_unit) { - rb_str_buf_cat(str, buff, i); - i = 0; - } -@@ -1129,6 +1130,7 @@ encodes(VALUE str, const char *s, long l - } - if (tail_lf) buff[i++] = '\n'; - rb_str_buf_cat(str, buff, i); -+ if ((size_t)i > sizeof(buff)) rb_bug("encodes() buffer overrun"); - } - - static const char hex_table[] = "0123456789ABCDEF"; diff --git a/lang/ruby200-base/patches/patch-test_rubygems_test__gem.rb b/lang/ruby200-base/patches/patch-test_rubygems_test__gem.rb deleted file mode 100644 index 38367e1c700c9..0000000000000 --- a/lang/ruby200-base/patches/patch-test_rubygems_test__gem.rb +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-test_rubygems_test__gem.rb,v 1.1 2013/07/21 02:32:58 taca Exp $ - -* Use vendordir instead of sitedir. - ---- test/rubygems/test_gem.rb.orig 2013-03-17 15:02:50.000000000 +0000 -+++ test/rubygems/test_gem.rb -@@ -964,12 +964,12 @@ class TestGem < Gem::TestCase - end - - def test_self_prefix_sitelibdir -- orig_sitelibdir = Gem::ConfigMap[:sitelibdir] -- Gem::ConfigMap[:sitelibdir] = @@project_dir -+ orig_sitelibdir = Gem::ConfigMap[:vendorlibdir] -+ Gem::ConfigMap[:vendorlibdir] = @@project_dir - - assert_nil Gem.prefix - ensure -- Gem::ConfigMap[:sitelibdir] = orig_sitelibdir -+ Gem::ConfigMap[:vendorlibdir] = orig_sitelibdir - end - - def test_self_refresh diff --git a/lang/ruby200-base/patches/patch-tool_rbinstall.rb b/lang/ruby200-base/patches/patch-tool_rbinstall.rb deleted file mode 100644 index ba551770c008a..0000000000000 --- a/lang/ruby200-base/patches/patch-tool_rbinstall.rb +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-tool_rbinstall.rb,v 1.2 2013/11/24 14:22:03 taca Exp $ - -* Don't install which has already ${RUBY_VER} suffix. - ---- tool/rbinstall.rb.orig 2013-11-12 14:35:13.000000000 +0000 -+++ tool/rbinstall.rb -@@ -220,7 +220,7 @@ def install_recursive(srcdir, dest, opti - end - end - end -- skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core" -+ skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core *200" - prune = path_matcher(prune) - skip = path_matcher(skip) - File.directory?(srcdir) or return rescue return From 61b741dc26f9b23637e4b5ab7f8dff566dd06189 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:47:44 +0000 Subject: [PATCH 0032/2457] Note remove of ruby200 and ruby200-base package. --- doc/CHANGES-2016 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 3892d9077da4d..c2cf56ad6b96b 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1147 2016/03/13 15:32:26 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1148 2016/03/13 15:47:44 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1535,3 +1535,5 @@ Changes to the packages collection and infrastructure in 2016: Removed devel/ruby-debugger [taca 2016-03-13] Removed devel/ruby-debugger-linecache [taca 2016-03-13] Removed devel/ruby-debugger-ruby_core_source [taca 2016-03-13] + Removed lang/ruby200 [taca 2016-03-13] + Removed lang/ruby200-base [taca 2016-03-13] From 238a507ab2b3036f8f50fa0b0dbb24cbdb1b404e Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 13 Mar 2016 15:52:51 +0000 Subject: [PATCH 0033/2457] Drop support for ruby200, Ruby 2.0. --- lang/ruby/rubyversion.mk | 45 ++++++++-------------------------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk index 55c15331b9bd9..efff456720b4d 100644 --- a/lang/ruby/rubyversion.mk +++ b/lang/ruby/rubyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: rubyversion.mk,v 1.159 2016/03/13 09:35:59 taca Exp $ +# $NetBSD: rubyversion.mk,v 1.160 2016/03/13 15:52:51 taca Exp $ # # This file determines which Ruby version is used as a dependency for @@ -10,7 +10,7 @@ # RUBY_VERSION_DEFAULT # The preferered Ruby version to use. # -# Possible values: 18 200 21 22 23 +# Possible values: 18 21 22 23 # Default: 22 # # RUBY_BUILD_RDOC @@ -41,8 +41,8 @@ # RUBY_VERSION_SUPPORTED # The Ruby versions that are acceptable for the package. # -# Possible values: 18 200 21 22 23 -# Default: 200 21 22 23 +# Possible values: 18 21 22 23 +# Default: 21 22 23 # # RUBY_NOVERSION # If "Yes", the package dosen't depend on any version of Ruby, such @@ -69,7 +69,7 @@ # RUBY_VER # Really selected version of ruby. # -# Possible values: 18 200 21 22 23 +# Possible values: 18 21 22 23 # # Use this variable in pkgsrc's Makefile # @@ -77,10 +77,8 @@ # Prefix part for ruby based packages. It is recommended that to # use RUBY_PKGPREFIX with ruby related packages since you can supply # different binary packages as each version of Ruby. -# The value of RUBY_PKGPREFIX is "ruby-" and concatination of Ruby's -# major and minor version unless RUBY_VER is "200". # -# Example values: ruby18 ruby200 ruby21 ruby22 ruby23 +# Example values: ruby18 ruby21 ruby22 ruby23 # # RUBY_ABI_VERSION # Ruby's ABI version. @@ -108,10 +106,8 @@ # # RUBY_SUFFIX # Extra string for each ruby commands; ruby, irb and so on. -# The value of RUBY_SUFFIX is concatination of Ruby's major and minor -# unless RUBY_VER is "200". # -# Possible values: 18 200 21 22 23 +# Possible values: 18 21 22 23 # # RUBY_VERSION # Version of real Ruby's version excluding patchlevel. @@ -227,21 +223,18 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/ruby([0-9][0-9]+)-.*/\1/} # current supported Ruby's version RUBY18_VERSION= 1.8.7 -RUBY200_VERSION= 2.0.0 RUBY21_VERSION= 2.1.8 RUBY22_VERSION= 2.2.4 RUBY23_VERSION= 2.3.0 # patch level RUBY18_PATCHLEVEL= pl374 -RUBY200_PATCHLEVEL= p648 #RUBY21_PATCHLEVEL= p440 #RUBY22_PATCHLEVEL= p230 #RUBY23_PATCHLEVEL= p0 # current API compatible version; used for version of shared library RUBY18_API_VERSION= 1.8.7 -RUBY200_API_VERSION= 2.0.0 RUBY21_API_VERSION= 2.1.0 RUBY22_API_VERSION= 2.2.0 RUBY23_API_VERSION= 2.3.0 @@ -255,7 +248,7 @@ RUBY_RDOC_PKGSRC_VERS= 4.2.2 # RUBY_VERSION_DEFAULT?= 22 -RUBY_VERSION_SUPPORTED?= 22 23 21 200 +RUBY_VERSION_SUPPORTED?= 22 23 21 .if defined(RUBY_VERSION_REQD) . for rv in ${RUBY_VERSION_SUPPORTED} @@ -292,22 +285,6 @@ RUBY_RDOC_VERSION= 1.0.1 RUBY_SUFFIX= ${RUBY_VER} -.elif ${RUBY_VER} == "200" -RUBY_VERSION= ${RUBY200_VERSION} -RUBY_VERSION_FULL= ${RUBY_VERSION}${RUBY_PATCHLEVEL} -RUBY_ABI_VERSION= ${RUBY_VERSION} - -RUBY_GEMS_VERSION= 2.0.3 -RUBY_RDOC_VERSION= 4.1.0 -RUBY_RAKE_VERSION= 0.9.6 -RUBY_JSON_VERSION= 1.7.7 - -RUBY_BIGDECIMAL_VERSION= 1.2.0 -RUBY_IO_CONSOLE_VERSION= 0.4.2 -RUBY_PSYCH_VERSION= 2.0.0 -RUBY_MINITEST_VERSION= 4.3.2 -RUBY_TEST_UNIT_VERSION= 2.0.0.0 - .elif ${RUBY_VER} == "21" RUBY_VERSION= ${RUBY21_VERSION} RUBY_VERSION_FULL= ${RUBY_VERSION} @@ -382,7 +359,7 @@ MULTI+= RUBY_VER=${RUBY_VERS:U${RUBY_VERSION_DEFAULT}} # any specific version of ruby command. In this case, package's # name begin with "ruby-". # If RUBY_NOVERSION is "No" (default), the package's name is begin -# with ${RUBY_NAME}; "ruby18", "ruby200", and so on. +# with ${RUBY_NAME}; "ruby18", "ruby21", and so on. # # It also affects to RUBY_DOC, RUBY_EG... # @@ -412,11 +389,7 @@ RUBY_PKGPREFIX?= ${RUBY_NAME} .if ${RUBY_VER} == "18" RUBY_VER_DIR= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR} .else -. if ${RUBY_VER} == "200" -RUBY_VER_DIR= ${RUBY_VERSION} -. else RUBY_VER_DIR= ${RUBY_API_VERSION} -. endif .endif .if empty(RUBY_NOVERSION:M[nN][oO]) From d9ed647d64e95137f37b847ecd6eeecf005d58d5 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Mar 2016 16:53:30 +0000 Subject: [PATCH 0034/2457] Update p5-Crypt-ECB to 2.10: v2.10, 07.03.2016 - forgot another change in the v2.00 changelog... - changed license from GPL to Artistic - improved kwalitee: - added license information to meta files - removed test.pl - added eg/ecb.pl (command line en- and decryption) - added dummy cipher, so the test suite makes sense even if there are no block ciphers installed - refactored test data from test scripts --- security/p5-Crypt-ECB/Makefile | 4 ++-- security/p5-Crypt-ECB/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/security/p5-Crypt-ECB/Makefile b/security/p5-Crypt-ECB/Makefile index 06b6b87d91665..e6af13b8f901e 100644 --- a/security/p5-Crypt-ECB/Makefile +++ b/security/p5-Crypt-ECB/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2016/03/09 10:47:45 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2016/03/13 16:53:30 wiz Exp $ -DISTNAME= Crypt-ECB-2.05 +DISTNAME= Crypt-ECB-2.10 PKGNAME= p5-${DISTNAME} CATEGORIES= security perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Crypt/} diff --git a/security/p5-Crypt-ECB/distinfo b/security/p5-Crypt-ECB/distinfo index 299224ce2e8b6..ad3e7f4f4c162 100644 --- a/security/p5-Crypt-ECB/distinfo +++ b/security/p5-Crypt-ECB/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2016/03/09 10:47:45 wiz Exp $ +$NetBSD: distinfo,v 1.5 2016/03/13 16:53:30 wiz Exp $ -SHA1 (Crypt-ECB-2.05.tar.gz) = c03f1ee8b5a60ba17c54a58d181dd82e0ea692c7 -RMD160 (Crypt-ECB-2.05.tar.gz) = 60b76b8ee2ef4c232c5b986e5a01c48237ee06f0 -SHA512 (Crypt-ECB-2.05.tar.gz) = ff106e34fb3672cf9a408d978ebc8b56387241c0328912d9c5ffad84b32cb399104a810b1895d8172ea1210627c1ccaf9402e85318e6476199561d323f78e81b -Size (Crypt-ECB-2.05.tar.gz) = 19470 bytes +SHA1 (Crypt-ECB-2.10.tar.gz) = c2d89fd9770b43aad4d857b9444a3ac88ae09cdc +RMD160 (Crypt-ECB-2.10.tar.gz) = 0a908553ec5b1359221d62c29328b7c50f25e52b +SHA512 (Crypt-ECB-2.10.tar.gz) = 16c3ed42601e970336802e5d7c5e6a2aa2ed1b41a4d0025e3188fe29e4ec9ad186664e0dea047ec62cb0f8fdecfffb3b7f2978936fb1e7610faf58c7097d6b7c +Size (Crypt-ECB-2.10.tar.gz) = 14579 bytes From 8bd8f494bc5f64d502c4093bda65ac35cd5915ce Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Mar 2016 16:53:39 +0000 Subject: [PATCH 0035/2457] Updated security/p5-Crypt-ECB to 2.10 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index c2cf56ad6b96b..90ff77c223d6a 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1148 2016/03/13 15:47:44 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1149 2016/03/13 16:53:39 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1537,3 +1537,4 @@ Changes to the packages collection and infrastructure in 2016: Removed devel/ruby-debugger-ruby_core_source [taca 2016-03-13] Removed lang/ruby200 [taca 2016-03-13] Removed lang/ruby200-base [taca 2016-03-13] + Updated security/p5-Crypt-ECB to 2.10 [wiz 2016-03-13] From 6d93649130698ea826e5c200faa36e64097a282a Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Mar 2016 16:54:34 +0000 Subject: [PATCH 0036/2457] + afl-2.08b, cmake-3.5.0, dbus-python-common-1.2.4, denemo-2.0.4, dropbear-2016.72, farstream-0.2.8, glpk-4.59, grep-2.24, mc-4.8.16, ocaml-findlib-1.6.2, orcus-0.11.1, py-dbus-1.2.4, spice-protocol-0.12.11, talloc-2.1.6, tor-browser-5.5.3, transmission-2.92, waf-1.8.20, x264-devel-20160312, xterm-324. --- doc/TODO | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/doc/TODO b/doc/TODO index 931a20a1bd45f..9bcf2ff8394bb 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15588 2016/03/13 13:04:39 wen Exp $ +$NetBSD: TODO,v 1.15589 2016/03/13 16:54:34 wiz Exp $ Suggested new packages ====================== @@ -407,6 +407,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o adocman-0.13 o adodb-5.20 o aewm++-1.0.27 + o afl-2.08b o afterstep-2.2.12 o aget-0.4.1 o alacarte-0.13.2 @@ -550,6 +551,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o clusterssh-4.05 o clutter-1.24 o clutter-gst-3.0.2 + o cmake-3.5.0 o cmake-fedora-2.6.0 o cmocka-1.0.1 o cmus-2.7.1 @@ -599,13 +601,14 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o dasher-4.11 o dateutils-0.3.5 o davical-1.1.4 + o dbus-python-common-1.2.4 o dd_rescue-1.46 o dd_rhelp-0.3.0 o ddrescue-1.20 o dega-1.12 o dejagnu-1.5.3 o delegate-9.9.13 - o denemo-2.0.2 + o denemo-2.0.4 o desklaunch-1.1.7 o deskmenu-1.4.5 o dhcpcd-dbus-0.6.1 @@ -619,7 +622,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o dolphin-4.0.2 o dpkg-1.18.4 o drivel-3.0.5 - o dropbear-2015.71 + o dropbear-2016.72 o drupal-8.0.3 o duplicity-0.7.06 o dvdisaster-0.79.5 @@ -695,6 +698,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o faces-1.7.7 o facter-2.4.5 o fakeroot-1.6.5 + o farstream-0.2.8 o fcitx-3.6.2 o fdupes-1.51 o felt-3.07 [wip] @@ -782,7 +786,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o gliv-1.9.7 o glom-1.14.2 [GNOME 2.26] o gloox-1.0.14 - o glpk-4.58 + o glpk-4.59 o glx-utils-8.3.0 o gmock-1.7.0 o gnet1-1.1.9 @@ -851,6 +855,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o gramps-4.1.0 o grantlee-5.0.0 o greed-4.1 + o grep-2.24 o grilo-0.2.12 o grilo-plugins-0.2.14 o gromacs-5.1.2 @@ -1130,6 +1135,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o mbedtls-2.0.0 o mbuf-20141227 o mbuffer-20160228 + o mc-4.8.16 o mcabber-1.0.2 o mcollective-2.3.2 o mcsim-5.6.5 @@ -1224,6 +1230,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o oath-toolkit-2.6.1 o objc-3.3.1 o ocaml-cmdliner-0.9.8 + o ocaml-findlib-1.6.2 o ocaml-graphics-4.02.3 o ocaml-mysql-1.2.0 o ocaml-oasis-0.4.5 @@ -1249,7 +1256,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o opensmtpd-5.7.3 o openssh-7.2p2 o opera-26 - o orcus-0.11.0 + o orcus-0.11.1 o oroborus-2.0.18 o ortp-0.25.0 o oto-0.5 @@ -1655,6 +1662,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-d2to1-0.2.12 o py-daemon-2.1.1 o py-datapkg-0.9 + o py-dbus-1.2.4 o py-django-photologue-2.7 o py-django-tagging-0.4.1 o py-djangorestframework-2.3.12 @@ -1853,6 +1861,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o sparse-0.5.0 o spcaview-20060501 o spectrwm-2.7.2 + o spice-protocol-0.12.11 o spidermonkey-1.8.5 o spin-645 o spl-1.0pre6 @@ -1903,6 +1912,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o tacacs-4.0.4.29a o tacacs-shrubbery-5.0.0a1 o tads-3.0.16 + o talloc-2.1.6 o taskjuggler-3.3.0 o tc-hasida-table-0.8 [wip] o tcpdpriv-0.9 @@ -1940,9 +1950,10 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o tomboy-1.10.2 o top-3.8beta1 o topgit-0.8 + o tor-browser-5.5.3 o totem-3.14.1 o totem-pl-parser-3.10.3 - o transmission-2.91 + o transmission-2.92 o tripwire-2.3.1 [see also pkg/22362] o trojita-0.6 o ts-0.7.5 @@ -1988,6 +1999,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o vte-0.36.0 o vtk-5.10.1 o wMosaic-3.8.22 + o waf-1.8.20 o wap-utils-1.4.1 o warmux-11.04.1 o warzone2100-2.3.8 @@ -2014,6 +2026,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o wwwoffle-2.9i o wxGTK-3.1.0 o wxRemind-101 + o x264-devel-20160312 o x2vnc-1.31 o xa65-2.3.7 o xaric-0.13.7 @@ -2065,6 +2078,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o xsc-1.6 o xscorch-0.2.1 o xsd-3.3.0 + o xterm-324 o xtraceroute-0.9.1 o xtux-20030306 o xvidcap-1.1.7 From 8d1a6582a9ac9fcfd1b0482c0ade6a82b369f1a6 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Mar 2016 17:26:48 +0000 Subject: [PATCH 0037/2457] Update php-baikal to 0.3.5: 0.3.5 #466: Fixed a small issue that can effect new installions. Existing working installations do not need to upgrade. 0.3.4 Last build was broken, contained data in the Specific/ directory. This affected new installs but not upgrades. 0.3.3 #457: The realm was not correctly set from configuration for Digest auth. Reduced memory usage in upgrade script. Should help with upgrading large databases. Removed BAIKAL_PATH_SABREDAV setting. It was no longer used. --- net/php-baikal/Makefile | 4 ++-- net/php-baikal/PLIST | 10 ++++------ net/php-baikal/distinfo | 10 +++++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/net/php-baikal/Makefile b/net/php-baikal/Makefile index 0d55ebf4c4946..1c4d45e52e820 100644 --- a/net/php-baikal/Makefile +++ b/net/php-baikal/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2016/02/18 23:25:00 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/13 17:26:48 wiz Exp $ -DISTNAME= baikal-0.3.2 +DISTNAME= baikal-0.3.5 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME} CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=fruux/} diff --git a/net/php-baikal/PLIST b/net/php-baikal/PLIST index 66eb0ad47d6ff..26ea57a152852 100644 --- a/net/php-baikal/PLIST +++ b/net/php-baikal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2016/02/15 23:28:22 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/13 17:26:48 wiz Exp $ share/baikal/CHANGELOG.md share/baikal/Core/Distrib.php share/baikal/Core/Frameworks/Baikal/Core/PDOBasicAuth.php @@ -17,6 +17,7 @@ share/baikal/Core/Frameworks/Baikal/Model/Config/System.php share/baikal/Core/Frameworks/Baikal/Model/Principal.php share/baikal/Core/Frameworks/Baikal/Model/User.php share/baikal/Core/Frameworks/Baikal/WWWRoot/index.php +share/baikal/Core/Frameworks/BaikalAdmin/.Framework.php.swp share/baikal/Core/Frameworks/BaikalAdmin/Controller/Dashboard.php share/baikal/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php share/baikal/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php @@ -183,14 +184,11 @@ share/baikal/Core/Resources/Web/TwitterBootstrap/js/bootstrap.min.js share/baikal/Core/Resources/Web/TwitterBootstrap/js/jquery-1.7.1.min.js share/baikal/LICENSE share/baikal/README.md -share/baikal/Specific/.htaccess share/baikal/Specific/ENABLE_INSTALL -share/baikal/Specific/config.php -share/baikal/Specific/config.system.php -share/baikal/Specific/db/.gitignore -share/baikal/Specific/db/db.sqlite +share/baikal/Specific/db/.empty share/baikal/html/.htaccess share/baikal/html/admin/index.php +share/baikal/html/admin/install/.index.php.swp share/baikal/html/admin/install/index.php share/baikal/html/cal.php share/baikal/html/card.php diff --git a/net/php-baikal/distinfo b/net/php-baikal/distinfo index 7050c7cf4bbaf..dbf5f4fed999b 100644 --- a/net/php-baikal/distinfo +++ b/net/php-baikal/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2016/02/18 23:25:00 wiz Exp $ +$NetBSD: distinfo,v 1.4 2016/03/13 17:26:48 wiz Exp $ -SHA1 (baikal-0.3.2.zip) = 18fca25bb6d1bc6cfcd8238995bc19797bb412ac -RMD160 (baikal-0.3.2.zip) = 1597186243cf57b932ecfd556858a1f100339a04 -SHA512 (baikal-0.3.2.zip) = 5b61058e013f45560d1dde612a2ab16bdf8b1f86d799d79af07f8f49fdb182fa70ce4ba7e88388053b55cffddf0ba719041414031f57c5fcb4c9bd4aba8913fa -Size (baikal-0.3.2.zip) = 3284033 bytes +SHA1 (baikal-0.3.5.zip) = f714fd030c2659938a5f70c3427458b8d9ce0c83 +RMD160 (baikal-0.3.5.zip) = 191e21186c30e520471f56527877774362f6d491 +SHA512 (baikal-0.3.5.zip) = b0e1c9387c92a355c25c39165f608a956778199b23922b10cc9721ac0c5b5c3465e743ab6d890c2400eddaf7249bb2749c2065539892567430f4bef0625d760d +Size (baikal-0.3.5.zip) = 3282401 bytes From ab4fc0aa24cb8c54f87ca5897468cba6c0d2f770 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Mar 2016 17:26:59 +0000 Subject: [PATCH 0038/2457] Updated net/php-baikal to 0.3.5 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 90ff77c223d6a..37e2bf642889f 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1149 2016/03/13 16:53:39 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1150 2016/03/13 17:26:59 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1538,3 +1538,4 @@ Changes to the packages collection and infrastructure in 2016: Removed lang/ruby200 [taca 2016-03-13] Removed lang/ruby200-base [taca 2016-03-13] Updated security/p5-Crypt-ECB to 2.10 [wiz 2016-03-13] + Updated net/php-baikal to 0.3.5 [wiz 2016-03-13] From 09ce3e4893acca8c3a0d8b5fe2e3b637b7466922 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 13 Mar 2016 17:27:12 +0000 Subject: [PATCH 0039/2457] Let's maintain this. --- net/php-baikal/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/php-baikal/Makefile b/net/php-baikal/Makefile index 1c4d45e52e820..6282cc6082e7a 100644 --- a/net/php-baikal/Makefile +++ b/net/php-baikal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/03/13 17:26:48 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/13 17:27:12 wiz Exp $ DISTNAME= baikal-0.3.5 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME} @@ -8,7 +8,7 @@ GITHUB_RELEASE= ${PKGVERSION_NOREV} GITHUB_PROJECT= baikal EXTRACT_SUFX= .zip -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://baikal-server.com/ COMMENT= Lightweight CalDAV+CardDAV server LICENSE= gnu-gpl-v3 From 575618d24fdcac9c90b6e4855efb709178d5678f Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 13 Mar 2016 18:16:13 +0000 Subject: [PATCH 0040/2457] Changes 3.3.3: Fix failed assertions not being set to stderr Fix version not working when compiled with Visual Studio Fix poor handling of UTF-8 characters in paths --- www/sassc/Makefile | 4 ++-- www/sassc/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/sassc/Makefile b/www/sassc/Makefile index 8096444e32b48..401bdb947894f 100644 --- a/www/sassc/Makefile +++ b/www/sassc/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2015/12/30 17:40:49 adam Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/13 18:16:13 adam Exp $ -DISTNAME= sassc-3.3.2 +DISTNAME= sassc-3.3.3 CATEGORIES= www devel MASTER_SITES= ${MASTER_SITE_GITHUB:=sass/} diff --git a/www/sassc/distinfo b/www/sassc/distinfo index 575eb11f64c30..0547e4e217115 100644 --- a/www/sassc/distinfo +++ b/www/sassc/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2015/12/30 17:40:49 adam Exp $ +$NetBSD: distinfo,v 1.2 2016/03/13 18:16:13 adam Exp $ -SHA1 (sassc-3.3.2.tar.gz) = 5f1d5b3877c9ec1f6980cf9e8113f36016e63b6a -RMD160 (sassc-3.3.2.tar.gz) = 9fa1be5bdf07d89a21367d79f4d0ccfd5616c137 -SHA512 (sassc-3.3.2.tar.gz) = 645125e3d8a481842f42c955fef77cb0eabe9b019abb905bb3c4a7db7d7911cb0911cc07a1a6c933fba143042a305cb3ff283d280253c9db4127cd15ac38a96f -Size (sassc-3.3.2.tar.gz) = 21974 bytes +SHA1 (sassc-3.3.3.tar.gz) = 80ca8b74b5e368ec69e397bfb96754bff012587d +RMD160 (sassc-3.3.3.tar.gz) = 973191fd5a5d1e8625dd9280e6f6074c65a26a69 +SHA512 (sassc-3.3.3.tar.gz) = 6f274f47bafceb08cb5fba11333b8a8c29696778198b545b8e46de58c7a20a9a4193735787503fc1c06ca640c75e7d756fce3d8b5f3b3a90946c8f8b1935f6a3 +Size (sassc-3.3.3.tar.gz) = 22276 bytes From 1173c4b53c00e43f7f1b3e7d9053816e8c6d715d Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 13 Mar 2016 18:17:05 +0000 Subject: [PATCH 0041/2457] Updated www/sassc to 3.3.3 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 37e2bf642889f..881a0ff484eb7 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1150 2016/03/13 17:26:59 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1151 2016/03/13 18:17:05 adam Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1539,3 +1539,4 @@ Changes to the packages collection and infrastructure in 2016: Removed lang/ruby200-base [taca 2016-03-13] Updated security/p5-Crypt-ECB to 2.10 [wiz 2016-03-13] Updated net/php-baikal to 0.3.5 [wiz 2016-03-13] + Updated www/sassc to 3.3.3 [adam 2016-03-13] From a614cfc0dd22dc3d59900f31d669ca34462f32fa Mon Sep 17 00:00:00 2001 From: schnoebe Date: Sun, 13 Mar 2016 18:31:11 +0000 Subject: [PATCH 0042/2457] Upstream: Update to 8.2.1 version 8.2.1 (Jun 2, 2015): - added TCP keepalives between client and server - TCP-based consoles already had the code - this was mostly an oversight - patch for SEGV and task execution - patch by Artem Savkov - expanded break sequences from [1-9] to [1-9a-z] - based on patch by Artem Savkov pkgsrc: options.mk: add support inet6 The way the conserver is coded, you get inet6 or you get uds patches/patch-conserver_readcfg.c: new patch, fixing a setproctitle() bug with inet6. This needs to be sent upstream. Makefile: install sample configurations Change maintainer to pkgsrc-users@netbsd.org old maintainer address bounced. drop ``--with-regex'' option, it's no longer supported. --- comms/conserver8/Makefile | 13 ++++++----- comms/conserver8/distinfo | 11 +++++----- comms/conserver8/options.mk | 15 ++++++++++--- .../patches/patch-conserver_readcfg.c | 22 +++++++++++++++++++ 4 files changed, 47 insertions(+), 14 deletions(-) create mode 100644 comms/conserver8/patches/patch-conserver_readcfg.c diff --git a/comms/conserver8/Makefile b/comms/conserver8/Makefile index 5f7458b039920..efb24c01457a1 100644 --- a/comms/conserver8/Makefile +++ b/comms/conserver8/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.17 2016/03/05 11:28:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.18 2016/03/13 18:31:11 schnoebe Exp $ # -PKGVER= 8.2.0 +PKGVER= 8.2.1 DISTNAME= conserver-${PKGVER} PKGNAME= conserver8-${PKGVER} -PKGREVISION= 1 CATEGORIES= comms MASTER_SITES= http://www.conserver.com/ -MAINTAINER= awrede@users.sourceforge.net +MAINTAINER= pkgsrc-users@netbsd.org HOMEPAGE= http://www.conserver.com/ COMMENT= Application that allows multiple users to watch serial consoles #LICENSE= # modified-bsd and more (see LICENSE file) @@ -22,7 +21,6 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-master=${CONSERVER_DEFAULTHOST:Q} CONFIGURE_ARGS+= --with-port=${CONSERVER_DEFAULTPORT:Q} -CONFIGURE_ARGS+= --with-regex CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} CONFIGURE_ARGS+= --with-logfile=${VARBASE:Q}/log/conserver @@ -47,7 +45,10 @@ SUBST_SED.conf= -e "s,/var/consoles,${VARBASE}/consoles," post-install: set -e; for File in INSTALL README PROTOCOL; do \ - ${INSTALL_DATA} ${WRKSRC}/$${File} ${DESTDIR}${DOCDIR}/$${File}; \ + ${INSTALL_DATA} ${WRKSRC}/$${File} ${DESTDIR}${DOCDIR}/$${File};\ + done + set -e; for F in ${WRKSRC}/conserver.cf/samples/* ; do \ + ${INSTALL_DATA} $$F ${DESTDIR}$EGDIR}; \ done .include "../../security/tcp_wrappers/buildlink3.mk" diff --git a/comms/conserver8/distinfo b/comms/conserver8/distinfo index f3fe2b63017b7..823fd5cef5760 100644 --- a/comms/conserver8/distinfo +++ b/comms/conserver8/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.9 2015/11/03 01:34:53 agc Exp $ +$NetBSD: distinfo,v 1.10 2016/03/13 18:31:11 schnoebe Exp $ -SHA1 (conserver-8.2.0.tar.gz) = acbb7f282cea94eb044860c35ddd9f31a0299888 -RMD160 (conserver-8.2.0.tar.gz) = fde2c8626f097d2e7f6eb10850a858dfc7d77a19 -SHA512 (conserver-8.2.0.tar.gz) = adda3f473a50d931ce4cce6daa710385857324884157a78b90a5bae4dd8d5dd491b6e404e0fd7fb7eb657a48912ca24f0a1574f435e824ae608454e9c3dc2a09 -Size (conserver-8.2.0.tar.gz) = 334326 bytes +SHA1 (conserver-8.2.1.tar.gz) = 357eea46c0189280b0ab66776b01ce3ba02f1847 +RMD160 (conserver-8.2.1.tar.gz) = 39f08facffc9b462c8257fa21c24785eb1e2bb5a +SHA512 (conserver-8.2.1.tar.gz) = caf519b8295fc142cf1cb5b141854aede07b3613653f417e9c3ebee75b30a12fa785c248806758f60afbc155cc048418635d514a9848e0fa06992f1e4f930fb6 +Size (conserver-8.2.1.tar.gz) = 335241 bytes SHA1 (patch-aa) = d0eebea0d126c611f6f60035730a0c2f97280b01 SHA1 (patch-ab) = 7a507e428277cc6ccf14b961c44d4e6fd3abcde3 +SHA1 (patch-conserver_readcfg.c) = c39e1d50829658cb77e4c943e631da4b3cdd31ee diff --git a/comms/conserver8/options.mk b/comms/conserver8/options.mk index 20c9b980bb804..2bd53ef24367b 100644 --- a/comms/conserver8/options.mk +++ b/comms/conserver8/options.mk @@ -1,8 +1,13 @@ -# $NetBSD: options.mk,v 1.1 2009/06/14 07:52:51 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2016/03/13 18:31:11 schnoebe Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.conserver8 -PKG_SUPPORTED_OPTIONS= pam ssl uds -PKG_SUGGESTED_OPTIONS= ssl + +PKG_OPTIONS_REQUIRED_GROUPS= connectivity +PKG_OPTIONS_GROUP.connectivity=inet6 uds + +PKG_SUPPORTED_OPTIONS= pam ssl + +PKG_SUGGESTED_OPTIONS= ssl inet6 .include "../../mk/bsd.options.mk" @@ -15,6 +20,10 @@ CONFIGURE_ARGS+= --with-pam CONFIGURE_ARGS+= --with-uds .endif +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --with-ipv6 +.endif + .if !empty(PKG_OPTIONS:Mssl) CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} . include "../../security/openssl/buildlink3.mk" diff --git a/comms/conserver8/patches/patch-conserver_readcfg.c b/comms/conserver8/patches/patch-conserver_readcfg.c new file mode 100644 index 0000000000000..b3459ed0b3efc --- /dev/null +++ b/comms/conserver8/patches/patch-conserver_readcfg.c @@ -0,0 +1,22 @@ +$NetBSD: patch-conserver_readcfg.c,v 1.1 2016/03/13 18:31:11 schnoebe Exp $ + +Have readcfg.c use the same logic as main.c uses for setproctitle. + +--- conserver/readcfg.c.orig 2015-06-02 17:19:31.000000000 +0000 ++++ conserver/readcfg.c +@@ -5376,7 +5376,14 @@ ReReadCfg(int fd, int msfd) + local += pGE->imembers; + for (pRC = pRCList; (REMOTE *)0 != pRC; pRC = pRC->pRCnext) + remote++; +- setproctitle("master: port %hu, %d local, %d remote", bindPort, ++ setproctitle("master: port %hu, %d local, %d remote", ++#if USE_IPV6 ++ config->primaryport, ++#elif USE_UNIX_DOMAIN_SOCKETS ++ 0, ++#else ++ bindPort, ++#endif + local, remote); + } else + setproctitle("group %u: port %hu, %d %s", pGroups->id, From d842b952941549e81b07e32377a3b5707dbaf865 Mon Sep 17 00:00:00 2001 From: schnoebe Date: Sun, 13 Mar 2016 18:32:49 +0000 Subject: [PATCH 0043/2457] Updated comms/conserver8 to 8.2.1. --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 881a0ff484eb7..073fd2870f83a 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1151 2016/03/13 18:17:05 adam Exp $ +$NetBSD: CHANGES-2016,v 1.1152 2016/03/13 18:32:49 schnoebe Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1540,3 +1540,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/p5-Crypt-ECB to 2.10 [wiz 2016-03-13] Updated net/php-baikal to 0.3.5 [wiz 2016-03-13] Updated www/sassc to 3.3.3 [adam 2016-03-13] + Updated comms/conserver8 to 8.2.1 [schnoebe 2016-03-13] diff --git a/doc/TODO b/doc/TODO index 9bcf2ff8394bb..dd56c4a845dd9 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15589 2016/03/13 16:54:34 wiz Exp $ +$NetBSD: TODO,v 1.15590 2016/03/13 18:33:11 schnoebe Exp $ Suggested new packages ====================== @@ -562,7 +562,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o concurrencykit-0.5.1 o cone-0.92 o confuse-3.0 - o conserver8-8.2.1 o cook-2.31 o courier-0.74.2 o courier-authlib-0.66.2 From bd7051bedb2ca0019c0fa616ed0b07a825e28dcb Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 13 Mar 2016 20:14:02 +0000 Subject: [PATCH 0044/2457] ivtools, nocol --- doc/CHANGES-2016 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 073fd2870f83a..27726f23af8fe 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1152 2016/03/13 18:32:49 schnoebe Exp $ +$NetBSD: CHANGES-2016,v 1.1153 2016/03/13 20:14:02 dholland Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1527,6 +1527,8 @@ Changes to the packages collection and infrastructure in 2016: Updated security/p11-kit to 0.22.1 [ryoon 2016-03-13] Updated lang/scala to 2.11.8 [ryoon 2016-03-13] Updated devel/p5-App-cpanminus to 1.7040 [mef 2016-03-13] + Updated graphics/ivtools to 1.2.8nb4 [dholland 2016-03-13] + Updated net/nocol to 4.3.1nb12 [dholland 2016-03-13] Updated games/lgogdownloader to 2.27 [wiz 2016-03-13] Updated x11/rxvt-unicode to 9.22 [morr 2016-03-13] Added devel/p5-Git-Version-Compare version 1.001 [wen 2016-03-13] From 26959dde0024d90fe3bf7938a6bc65e67277514b Mon Sep 17 00:00:00 2001 From: fhajny Date: Sun, 13 Mar 2016 20:50:53 +0000 Subject: [PATCH 0045/2457] Update databases/mongodb to 3.2.4. - Fixed issue with setting optime when running with journaling disabled - Have read concern majority reflect journaled state on the primary - Fixed issue where specifying replication.enableMajorityReadConcern implied true regardless of the actual boolean value - Fixed issue causing segfault when running aggregation that includes $lookup --- databases/mongodb/Makefile | 5 ++--- databases/mongodb/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile index 0d6c726091935..3b84bf73a3d54 100644 --- a/databases/mongodb/Makefile +++ b/databases/mongodb/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2016/03/05 11:28:11 jperkin Exp $ +# $NetBSD: Makefile,v 1.13 2016/03/13 20:50:53 fhajny Exp $ -DISTNAME= mongodb-src-r3.2.3 +DISTNAME= mongodb-src-r3.2.4 PKGNAME= ${DISTNAME:S/src-r//:S/-rc/rc/} -PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= http://fastdl.mongodb.org/src/ diff --git a/databases/mongodb/distinfo b/databases/mongodb/distinfo index c11bbb2887301..d10cd80e65e44 100644 --- a/databases/mongodb/distinfo +++ b/databases/mongodb/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.12 2016/02/22 11:35:34 fhajny Exp $ +$NetBSD: distinfo,v 1.13 2016/03/13 20:50:53 fhajny Exp $ -SHA1 (mongodb-src-r3.2.3.tar.gz) = 8b2df29dd596078a87a109276a64d8ba3deb270b -RMD160 (mongodb-src-r3.2.3.tar.gz) = d67e7100b477c51a1317312d6fd938ccfeebed14 -SHA512 (mongodb-src-r3.2.3.tar.gz) = 43b652da8fb461c36be1566965985aed036d53a8f4ed2a5f4a67e08571697c4030eb682a2a14ebc41991757d7083a268c5161b536d20dc1b3de13dac8df1da53 -Size (mongodb-src-r3.2.3.tar.gz) = 29607224 bytes +SHA1 (mongodb-src-r3.2.4.tar.gz) = c97aab8e2fcb10adfd61be1c56350e6f4c13d685 +RMD160 (mongodb-src-r3.2.4.tar.gz) = d27f29b5fce9bb559a0cf84feddabd367515d44e +SHA512 (mongodb-src-r3.2.4.tar.gz) = fb7b3ea3c704cde023ec540f4a142d3beba217f33e8c30da04318e365c5d52cbfa00b98824c53485b5f8918a83095c9b26db43861d80029e8e924e66dd8ea694 +Size (mongodb-src-r3.2.4.tar.gz) = 29647777 bytes SHA1 (patch-SConstruct) = d872e234effef5275201b46d506bc45a7ad12862 SHA1 (patch-debian_mongod.conf) = d4146b3d62b4472d55609c7f6aaa596f8f893d1f SHA1 (patch-src_mongo_base_initializer.h) = add32c5940c922a98122d0e6883eb3ad52dc25c5 From 09fa83fec5002ddcc108b064ee97bbae4cbf5baa Mon Sep 17 00:00:00 2001 From: fhajny Date: Sun, 13 Mar 2016 20:51:06 +0000 Subject: [PATCH 0046/2457] Updated databases/mongodb to 3.2.4 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 27726f23af8fe..c607c4bcaf956 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1153 2016/03/13 20:14:02 dholland Exp $ +$NetBSD: CHANGES-2016,v 1.1154 2016/03/13 20:51:06 fhajny Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1543,3 +1543,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/php-baikal to 0.3.5 [wiz 2016-03-13] Updated www/sassc to 3.3.3 [adam 2016-03-13] Updated comms/conserver8 to 8.2.1 [schnoebe 2016-03-13] + Updated databases/mongodb to 3.2.4 [fhajny 2016-03-13] From b1d11d1ef25b0eb42c78e6ec3a5f5f3f4f4d9917 Mon Sep 17 00:00:00 2001 From: fhajny Date: Sun, 13 Mar 2016 21:05:34 +0000 Subject: [PATCH 0047/2457] Update databases/mongo-tools to 3.2.4. 3.2.4 - mongorestore --noIndexRestore inhibits empty collection creation 3.2.3 - mongoexport chokes on data with quotes 3.2.1 - Add bypassDocumentValidation option to mongorestore and mongoimport - Missing "from" text in mongorestore status message 3.2.0 - Add bypassDocumentValidation option to mongorestore and mongoimport - Missing "from" text in mongorestore status message 3.0.8 - bsondump does not keep attribut order - mongodump issue with temporary map/reduce collections - Error restoring database "insertion error: EOF" --- databases/mongo-tools/Makefile | 5 ++--- databases/mongo-tools/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/databases/mongo-tools/Makefile b/databases/mongo-tools/Makefile index e3790d09f996b..3a0b83a54574a 100644 --- a/databases/mongo-tools/Makefile +++ b/databases/mongo-tools/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2016/03/05 11:28:11 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/13 21:05:34 fhajny Exp $ -DISTNAME= mongo-tools-3.0.7 -PKGREVISION= 3 +DISTNAME= mongo-tools-3.2.4 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_GITHUB:=mongodb/} diff --git a/databases/mongo-tools/distinfo b/databases/mongo-tools/distinfo index 94965f7f510f1..252cc102ad27b 100644 --- a/databases/mongo-tools/distinfo +++ b/databases/mongo-tools/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 17:41:15 agc Exp $ +$NetBSD: distinfo,v 1.4 2016/03/13 21:05:34 fhajny Exp $ -SHA1 (mongo-tools-3.0.7.tar.gz) = 26d1838286826d0e6022f8f51e2be541887d91ac -RMD160 (mongo-tools-3.0.7.tar.gz) = b7ca05ae1f66bf8d1152eada1c673f99f5f5cdc3 -SHA512 (mongo-tools-3.0.7.tar.gz) = ff410f25a42e76f55716e6e478564aaeefd3999cf0e9db718969877709974d099c479690e81d6f639c27b0a4d9b59d193c43f1c31dc027b594f1fef33129cb5a -Size (mongo-tools-3.0.7.tar.gz) = 2183495 bytes +SHA1 (mongo-tools-3.2.4.tar.gz) = 75b9646509ac8a2a045d5a9f42735e333f5ecf70 +RMD160 (mongo-tools-3.2.4.tar.gz) = 26bdb86c83723937879beb3822a8b42191f274ee +SHA512 (mongo-tools-3.2.4.tar.gz) = d34ad87bb2a53c9df0124c26a4c200236aa889c7a5bd09a3b535acd4b18c5757018e78813fa04b48b359004eb9097853b49fd359617e71f66e41ef71da01c222 +Size (mongo-tools-3.2.4.tar.gz) = 2229852 bytes SHA1 (patch-vendor_src_github.com_howeyc_gopass_bsd.go) = 13efab29de38877ef9948439edc23d57ca41e48d SHA1 (patch-vendor_src_github.com_spacemonkeygo_openssl_build.go) = fa1dd7b8e6d4811298e52d11fa5c198db0cb0f50 SHA1 (patch-vendor_src_gopkg.in_mgo.v2_internal_sasl_sasl.go) = b860646c4125001d2c025005bc2d63cf12d10a68 From 6834edf7bbbf0627438975d2faea90fa791721dd Mon Sep 17 00:00:00 2001 From: fhajny Date: Sun, 13 Mar 2016 21:05:43 +0000 Subject: [PATCH 0048/2457] Updated databases/mongo-tools to 3.2.4 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index c607c4bcaf956..25b0185f9b124 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1154 2016/03/13 20:51:06 fhajny Exp $ +$NetBSD: CHANGES-2016,v 1.1155 2016/03/13 21:05:43 fhajny Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1544,3 +1544,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/sassc to 3.3.3 [adam 2016-03-13] Updated comms/conserver8 to 8.2.1 [schnoebe 2016-03-13] Updated databases/mongodb to 3.2.4 [fhajny 2016-03-13] + Updated databases/mongo-tools to 3.2.4 [fhajny 2016-03-13] From 4df02db1bb994c2db359fb2c463515e26ac0fc29 Mon Sep 17 00:00:00 2001 From: fhajny Date: Sun, 13 Mar 2016 21:40:22 +0000 Subject: [PATCH 0049/2457] Enable postgresql-postgis2 for PostgreSQL 9.5 --- databases/postgresql-postgis2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/postgresql-postgis2/Makefile b/databases/postgresql-postgis2/Makefile index 166f3dace33a0..a612153f45243 100644 --- a/databases/postgresql-postgis2/Makefile +++ b/databases/postgresql-postgis2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2016/03/05 11:28:13 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2016/03/13 21:40:22 fhajny Exp $ DISTNAME= postgis-2.2.1 PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME} @@ -28,7 +28,7 @@ CONFLICTS= postgis-[0-9]* # gmake complains about adding + to parent rule MAKE_JOBS_SAFE= no -PGSQL_VERSIONS_ACCEPTED= 94 93 92 91 +PGSQL_VERSIONS_ACCEPTED= 95 94 93 92 91 USE_GCC_RUNTIME= yes USE_LANGUAGES= c c++ c99 From fd55d53500e68d1c284c19324a246fc7f43657f7 Mon Sep 17 00:00:00 2001 From: gdt Date: Sun, 13 Mar 2016 23:25:21 +0000 Subject: [PATCH 0050/2457] Remove postgresql-postgis This package is well beyond obsolete, and is no longer maintained upstream. It only existed because postgis2 (now at 2.2, 2 major releases later) was added instead of just updating this one. --- databases/Makefile | 3 +- databases/postgresql-postgis/DESCR | 18 --- databases/postgresql-postgis/Makefile | 65 ----------- databases/postgresql-postgis/PLIST | 105 ------------------ databases/postgresql-postgis/buildlink3.mk | 19 ---- databases/postgresql-postgis/distinfo | 11 -- .../patches/patch-configure | 22 ---- .../patches/patch-configure.ac | 19 ---- .../patches/patch-doc_Makefile.in | 34 ------ .../patch-doc_html_image__src_Makefile.in | 13 --- .../patches/patch-postgis_Makefile.in | 22 ---- 11 files changed, 1 insertion(+), 330 deletions(-) delete mode 100644 databases/postgresql-postgis/DESCR delete mode 100644 databases/postgresql-postgis/Makefile delete mode 100644 databases/postgresql-postgis/PLIST delete mode 100644 databases/postgresql-postgis/buildlink3.mk delete mode 100644 databases/postgresql-postgis/distinfo delete mode 100644 databases/postgresql-postgis/patches/patch-configure delete mode 100644 databases/postgresql-postgis/patches/patch-configure.ac delete mode 100644 databases/postgresql-postgis/patches/patch-doc_Makefile.in delete mode 100644 databases/postgresql-postgis/patches/patch-doc_html_image__src_Makefile.in delete mode 100644 databases/postgresql-postgis/patches/patch-postgis_Makefile.in diff --git a/databases/Makefile b/databases/Makefile index b8b0f3fe0c61b..0e01d2b3195ad 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.512 2016/03/11 21:31:36 fhajny Exp $ +# $NetBSD: Makefile,v 1.513 2016/03/13 23:25:21 gdt Exp $ COMMENT= Databases @@ -269,7 +269,6 @@ SUBDIR+= poco-data-mysql SUBDIR+= poco-data-odbc SUBDIR+= poco-data-sqlite SUBDIR+= postgresql-pgbench -SUBDIR+= postgresql-postgis SUBDIR+= postgresql-postgis2 SUBDIR+= postgresql91 SUBDIR+= postgresql91-adminpack diff --git a/databases/postgresql-postgis/DESCR b/databases/postgresql-postgis/DESCR deleted file mode 100644 index 7a614ccf20e68..0000000000000 --- a/databases/postgresql-postgis/DESCR +++ /dev/null @@ -1,18 +0,0 @@ -PostGIS adds support for geographic objects to the PostgreSQL object-relational -database. In effect, PostGIS "spatially enables" the PostgreSQL server, -allowing it to be used as a backend spatial database for geographic information -systems (GIS), much like ESRI's SDE or Oracle's Spatial extension. PostGIS -follows the OpenGIS "Simple Features Specification for SQL" and has been -certified as compliant with the "Types and Functions" profile. - -PostGIS/PostgreSQL includes the following functionality: -* Simple Features as defined by the OpenGIS Consortium (OGC) -* Support for Well-Known Text and Well-Known Binary representations of GIS - objects -* Fast spatial indexing using GiST -* Geospatial analysis functions -* PostgreSQL JDBC extension objects corresponding to the geometries -* Support for OGC access functions as defined by the Simple Features - Specification - -This is postgis 1.5, which is obsolete. diff --git a/databases/postgresql-postgis/Makefile b/databases/postgresql-postgis/Makefile deleted file mode 100644 index 91d8bb6606756..0000000000000 --- a/databases/postgresql-postgis/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# $NetBSD: Makefile,v 1.22 2015/10/24 21:18:12 joerg Exp $ - -DISTNAME= postgis-1.5.3 -PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME} -PKGREVISION= 8 -CATEGORIES= databases geography -MASTER_SITES= http://postgis.refractions.net/download/ - -MAINTAINER= gdt@NetBSD.org -HOMEPAGE= http://postgis.refractions.net/ -COMMENT= Spatial database capabilities for PostgreSQL - -LICENSE= gnu-gpl-v2 - -DEPENDS+= postgresql${PGSQL_VERSION}-server>=0:../../databases/postgresql${PGSQL_VERSION}-server - -CONFLICTS= postgis-[0-9]* - -# gmake complains about adding + to parent rule -MAKE_JOBS_SAFE= no - -PGSQL_VERSIONS_ACCEPTED= 91 - -USE_GCC_RUNTIME= yes -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -USE_TOOLS+= gmake lex pax perl -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-rpath -CONFIGURE_ARGS+= --datadir=${PREFIX}/share/postgresql/contrib - -TEST_TARGET= check - -DOCDIR= ${PREFIX}/share/doc/postgis - -SUBST_CLASSES+= paths -SUBST_FILES.paths= extras/template_gis/profile \ - extras/template_gis/createdb.postgis.1 \ - extras/template_gis/mktemplate_gis.1 \ - extras/template_gis/postgis_env.sh.in -SUBST_VARS.paths+= PKG_SYSCONFDIR -SUBST_STAGE.paths= pre-configure - -INSTALLATION_DIRS= ${DOCDIR} ${DOCDIR}/images ${PKGMANDIR}/man1 - -MAKE_ENV+= PERL5=${PERL5:Q} -INSTALL_ENV+= mkinstalldirs=${INSTALL_DATA_DIR:Q} - -post-install: - ${INSTALL_DATA} ${BUILD_DIRS:Q}/README.postgis ${DESTDIR}${DOCDIR} - ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/html/postgis.html ${DESTDIR}${DOCDIR} - ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/html/style.css ${DESTDIR}${DOCDIR} - ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/html/images/* ${DESTDIR}${DOCDIR}/images - ${INSTALL_MAN} ${BUILD_DIRS:Q}/doc/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA} ${BUILD_DIRS:Q}/doc/postgis_comments.sql ${DESTDIR}${PREFIX}/share/postgresql/contrib/postgis-1.5 - -# TEST_DEPENDS -# .include "../../devel/cunit/buildlink3.mk" - -.include "../../geography/geos/buildlink3.mk" -.include "../../geography/proj/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" -.include "../../mk/pgsql.buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-postgis/PLIST b/databases/postgresql-postgis/PLIST deleted file mode 100644 index 6acf38ac013f1..0000000000000 --- a/databases/postgresql-postgis/PLIST +++ /dev/null @@ -1,105 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2012/01/08 18:39:49 gdt Exp $ -bin/pgsql2shp -bin/shp2pgsql -lib/postgresql/postgis-1.5.so -man/man1/pgsql2shp.1 -man/man1/shp2pgsql.1 -share/doc/postgis/README.postgis -share/doc/postgis/images/caution.png -share/doc/postgis/images/check.png -share/doc/postgis/images/de9im01.png -share/doc/postgis/images/de9im02.png -share/doc/postgis/images/de9im03.png -share/doc/postgis/images/de9im04.png -share/doc/postgis/images/de9im05.png -share/doc/postgis/images/de9im06.png -share/doc/postgis/images/de9im07.png -share/doc/postgis/images/de9im08.png -share/doc/postgis/images/de9im09.png -share/doc/postgis/images/de9im10.png -share/doc/postgis/images/de9im11.png -share/doc/postgis/images/de9im12.png -share/doc/postgis/images/de9im13.png -share/doc/postgis/images/important.png -share/doc/postgis/images/matrix_autocast.png -share/doc/postgis/images/matrix_checkmark.png -share/doc/postgis/images/matrix_transform.png -share/doc/postgis/images/note.png -share/doc/postgis/images/st_buffer01.png -share/doc/postgis/images/st_buffer02.png -share/doc/postgis/images/st_buffer03.png -share/doc/postgis/images/st_buffer04.png -share/doc/postgis/images/st_buffer05.png -share/doc/postgis/images/st_buffer06.png -share/doc/postgis/images/st_buffer07.png -share/doc/postgis/images/st_buffer08.png -share/doc/postgis/images/st_buildarea01.png -share/doc/postgis/images/st_buildarea02.png -share/doc/postgis/images/st_centroid01.png -share/doc/postgis/images/st_centroid02.png -share/doc/postgis/images/st_centroid03.png -share/doc/postgis/images/st_centroid04.png -share/doc/postgis/images/st_closestpoint01.png -share/doc/postgis/images/st_closestpoint02.png -share/doc/postgis/images/st_contains01.png -share/doc/postgis/images/st_contains02.png -share/doc/postgis/images/st_contains03.png -share/doc/postgis/images/st_contains04.png -share/doc/postgis/images/st_contains05.png -share/doc/postgis/images/st_contains06.png -share/doc/postgis/images/st_convexhull01.png -share/doc/postgis/images/st_crosses-math.gif -share/doc/postgis/images/st_crosses01.png -share/doc/postgis/images/st_crosses02.png -share/doc/postgis/images/st_crosses03.png -share/doc/postgis/images/st_crosses04.png -share/doc/postgis/images/st_difference01.png -share/doc/postgis/images/st_dumppoints01.png -share/doc/postgis/images/st_issimple01.png -share/doc/postgis/images/st_issimple02.png -share/doc/postgis/images/st_issimple03.png -share/doc/postgis/images/st_issimple04.png -share/doc/postgis/images/st_issimple05.png -share/doc/postgis/images/st_issimple06.png -share/doc/postgis/images/st_issimple07.png -share/doc/postgis/images/st_isvalid01.png -share/doc/postgis/images/st_isvalid02.png -share/doc/postgis/images/st_isvalid03.png -share/doc/postgis/images/st_isvalid04.png -share/doc/postgis/images/st_isvalid05.png -share/doc/postgis/images/st_isvalid06.png -share/doc/postgis/images/st_isvalid07.png -share/doc/postgis/images/st_isvalid08.png -share/doc/postgis/images/st_line_interpolate_point01.png -share/doc/postgis/images/st_line_substring01.png -share/doc/postgis/images/st_linecrossingdirection01.png -share/doc/postgis/images/st_linecrossingdirection02.png -share/doc/postgis/images/st_linecrossingdirection03.png -share/doc/postgis/images/st_linecrossingdirection04.png -share/doc/postgis/images/st_longestline01.png -share/doc/postgis/images/st_longestline02.png -share/doc/postgis/images/st_longestline03.png -share/doc/postgis/images/st_minimumboundingcircle01.png -share/doc/postgis/images/st_shortestline01.png -share/doc/postgis/images/st_shortestline02.png -share/doc/postgis/images/st_symdifference01.png -share/doc/postgis/images/st_symdifference02.png -share/doc/postgis/images/st_touches-math.gif -share/doc/postgis/images/st_touches01.png -share/doc/postgis/images/st_touches02.png -share/doc/postgis/images/st_touches03.png -share/doc/postgis/images/st_touches04.png -share/doc/postgis/images/st_touches05.png -share/doc/postgis/images/st_touches06.png -share/doc/postgis/images/st_within01.png -share/doc/postgis/images/tip.png -share/doc/postgis/images/warning.png -share/doc/postgis/postgis.html -share/doc/postgis/style.css -share/postgresql/contrib/postgis-1.5/postgis.sql -share/postgresql/contrib/postgis-1.5/postgis_comments.sql -share/postgresql/contrib/postgis-1.5/postgis_upgrade_13_to_15.sql -share/postgresql/contrib/postgis-1.5/postgis_upgrade_14_to_15.sql -share/postgresql/contrib/postgis-1.5/postgis_upgrade_15_minor.sql -share/postgresql/contrib/postgis-1.5/spatial_ref_sys.sql -share/postgresql/contrib/postgis-1.5/uninstall_postgis.sql diff --git a/databases/postgresql-postgis/buildlink3.mk b/databases/postgresql-postgis/buildlink3.mk deleted file mode 100644 index 05ca57faa421a..0000000000000 --- a/databases/postgresql-postgis/buildlink3.mk +++ /dev/null @@ -1,19 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.5 2015/10/24 21:18:12 joerg Exp $ - -BUILDLINK_TREE+= postgresql-postgis - -.if !defined(POSTGRESQL_POSTGIS_BUILDLINK3_MK) -POSTGRESQL_POSTGIS_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.postgresql-postgis+= postgresql${PGSQL_VERSION}-postgis>=1.4 -BUILDLINK_ABI_DEPENDS.postgresql-postgis?= postgresql91-postgis>=1.5.3nb7 -BUILDLINK_PKGSRCDIR.postgresql-postgis?= ../../databases/postgresql-postgis - -PGSQL_VERSIONS_ACCEPTED= 91 - -.include "../../geography/geos/buildlink3.mk" -.include "../../geography/proj/buildlink3.mk" -.include "../../mk/pgsql.buildlink3.mk" -.endif # POSTGRESQL_POSTGIS_BUILDLINK3_MK - -BUILDLINK_TREE+= -postgresql-postgis diff --git a/databases/postgresql-postgis/distinfo b/databases/postgresql-postgis/distinfo deleted file mode 100644 index 5f8139cf84acc..0000000000000 --- a/databases/postgresql-postgis/distinfo +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 01:56:25 agc Exp $ - -SHA1 (postgis-1.5.3.tar.gz) = e8c572e0258ba760a67b7f717bdc8321b9f6cd58 -RMD160 (postgis-1.5.3.tar.gz) = e30275890b175cbe1d70d5899cbe45ec34ddbafb -SHA512 (postgis-1.5.3.tar.gz) = fe51f6cd452de577d361b56196adcacd6715f608c3e2d073375f36e35a6b47b5cc92f8232b9d1d29cd00d1f85c77dbd035379687f7a180074ee7dbd38ca8f3cd -Size (postgis-1.5.3.tar.gz) = 3779956 bytes -SHA1 (patch-configure) = 02eb1f3774bdb75f6426e3af97e81a1991c41b4b -SHA1 (patch-configure.ac) = 84d5371513f235184c65b4e80aa67334ae8c2498 -SHA1 (patch-doc_Makefile.in) = 98807010256cf42e4d179305febe2525efbb6cd1 -SHA1 (patch-doc_html_image__src_Makefile.in) = 89e19e03dbb936d723d1e6748cd2bd77232bcf6d -SHA1 (patch-postgis_Makefile.in) = db0e73dac0d4c88cd44fe33253c8b766c576b664 diff --git a/databases/postgresql-postgis/patches/patch-configure b/databases/postgresql-postgis/patches/patch-configure deleted file mode 100644 index f4e98f2d11c16..0000000000000 --- a/databases/postgresql-postgis/patches/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-configure,v 1.2 2013/10/20 18:18:52 joerg Exp $ - -See configure.ac patch. - ---- configure.orig 2011-12-31 03:24:50.000000000 +0000 -+++ configure -@@ -16430,12 +16430,14 @@ fi - - - --PGSQL_FE_LDFLAGS=-L`$PGCONFIG --libdir`" -lpq" -+ -+PGSQL_FE_LDFLAGS="-L`$PGCONFIG --libdir` ${COMPILER_RPATH_FLAG}`$PGCONFIG --libdir` -lpq" - PGSQL_FE_CPPFLAGS=-I`$PGCONFIG --includedir` - - - - -+ - PGSQL_DOCDIR=`$PGCONFIG --docdir` - PGSQL_MANDIR=`$PGCONFIG --mandir` - diff --git a/databases/postgresql-postgis/patches/patch-configure.ac b/databases/postgresql-postgis/patches/patch-configure.ac deleted file mode 100644 index e8aaba581e472..0000000000000 --- a/databases/postgresql-postgis/patches/patch-configure.ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.2 2013/10/20 18:18:52 joerg Exp $ - -Upstream's configure hand-constructs LDFLAGS from using --libdir, and -fails to address rpath. - -To be addressed with upstream by gdt after updating to 1.5.3 and -understanding better. - ---- configure.ac.orig 2010-01-29 21:24:24.000000000 +0000 -+++ configure.ac -@@ -341,7 +341,7 @@ AC_SUBST([PGXSOVERRIDE]) - dnl Note: We don't need the server-side LDFLAGS or CPPFLAGS because we get these from PGXS - - dnl Extract the linker and include flags for the frontend (for programs that use libpq) --PGSQL_FE_LDFLAGS=-L`$PGCONFIG --libdir`" -lpq" -+PGSQL_FE_LDFLAGS="-L`$PGCONFIG --libdir` ${COMPILER_RPATH_FLAG}`$PGCONFIG --libdir` -lpq" - PGSQL_FE_CPPFLAGS=-I`$PGCONFIG --includedir` - - AC_SUBST([PGSQL_FE_LDFLAGS]) diff --git a/databases/postgresql-postgis/patches/patch-doc_Makefile.in b/databases/postgresql-postgis/patches/patch-doc_Makefile.in deleted file mode 100644 index 7d2786b040fc5..0000000000000 --- a/databases/postgresql-postgis/patches/patch-doc_Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-doc_Makefile.in,v 1.1 2012/01/10 14:00:46 gdt Exp $ - ---- doc/Makefile.in.orig 2010-09-19 12:21:28.000000000 +0000 -+++ doc/Makefile.in -@@ -111,24 +111,24 @@ doxygen: doxygen.cfg - doxygen $< - - images: -- make -C html/image_src images -+ $(MAKE) -C html/image_src images - - clean: -- make -C html/image_src clean -+ $(MAKE) -C html/image_src clean - @rm -f postgis-out.xml postgis_aggs_mm.xml - - maintainer-clean: clean -- make -C html/image_src clean -+ $(MAKE) -C html/image_src clean - @rm -f html/*.html \ - postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf - - comments: postgis_comments.sql - - comments-install: comments -- make -f Makefile.comments install -+ $(MAKE) -f Makefile.comments install - - comments-uninstall: -- make -f Makefile.comments uninstall -+ $(MAKE) -f Makefile.comments uninstall - - install: html/postgis.html man/shp2pgsql.1 man/pgsql2shp.1 - @mkdir -p $(PGSQL_DOCDIR)/postgis diff --git a/databases/postgresql-postgis/patches/patch-doc_html_image__src_Makefile.in b/databases/postgresql-postgis/patches/patch-doc_html_image__src_Makefile.in deleted file mode 100644 index 18ee038842f8d..0000000000000 --- a/databases/postgresql-postgis/patches/patch-doc_html_image__src_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-doc_html_image__src_Makefile.in,v 1.1 2012/01/10 14:00:46 gdt Exp $ - ---- doc/html/image_src/Makefile.in.orig 2010-01-11 17:31:49.000000000 +0000 -+++ doc/html/image_src/Makefile.in -@@ -126,7 +126,7 @@ generator: ../../../liblwgeom/liblwgeom. - - # Build liblwgeom - ../../../liblwgeom/liblwgeom.a: -- make -C ../../../liblwgeom liblwgeom.a -+ $(MAKE) -C ../../../liblwgeom liblwgeom.a - - # Clean target - clean: diff --git a/databases/postgresql-postgis/patches/patch-postgis_Makefile.in b/databases/postgresql-postgis/patches/patch-postgis_Makefile.in deleted file mode 100644 index 81d429b6959da..0000000000000 --- a/databases/postgresql-postgis/patches/patch-postgis_Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-postgis_Makefile.in,v 1.1 2012/03/14 16:41:10 fhajny Exp $ - -Specify perl binary directly, rather than rely on PostgreSQL. ---- postgis/Makefile.in.orig 2010-01-08 22:48:29.000000000 +0000 -+++ postgis/Makefile.in -@@ -106,13 +106,13 @@ endif - sed 's,MODULE_PATHNAME,$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@ - - postgis_upgrade_15_minor.sql: postgis.sql -- $(PERL) ../utils/postgis_proc_upgrade.pl $< 1.5 > $@ -+ $(PERL5) ../utils/postgis_proc_upgrade.pl $< 1.5 > $@ - - postgis_upgrade_14_to_15.sql: postgis.sql -- $(PERL) ../utils/postgis_proc_upgrade.pl $< 1.4 > $@ -+ $(PERL5) ../utils/postgis_proc_upgrade.pl $< 1.4 > $@ - - postgis_upgrade_13_to_15.sql: postgis.sql -- $(PERL) ../utils/postgis_proc_upgrade.pl $< 1.3 > $@ -+ $(PERL5) ../utils/postgis_proc_upgrade.pl $< 1.3 > $@ - - # Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor - $(SQL_OBJS): %.in: %.in.c From 128461d94db89ad7074f44a39517bbe82ea1c475 Mon Sep 17 00:00:00 2001 From: gdt Date: Sun, 13 Mar 2016 23:26:37 +0000 Subject: [PATCH 0051/2457] Removed databases/postgresql-postgis2 successor databases/postgresql-postgis2 [gdt 2016-03-14] CVS: ---------------------------------------------------------------------- CVS: CVSROOT cvs.NetBSD.org:/cvsroot CVS: please use "PR category/123" to have the commitmsg appended to PR 123 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 25b0185f9b124..55a41c36bfa9d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1155 2016/03/13 21:05:43 fhajny Exp $ +$NetBSD: CHANGES-2016,v 1.1156 2016/03/13 23:26:37 gdt Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1545,3 +1545,4 @@ Changes to the packages collection and infrastructure in 2016: Updated comms/conserver8 to 8.2.1 [schnoebe 2016-03-13] Updated databases/mongodb to 3.2.4 [fhajny 2016-03-13] Updated databases/mongo-tools to 3.2.4 [fhajny 2016-03-13] + Removed databases/postgresql-postgis2 successor databases/postgresql-postgis2 [gdt 2016-03-14] From 3e091c50722c204345914ff1b5ad9c7a2885ecee Mon Sep 17 00:00:00 2001 From: gdt Date: Sun, 13 Mar 2016 23:28:13 +0000 Subject: [PATCH 0052/2457] Fix previous CVS: ---------------------------------------------------------------------- CVS: CVSROOT cvs.NetBSD.org:/cvsroot CVS: please use "PR category/123" to have the commitmsg appended to PR 123 --- doc/CHANGES-2016 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 55a41c36bfa9d..adb63dde53f6c 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1156 2016/03/13 23:26:37 gdt Exp $ +$NetBSD: CHANGES-2016,v 1.1157 2016/03/13 23:28:13 gdt Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1545,4 +1545,4 @@ Changes to the packages collection and infrastructure in 2016: Updated comms/conserver8 to 8.2.1 [schnoebe 2016-03-13] Updated databases/mongodb to 3.2.4 [fhajny 2016-03-13] Updated databases/mongo-tools to 3.2.4 [fhajny 2016-03-13] - Removed databases/postgresql-postgis2 successor databases/postgresql-postgis2 [gdt 2016-03-14] + Removed databases/postgresql-postgis successor databases/postgresql-postgis2 [gdt 2016-03-14] From b5bcd7e85eb3c8b4a00a53a3774b9f14bd23f798 Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 00:54:43 +0000 Subject: [PATCH 0053/2457] drop ruby200-base --- meta-pkgs/bulk-medium/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile index 67de617428154..f80cfa685bc9b 100644 --- a/meta-pkgs/bulk-medium/Makefile +++ b/meta-pkgs/bulk-medium/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.33 2015/12/05 21:25:49 adam Exp $ +# $NetBSD: Makefile,v 1.34 2016/03/14 00:54:43 tnn Exp $ -DISTNAME= bulk-medium-20151004 +DISTNAME= bulk-medium-20160314 CATEGORIES= meta-pkgs MASTER_SITES= # empty DISTFILES= # empty @@ -85,7 +85,6 @@ BUILD_DEPENDS+= gawk-[0-9]*:../../lang/gawk BUILD_DEPENDS+= php>=5.5<5.6:../../lang/php55 BUILD_DEPENDS+= php>=5.6<5.7:../../lang/php56 BUILD_DEPENDS+= ruby18-base-[0-9]*:../../lang/ruby18-base -BUILD_DEPENDS+= ruby200-base-[0-9]*:../../lang/ruby200-base BUILD_DEPENDS+= ruby21-base-[0-9]*:../../lang/ruby21-base BUILD_DEPENDS+= ruby22-base-[0-9]*:../../lang/ruby22-base BUILD_DEPENDS+= sun-jdk6-[0-9]*:../../lang/sun-jdk6 From 3604e7f716616aebc75ea0aff7ebdd80878a77f3 Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 00:59:05 +0000 Subject: [PATCH 0054/2457] remove references to ruby200 --- databases/ruby-gdbm/Makefile | 4 ++-- devel/ruby-curses/Makefile | 4 ++-- devel/ruby-power_assert/Makefile | 4 ++-- devel/ruby-rake/Makefile | 4 ++-- devel/ruby-rdoc/Makefile | 4 ++-- devel/ruby-readline/Makefile | 4 ++-- lang/ruby/Makefile | 4 ++-- misc/ruby-progressbar/Makefile | 4 ++-- sysutils/puppet/Makefile | 4 ++-- sysutils/ruby-chef/Makefile | 4 ++-- textproc/migemo/Makefile.common | 4 ++-- textproc/ruby-diff-lcs/Makefile | 4 ++-- textproc/ruby-json/Makefile | 4 ++-- textproc/ruby-rdtool/Makefile | 4 ++-- textproc/ruby-sary/Makefile | 4 ++-- x11/ruby-tk/Makefile | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/databases/ruby-gdbm/Makefile b/databases/ruby-gdbm/Makefile index c06217a69c3ec..7e573e9be2de7 100644 --- a/databases/ruby-gdbm/Makefile +++ b/databases/ruby-gdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2015/12/30 15:00:57 taca Exp $ +# $NetBSD: Makefile,v 1.29 2016/03/14 00:59:05 tnn Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -11,7 +11,7 @@ MAINTAINER= taca@NetBSD.org HOMEPAGE= ${RUBY_HOMEPAGE} COMMENT= Ruby extension to GDBM library -RUBY_VERSION_SUPPORTED= 23 22 21 200 18 +RUBY_VERSION_SUPPORTED= 23 22 21 18 USE_RUBY_EXTCONF= yes DISTINFO_FILE= ${RUBY_DISTINFO_FILE} EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/gdbm diff --git a/devel/ruby-curses/Makefile b/devel/ruby-curses/Makefile index e5f744c9a7806..e5bec8175465c 100644 --- a/devel/ruby-curses/Makefile +++ b/devel/ruby-curses/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2015/11/23 15:46:58 taca Exp $ +# $NetBSD: Makefile,v 1.21 2016/03/14 00:59:05 tnn Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -20,7 +20,7 @@ CURSES_EXAMPLES= hello.rb rain.rb view.rb view2.rb REPLACE_RUBY= ${CURSES_EXAMPLES} INSTALLATION_DIRS= ${RUBY_EG}/curses -RUBY_VERSION_SUPPORTED= 200 18 +RUBY_VERSION_SUPPORTED= 18 post-install: .for f in ${CURSES_EXAMPLES} diff --git a/devel/ruby-power_assert/Makefile b/devel/ruby-power_assert/Makefile index f79a0269a85f3..5d509cc6bdaa0 100644 --- a/devel/ruby-power_assert/Makefile +++ b/devel/ruby-power_assert/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2016/02/16 15:20:40 taca Exp $ +# $NetBSD: Makefile,v 1.10 2016/03/14 00:59:06 tnn Exp $ DISTNAME= power_assert-0.2.7 CATEGORIES= devel @@ -8,7 +8,7 @@ HOMEPAGE= https://github.com/k-tsj/power_assert COMMENT= Power Assert for Ruby LICENSE= 2-clause-bsd -#RUBY_VERSION_SUPPORTED?= 200 21 22 +#RUBY_VERSION_SUPPORTED?= 21 22 .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-rake/Makefile b/devel/ruby-rake/Makefile index c799b56c4383e..8586b23c51014 100644 --- a/devel/ruby-rake/Makefile +++ b/devel/ruby-rake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2015/11/23 15:46:58 taca Exp $ +# $NetBSD: Makefile,v 1.15 2016/03/14 00:59:06 tnn Exp $ DISTNAME= rake-${VERS} CATEGORIES= devel @@ -14,7 +14,7 @@ USE_TOOLS+= gzip FIX_PERM= doc/release_notes/rake-0.7.3.rdoc VERS= 10.4.2 -RUBY_VERSION_SUPPORTED= 200 18 21 22 +RUBY_VERSION_SUPPORTED= 18 21 22 FILES_SUBST+= GEM_NAME=${GEM_NAME} RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN} PLIST_SUBST+= RAKE_HACK=${RAKE_HACK} RAKEBIN=${RAKEBIN} diff --git a/devel/ruby-rdoc/Makefile b/devel/ruby-rdoc/Makefile index 46162a28894b2..cf438cf968907 100644 --- a/devel/ruby-rdoc/Makefile +++ b/devel/ruby-rdoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2016/02/06 10:59:55 taca Exp $ +# $NetBSD: Makefile,v 1.14 2016/03/14 00:59:06 tnn Exp $ DISTNAME= rdoc-${RUBY_RDOC_PKGSRC_VERS} CATEGORIES= devel @@ -9,7 +9,7 @@ COMMENT= Produces HTML and command-line documentation for Ruby projects LICENSE= gnu-gpl-v2 OR ruby-license # ruby23 has 4.2.1 in tree. -RUBY_VERSION_SUPPORTED= 22 200 18 21 +RUBY_VERSION_SUPPORTED= 22 18 21 RUBY_JSON_REQD= 1.4 GEM_PATH= ${RUBYGEM_INSTALL_ROOT}${PREFIX}/${GEM_LIBDIR}:${PREFIX}/${GEM_HOME} diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile index b0b051f338e15..345cf5a9a1fac 100644 --- a/devel/ruby-readline/Makefile +++ b/devel/ruby-readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2015/12/30 15:03:13 taca Exp $ +# $NetBSD: Makefile,v 1.42 2016/03/14 00:59:06 tnn Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -12,7 +12,7 @@ MAINTAINER= taca@NetBSD.org HOMEPAGE= ${RUBY_HOMEPAGE} COMMENT= Ruby extension to readline library -RUBY_VERSION_SUPPORTED= 23 22 21 200 18 +RUBY_VERSION_SUPPORTED= 23 22 21 18 USE_RUBY_EXTCONF= yes EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/readline WRKSRC= ${RUBY_WRKSRC}/ext/readline diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 28ca7cf2de33b..36c8c01b62c65 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2015/12/30 15:04:39 taca Exp $ +# $NetBSD: Makefile,v 1.59 2016/03/14 00:59:06 tnn Exp $ DISTNAME= # empty PKGNAME= ruby-${RUBY_VERSION_FULL} @@ -15,7 +15,7 @@ CONFLICTS= pkg_alternatives-[0-9]* NO_CONFIGURE= yes NO_BUILD= yes -RUBY_VERSION_SUPPORTED= 23 22 21 200 18 +RUBY_VERSION_SUPPORTED= 23 22 21 18 .include "../../lang/ruby/rubyversion.mk" diff --git a/misc/ruby-progressbar/Makefile b/misc/ruby-progressbar/Makefile index a48a61214b759..b96d686683fc7 100644 --- a/misc/ruby-progressbar/Makefile +++ b/misc/ruby-progressbar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2016/01/24 08:17:45 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2016/03/14 00:59:06 tnn Exp $ DISTNAME= ruby-progressbar-1.7.5 PKGNAME= ${DISTNAME:S/ruby-/${RUBY_PKGPREFIX}-/} @@ -9,7 +9,7 @@ HOMEPAGE= https://github.com/jfelchner/ruby-progressbar COMMENT= Text Progress Bar Library for Ruby LICENSE= mit -RUBY_VERSION_SUPPORTED= 18 200 21 22 23 +RUBY_VERSION_SUPPORTED= 18 21 22 23 .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index fe54525000b55..2a99e479863ce 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2016/01/03 06:53:49 taca Exp $ +# $NetBSD: Makefile,v 1.24 2016/03/14 00:59:06 tnn Exp $ DISTNAME= puppet-3.8.4 PKGREVISION= 1 @@ -16,7 +16,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-minitest>=2.5.1:../../devel/ruby-minitest DEPENDS+= ${RUBY_PKGPREFIX}-shadow>=2.0.0:../../security/ruby-shadow # io-console gem is bundled in ruby base package. -RUBY_VERSION_SUPPORTED= 200 21 +RUBY_VERSION_SUPPORTED= 21 RUBY_JSON_REQD= 1.7.0 RUBY_JSON_TYPE= pure RUBYGEM_OPTIONS+= --format-executable diff --git a/sysutils/ruby-chef/Makefile b/sysutils/ruby-chef/Makefile index a2fe688f3bf2e..4d16dda4640b9 100644 --- a/sysutils/ruby-chef/Makefile +++ b/sysutils/ruby-chef/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/01/20 10:10:50 fhajny Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/14 00:59:06 tnn Exp $ DISTNAME= chef-12.0.3 CATEGORIES= sysutils @@ -25,7 +25,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-diff-lcs>=1.2.5<2.0:../../textproc/ruby-diff-lcs DEPENDS+= ${RUBY_PKGPREFIX}-plist>=3.1.0:../../textproc/ruby-plist DEPENDS+= ${RUBY_PKGPREFIX}-erubis>=2.7.0<3.0:../../www/ruby-erubis -RUBY_VERSION_SUPPORTED= 200 21 +RUBY_VERSION_SUPPORTED= 21 .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/migemo/Makefile.common b/textproc/migemo/Makefile.common index 8a4531cd1edcd..264543225518b 100644 --- a/textproc/migemo/Makefile.common +++ b/textproc/migemo/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2015/12/30 15:11:40 taca Exp $ +# $NetBSD: Makefile.common,v 1.9 2016/03/14 00:59:06 tnn Exp $ # # used by textproc/migemo/Makefile # used by textproc/migemo-elisp/Makefile @@ -12,4 +12,4 @@ MASTER_SITES= http://0xcc.net/migemo/ MAINTAINER= yamajun@ofug.net HOMEPAGE= http://0xcc.net/migemo/ -RUBY_VERSION_SUPPORTED= 200 21 22 23 +RUBY_VERSION_SUPPORTED= 21 22 23 diff --git a/textproc/ruby-diff-lcs/Makefile b/textproc/ruby-diff-lcs/Makefile index 5da1ffd97f1b5..68aae48dfd93b 100644 --- a/textproc/ruby-diff-lcs/Makefile +++ b/textproc/ruby-diff-lcs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2015/12/30 15:11:40 taca Exp $ +# $NetBSD: Makefile,v 1.17 2016/03/14 00:59:06 tnn Exp $ DISTNAME= diff-lcs-1.2.5 PKGREVISION= 2 @@ -11,7 +11,7 @@ LICENSE= gnu-gpl-v2 OR artistic OR ruby-license RUBYGEM_OPTIONS+= --format-executable -RUBY_VERSION_SUPPORTED= 18 200 21 22 23 +RUBY_VERSION_SUPPORTED= 18 21 22 23 .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ruby-json/Makefile b/textproc/ruby-json/Makefile index c7985e3f7ebf2..4f9aac8189684 100644 --- a/textproc/ruby-json/Makefile +++ b/textproc/ruby-json/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2015/12/30 15:11:40 taca Exp $ +# $NetBSD: Makefile,v 1.33 2016/03/14 00:59:06 tnn Exp $ DISTNAME= json-1.8.3 CATEGORIES= textproc @@ -10,7 +10,7 @@ LICENSE= ruby-license USE_GCC_RUNTIME= yes -RUBY_VERSION_SUPPORTED= 200 18 21 22 23 +RUBY_VERSION_SUPPORTED= 18 21 22 23 post-extract: cd ${WRKSRC}; ${FIND} . -xdev -type f -print | ${XARGS} ${CHMOD} g-w diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile index 5a474cf258028..ae836026fd95f 100644 --- a/textproc/ruby-rdtool/Makefile +++ b/textproc/ruby-rdtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2015/12/30 15:11:40 taca Exp $ +# $NetBSD: Makefile,v 1.42 2016/03/14 00:59:06 tnn Exp $ DISTNAME= rdtool-0.6.38 PKGREVISION= 2 @@ -18,7 +18,7 @@ SUBST_SED.path= -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|" SUBST_MESSAGE.path= Fixing PKG_SYSCONFDIR paths. RUBYGEM_OPTIONS+= --format-executable -RUBY_VERSION_SUPPORTED= 18 200 21 22 23 +RUBY_VERSION_SUPPORTED= 18 21 22 23 .include "../../lang/ruby/gem.mk" .include "../../lang/ruby/modules.mk" diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile index 85afb62142d25..f0b258741e21c 100644 --- a/textproc/ruby-sary/Makefile +++ b/textproc/ruby-sary/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2015/12/30 15:11:40 taca Exp $ +# $NetBSD: Makefile,v 1.18 2016/03/14 00:59:06 tnn Exp $ # DISTNAME= sary-ruby-1.2.0 @@ -12,7 +12,7 @@ HOMEPAGE= http://sary.sourceforge.net/ COMMENT= Ruby Binding of Sary LICENSE= gnu-lgpl-v2.1 -RUBY_VERSION_SUPPORTED= 200 18 21 22 23 +RUBY_VERSION_SUPPORTED= 18 21 22 23 USE_RUBY_EXTCONF= yes USE_TOOLS+= pkg-config diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile index 769cdca45ebb1..afb4e1f3afbd2 100644 --- a/x11/ruby-tk/Makefile +++ b/x11/ruby-tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2015/12/30 15:03:49 taca Exp $ +# $NetBSD: Makefile,v 1.49 2016/03/14 00:59:07 tnn Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL} @@ -11,7 +11,7 @@ MAINTAINER= taca@NetBSD.org HOMEPAGE= ${RUBY_HOMEPAGE} COMMENT= Ruby interface to the Tk widget set -RUBY_VERSION_SUPPORTED= 23 22 21 200 18 +RUBY_VERSION_SUPPORTED= 23 22 21 18 USE_TOOLS+= pax USE_RUBY_EXTCONF= yes RUBY_EXTCONF_SUBDIRS= . tkutil From 9809a0577118a748c2a87ffb9c5df6bb9689cb11 Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 01:47:44 +0000 Subject: [PATCH 0055/2457] needs randrproto>=1.5.0 --- x11/xrandr/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index e60131973e9ce..e91401afd8212 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2016/03/13 10:14:46 tnn Exp $ +# $NetBSD: Makefile,v 1.22 2016/03/14 01:47:44 tnn Exp $ DISTNAME= xrandr-1.5.0 CATEGORIES= x11 @@ -21,7 +21,9 @@ SUBST_FILES.nickle= xkeystone SUBST_STAGE.nickle= post-build SUBST_MESSAGE.nickle= Fixing path to nickle. -BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.5 +BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.5.0 +BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0 +.include "../../x11/randrproto/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" From 289a13e23f059a51de82ce9d491596a71c5b7bd5 Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 02:13:33 +0000 Subject: [PATCH 0056/2457] Only support the dri option if X11_TYPE is modular. Not very useful in and of itself, but cuts down on noise from libdrm and MesaLib in X11_TYPE=native bulk builds. Also, only enable the Present extension if building with DRI. --- x11/modular-xorg-server/Makefile.common | 5 ++--- x11/modular-xorg-server/PLIST | 6 +++--- x11/modular-xorg-server/buildlink3.mk | 4 +++- x11/modular-xorg-server/options.mk | 15 ++++++++++++--- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common index d5ae71755780a..57f96d3765565 100644 --- a/x11/modular-xorg-server/Makefile.common +++ b/x11/modular-xorg-server/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2016/03/12 08:50:50 wiz Exp $ +# $NetBSD: Makefile.common,v 1.9 2016/03/14 02:13:33 tnn Exp $ # used by x11/modular-xorg-server/Makefile # used by x11/modular-xorg-xephyr/Makefile @@ -108,7 +108,7 @@ BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1 BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0 BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2 BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0 -BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22 +BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.28 BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99 BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1 BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1 @@ -161,7 +161,6 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1.1 .include "../../x11/libxkbfile/buildlink3.mk" .include "../../x11/libxkbui/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" -.include "../../x11/presentproto/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/recordproto/buildlink3.mk" .include "../../x11/renderproto/buildlink3.mk" diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST index 1c2fa0326b732..404e2103ba600 100644 --- a/x11/modular-xorg-server/PLIST +++ b/x11/modular-xorg-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2016/03/12 08:50:50 wiz Exp $ +@comment $NetBSD: PLIST,v 1.26 2016/03/14 02:13:33 tnn Exp $ bin/X bin/Xnest bin/Xorg @@ -89,8 +89,8 @@ include/xorg/picture.h include/xorg/picturestr.h include/xorg/pixmap.h include/xorg/pixmapstr.h -include/xorg/present.h -include/xorg/presentext.h +${PLIST.dri}include/xorg/present.h +${PLIST.dri}include/xorg/presentext.h include/xorg/privates.h include/xorg/property.h include/xorg/propertyst.h diff --git a/x11/modular-xorg-server/buildlink3.mk b/x11/modular-xorg-server/buildlink3.mk index 32c7d53790adb..6e7e52e6cefc7 100644 --- a/x11/modular-xorg-server/buildlink3.mk +++ b/x11/modular-xorg-server/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2016/01/05 13:04:23 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2016/03/14 02:13:33 tnn Exp $ BUILDLINK_TREE+= modular-xorg-server @@ -35,11 +35,13 @@ BUILDLINK_DEPMETHOD.libpciaccess= full .endif .include "../../x11/inputproto/buildlink3.mk" .include "../../x11/libXfont/buildlink3.mk" +BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0 .include "../../x11/randrproto/buildlink3.mk" .include "../../x11/renderproto/buildlink3.mk" .include "../../x11/videoproto/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xf86driproto/buildlink3.mk" +BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.28 .include "../../x11/xproto/buildlink3.mk" .include "../../x11/xineramaproto/buildlink3.mk" .endif # MODULAR_XORG_SERVER_BUILDLINK3_MK diff --git a/x11/modular-xorg-server/options.mk b/x11/modular-xorg-server/options.mk index 6fae1441b2dab..2b26acbf6722d 100644 --- a/x11/modular-xorg-server/options.mk +++ b/x11/modular-xorg-server/options.mk @@ -1,8 +1,12 @@ -# $NetBSD: options.mk,v 1.14 2016/02/09 01:17:37 wiz Exp $ +# $NetBSD: options.mk,v 1.15 2016/03/14 02:13:33 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server -PKG_SUPPORTED_OPTIONS= dri inet6 debug dtrace -PKG_SUGGESTED_OPTIONS= dri inet6 +PKG_SUPPORTED_OPTIONS= inet6 debug dtrace +PKG_SUGGESTED_OPTIONS= inet6 +.if ${X11_TYPE} == "modular" +PKG_SUPPORTED_OPTIONS+= dri +PKG_SUGGESTED_OPTIONS+= dri +.endif .include "../../mk/bsd.options.mk" @@ -17,6 +21,7 @@ BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11 .include "../../x11/dri3proto/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" .include "../../x11/libxshmfence/buildlink3.mk" +.include "../../x11/presentproto/buildlink3.mk" .include "../../x11/xf86driproto/buildlink3.mk" PLIST.dri= yes CONFIGURE_ARGS+= --enable-dri @@ -25,12 +30,16 @@ CONFIGURE_ARGS+= --enable-dri3 CONFIGURE_ARGS+= --enable-glx CONFIGURE_ARGS+= --enable-aiglx CONFIGURE_ARGS+= --enable-glamor +CONFIGURE_ARGS+= --enable-present .else ### ### XXX Perhaps we should allow for a built-in glx without dri enabled? ### CONFIGURE_ARGS+= --disable-dri +CONFIGURE_ARGS+= --disable-dri2 +CONFIGURE_ARGS+= --disable-dri3 CONFIGURE_ARGS+= --disable-glx +CONFIGURE_ARGS+= --disable-present pre-build: disable-modesetting .PHONY: disable-modesetting disable-modesetting: From 9d2656d3518ed577a48d12c5dc23cb31746a808e Mon Sep 17 00:00:00 2001 From: dbj Date: Mon, 14 Mar 2016 05:49:51 +0000 Subject: [PATCH 0057/2457] add libiconv buildlink3 dependency, bump PKGREVISION --- lang/gcc48/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index c52780a92f107..0ef2ab3f6f398 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.23 2016/02/25 14:42:56 jperkin Exp $ +# $NetBSD: Makefile,v 1.24 2016/03/14 05:49:51 dbj Exp $ GCC_PKGNAME= gcc48 .include "version.mk" +PKGREVISION= 1 DISTNAME= gcc-${GCC48_DIST_VERSION} PKGNAME= ${GCC_PKGNAME}-${GCC48_DIST_VERSION} @@ -160,6 +161,7 @@ GENERATE_PLIST+= \ cd ${DESTDIR}${PREFIX} && \ ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT} ; +.include "../../converters/libiconv/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" From 17b49532befca408e9fb3b6d0dcb2dcf17cb7bf1 Mon Sep 17 00:00:00 2001 From: dbj Date: Mon, 14 Mar 2016 06:08:10 +0000 Subject: [PATCH 0058/2457] set CHECK_BUILTIN.zlib:=yes so that zlib's builtin.mk won't create a fake zlib.pc otherwise, freetype2 will add a Requires: for the fake .pc file to its own .pc file --- graphics/freetype2/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 6f3242078a09f..8dff5376b58ba 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.102 2016/02/25 13:37:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.103 2016/03/14 06:08:10 dbj Exp $ DISTNAME= freetype-2.6.2 PKGNAME= ${DISTNAME:S/-/2-/} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freetype/} \ http://download.savannah.gnu.org/releases/freetype/ @@ -52,5 +53,8 @@ post-configure: .endif .include "../../archivers/bzip2/buildlink3.mk" +# Avoid creating a fake zlib.pc, because if it does +# we will add a Requires for it to our .pc file +CHECK_BUILTIN.zlib:=yes .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" From 0f2f65a7815025ac995ee6132ec7d5b4cdaa5b72 Mon Sep 17 00:00:00 2001 From: dbj Date: Mon, 14 Mar 2016 06:12:17 +0000 Subject: [PATCH 0059/2457] don't use xcrun checking for xcrun on osx command line tools don't install xcrun in the toolkit so do a simple check for cc instead --- x11/qt5-qtbase/distinfo | 4 ++-- x11/qt5-qtbase/patches/patch-configure | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index cfd9256afd7b7..4ad544c78d4f5 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.29 2016/03/02 23:04:00 ryoon Exp $ +$NetBSD: distinfo,v 1.30 2016/03/14 06:12:17 dbj Exp $ SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764 -SHA1 (patch-configure) = ad30163463ccc9310e34633f13ca27bfccca59f4 +SHA1 (patch-configure) = 482815b5f3ec25fabe0995cfc70acf164928d192 SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4 SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177 SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39 diff --git a/x11/qt5-qtbase/patches/patch-configure b/x11/qt5-qtbase/patches/patch-configure index ab7746e61e5db..03ce9d63cd31b 100644 --- a/x11/qt5-qtbase/patches/patch-configure +++ b/x11/qt5-qtbase/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.3 2016/03/02 23:04:00 ryoon Exp $ +$NetBSD: patch-configure,v 1.4 2016/03/14 06:12:17 dbj Exp $ * Don't use SDKs on OS X * Add NetBSD/sparc{,64} support @@ -21,6 +21,15 @@ $NetBSD: patch-configure,v 1.3 2016/03/02 23:04:00 ryoon Exp $ fi getSingleQMakeVariable "$1" "$xspecvals" } +@@ -527,7 +525,7 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then + exit 2 + fi + +- if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then ++ if ! /usr/bin/xcrun -find cc >/dev/null 2>&1; then + echo >&2 + echo " Xcode not set up properly. You may need to confirm the license" >&2 + echo " agreement by running /usr/bin/xcodebuild without arguments." >&2 @@ -2897,6 +2895,19 @@ if [ -z "$PLATFORM" ]; then UNIX_SV:*) PLATFORM=unixware-g++ From d66d328166f8709d92ddf0800eeb85cc9208534b Mon Sep 17 00:00:00 2001 From: dbj Date: Mon, 14 Mar 2016 09:11:44 +0000 Subject: [PATCH 0060/2457] note octave update to 4.0.0 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index adb63dde53f6c..998fd08f00921 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1157 2016/03/13 23:28:13 gdt Exp $ +$NetBSD: CHANGES-2016,v 1.1158 2016/03/14 09:11:44 dbj Exp $ Changes to the packages collection and infrastructure in 2016: @@ -918,6 +918,7 @@ Changes to the packages collection and infrastructure in 2016: Added www/ap-authnz-crowd version 2.2.2 [jperkin 2016-02-15] Updated x11/libdrm to 2.4.67 [wiz 2016-02-15] Updated net/php-baikal to 0.3.1 [wiz 2016-02-15] + Updated math/octave to 4.0.0 [dbj 2016-02-16] Updated www/squid3 to 3.5.14 [taca 2016-02-16] Updated audio/moc to 2.5.0 [leot 2016-02-16] Removed audio/moc-devel successor audio/moc [leot 2016-02-16] diff --git a/doc/TODO b/doc/TODO index dd56c4a845dd9..c0c659d29f402 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15590 2016/03/13 18:33:11 schnoebe Exp $ +$NetBSD: TODO,v 1.15591 2016/03/14 09:11:44 dbj Exp $ Suggested new packages ====================== @@ -1236,7 +1236,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o ocamlgraph-1.8.6 o ocamlnet-4.1.1 o ocrad-0.25 - o octave-4.0.0 o odbc-postgresql-09.03.0400 o olvwm-4.5 o oniguruma-5.9.6 From 6579faaefe49cc392b3a59e80ca8975eb7b6040c Mon Sep 17 00:00:00 2001 From: fhajny Date: Mon, 14 Mar 2016 09:23:31 +0000 Subject: [PATCH 0061/2457] Update net/haproxy to 1.6.4. Throw in example config files. 2016/03/14 : 1.6.4 - BUG/MINOR: http: fix several off-by-one errors in the url_param parser - BUG/MINOR: http: Be sure to process all the data received from a server - BUG/MINOR: chunk: make chunk_dup() always check and set dst->size - MINOR: chunks: ensure that chunk_strcpy() adds a trailing zero - MINOR: chunks: add chunk_strcat() and chunk_newstr() - MINOR: chunk: make chunk_initstr() take a const string - MINOR: lru: new function to delete least recently used keys - DOC: add Ben Shillito as the maintainer of 51d - BUG/MINOR: 51d: Ensures a unique domain for each configuration - BUG/MINOR: 51d: Aligns Pattern cache implementation with HAProxy best practices. - BUG/MINOR: 51d: Releases workset back to pool. - BUG/MINOR: 51d: Aligned const pointers to changes in 51Degrees. - CLEANUP: 51d: Aligned if statements with HAProxy best practices and removed casts from malloc. - DOC: fix a few spelling mistakes - DOC: fix "workaround" spelling - BUG/MINOR: examples: Fixing haproxy.spec to remove references to .cfg files - MINOR: fix the return type for dns_response_get_query_id() function - MINOR: server state: missing LF (\n) on error message printed when parsing server state file - BUG/MEDIUM: dns: no DNS resolution happens if no ports provided to the nameserver - BUG/MAJOR: servers state: server port is erased when dns resolution is enabled on a server - BUG/MEDIUM: servers state: server port is used uninitialized - BUG/MEDIUM: config: Adding validation to stick-table expire value. - BUG/MEDIUM: sample: http_date() doesn't provide the right day of the week - BUG/MEDIUM: channel: fix miscalculation of available buffer space. - MEDIUM: pools: add a new flag to avoid rounding pool size up - BUG/MEDIUM: buffers: do not round up buffer size during allocation - BUG/MINOR: stream: don't force retries if the server is DOWN - BUG/MINOR: counters: make the sc-inc-gpc0 and sc-set-gpt0 touch the table - MINOR: unix: don't mention free ports on EAGAIN - BUG/CLEANUP: CLI: report the proper field states in "show sess" - MINOR: stats: send content-length with the redirect to allow keep-alive - BUG: stream_interface: Reuse connection even if the output channel is empty - DOC: remove old tunnel mode assumptions - BUG/MAJOR: http-reuse: fix risk of orphaned connections - BUG/MEDIUM: http-reuse: do not share private connections across backends - BUG/MINOR: ssl: Be sure to use unique serial for regenerated certificates - BUG/MINOR: stats: fix missing comma in stats on agent drain - BUG/MINOR: lua: unsafe initialization - DOC: lua: fix somme errors - DOC: add server name at rate-limit sessions example - BUG/MEDIUM: ssl: fix off-by-one in ALPN list allocation - BUG/MEDIUM: ssl: fix off-by-one in NPN list allocation - DOC: LUA: fix some typos and syntax errors - MINOR: cfgparse: warn for incorrect 'timeout retry' keyword spelling in resolvers - MINOR: mailers: increase default timeout to 10 seconds - MINOR: mailers: use for all line endings - BUG/MAJOR: lua: applets can't sleep. - BUG/MINOR: server: some prototypes are renamed - BUG/MINOR: lua: Useless copy - BUG/MEDIUM: stats: stats bind-process doesn't propagate the process mask correctly - BUG/MINOR: server: fix the format of the warning on address change - BUG/MEDIUM: chunks: always reject negative-length chunks - BUG/MINOR: systemd: ensure we don't miss signals - BUG/MINOR: systemd: report the correct signal in debug message output - BUG/MINOR: systemd: propagate the correct signal to haproxy - MINOR: systemd: ensure a reload doesn't mask a stop - BUG/MEDIUM: cfgparse: wrong argument offset after parsing server "sni" keyword - CLEANUP: stats: Avoid computation with uninitialized bits. - CLEANUP: pattern: Ignore unknown samples in pat_match_ip(). - CLEANUP: map: Avoid memory leak in out-of-memory condition. - BUG/MINOR: tcpcheck: fix incorrect list usage resulting in failure to load certain configs - BUG/MAJOR: samples: check smp->strm before using it - MINOR: sample: add a new helper to initialize the owner of a sample - MINOR: sample: always set a new sample's owner before evaluating it - BUG/MAJOR: vars: always retrieve the stream and session from the sample - CLEANUP: payload: remove useless and confusing nullity checks for channel buffer - BUG/MINOR: ssl: fix usage of the various sample fetch functions - MINOR: cfgparse: warn when uid parameter is not a number - MINOR: cfgparse: warn when gid parameter is not a number - BUG/MINOR: standard: Avoid free of non-allocated pointer - BUG/MINOR: pattern: Avoid memory leak on out-of-memory condition - CLEANUP: http: fix a build warning introduced by a recent fix - BUG/MINOR: log: GMT offset not updated when entering/leaving DST --- net/haproxy/Makefile | 6 +++--- net/haproxy/PLIST | 8 +++++++- net/haproxy/distinfo | 14 +++++--------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 94b22d372e569..af84603455cc3 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2016/03/05 11:29:05 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2016/03/14 09:23:31 fhajny Exp $ -DISTNAME= haproxy-1.6.3 -PKGREVISION= 2 +DISTNAME= haproxy-1.6.4 CATEGORIES= net www MASTER_SITES= http://www.haproxy.org/download/1.6/src/ @@ -55,6 +54,7 @@ LIBS.SunOS+= -lxnet post-install: ${INSTALL_DATA} ${WRKSRC}/doc/architecture.txt ${DESTDIR}${DOCDIR}/ ${INSTALL_DATA} ${WRKSRC}/doc/configuration.txt ${DESTDIR}${DOCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/examples/*.cfg ${DESTDIR}${EGDIR}/ .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/haproxy/PLIST b/net/haproxy/PLIST index 003c96bf1dd40..7a1ddd079ad48 100644 --- a/net/haproxy/PLIST +++ b/net/haproxy/PLIST @@ -1,5 +1,11 @@ -@comment $NetBSD: PLIST,v 1.6 2015/11/12 16:32:29 morr Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/03/14 09:23:31 fhajny Exp $ man/man1/haproxy.1 sbin/haproxy share/doc/haproxy/architecture.txt share/doc/haproxy/configuration.txt +share/examples/haproxy/acl-content-sw.cfg +share/examples/haproxy/auth.cfg +share/examples/haproxy/content-sw-sample.cfg +share/examples/haproxy/option-http_proxy.cfg +share/examples/haproxy/ssl.cfg +share/examples/haproxy/transparent_proxy.cfg diff --git a/net/haproxy/distinfo b/net/haproxy/distinfo index 74b106c94a31f..53cc0e5ee7038 100644 --- a/net/haproxy/distinfo +++ b/net/haproxy/distinfo @@ -1,12 +1,8 @@ -$NetBSD: distinfo,v 1.20 2016/02/01 10:07:56 jperkin Exp $ +$NetBSD: distinfo,v 1.21 2016/03/14 09:23:31 fhajny Exp $ -SHA1 (deviceatlas-enterprise-c-2.1.zip) = fbd4a4198307616d51518e50d09666aeac2eea29 -RMD160 (deviceatlas-enterprise-c-2.1.zip) = fc4b78bc18c80cc19e36fa5b8776cbf8b959abd7 -SHA512 (deviceatlas-enterprise-c-2.1.zip) = 99a8e89f3d1c084a93b184685108ea65d1fd925e0c8b52599a42dbe70af3126103da0a9fd284b14ddf59b996204334d360a12651025413bc4d7f76054779275b -Size (deviceatlas-enterprise-c-2.1.zip) = 504286 bytes -SHA1 (haproxy-1.6.3.tar.gz) = f7da36b53188fa15551978dfbda80a9e1816fa01 -RMD160 (haproxy-1.6.3.tar.gz) = 936f280639b24aa29c71f60660c093a3d0da6b2a -SHA512 (haproxy-1.6.3.tar.gz) = 79ed526cd857dcd68d9b8289df4d4a2d87594e8d0d119f4d7c618597db7563a0cedc8417ddcfefb464a322d1fb50cb044656a2fbe78867f58052e0ddaa894bb9 -Size (haproxy-1.6.3.tar.gz) = 1555861 bytes +SHA1 (haproxy-1.6.4.tar.gz) = df3d7f216fe4974d9eac55d76c7f729560c6e975 +RMD160 (haproxy-1.6.4.tar.gz) = 955c11358efe1cc2a47d705d5c8f0ca3d3056f3e +SHA512 (haproxy-1.6.4.tar.gz) = 9f0fc316100e312a0c35c0706895b0e57634ad6ef353c33e958bbebce445855a057a0d7dabd67f3c15126843f40ab13d436ab9544b9793de4623b59d1bc91c52 +Size (haproxy-1.6.4.tar.gz) = 1559276 bytes SHA1 (patch-Makefile) = 5618e5a15c710267b06756d529486acfdb831e5f SHA1 (patch-include_common_standard.h) = cc4b46e4923447a2d5d95cff2f241981ed77ad1d From 67cbf8033a117c65488daac7a5efd92560a8bb2a Mon Sep 17 00:00:00 2001 From: fhajny Date: Mon, 14 Mar 2016 09:23:43 +0000 Subject: [PATCH 0062/2457] Updated net/haproxy to 1.6.4 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 998fd08f00921..e0fb98ba55e3c 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1158 2016/03/14 09:11:44 dbj Exp $ +$NetBSD: CHANGES-2016,v 1.1159 2016/03/14 09:23:43 fhajny Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1547,3 +1547,4 @@ Changes to the packages collection and infrastructure in 2016: Updated databases/mongodb to 3.2.4 [fhajny 2016-03-13] Updated databases/mongo-tools to 3.2.4 [fhajny 2016-03-13] Removed databases/postgresql-postgis successor databases/postgresql-postgis2 [gdt 2016-03-14] + Updated net/haproxy to 1.6.4 [fhajny 2016-03-14] From 4e95563043367b45adc22d6959d0a2b361d0e578 Mon Sep 17 00:00:00 2001 From: manu Date: Mon, 14 Mar 2016 09:43:42 +0000 Subject: [PATCH 0063/2457] Update lasso to 2.5.1 Changes since 2.4.1 from NEWS file: 2.5.1 - February 19th 2016 --------------------------- 17 commits, 16 files changed, 1096 insertions, 42 deletions - Add missing urn constants used in PAOS HTTP header - Set NotBefore in SAML 2.0 login assertions - tests: fix leak in test test16_test_get_issuer - id-ff: fix leak of profile->private_data->message_id - saml-2.0: fix leak of message_id in lasso_profile_saml20_build_paos_request_msg - tests: fix leaks in test_ecp - xml: fix wrong termination of comment - xml: fix leak in lasso_soap_envelope_new_full - profile: fix leak of private idp_list field - saml-2.0: fix leaks of url - tests: fix leak - tests: update valgrind suppressions - perl: remove quotes from $PERL -V::ccflags: output (#9572) - Fix wrong snippet type (fixes #9616). Thanks to Brett Gardner for the patch. - tools.c: use correct NID and digest length when building RSA signature using SHA-2 digest (fixes #10019) Thanks to Brett Gardner for the patch. - bindings/php5: fix enum getters and setters (fixes #10032). Thanks to Brett Gardner for the bug report. - fix warning about INCLUDES directive 2.5.0 - September 2nd 2015 -------------------------- 151 commits, 180 files changed, 8391 insertions, 1339 deletions - lots of bugfixes (reported by static analysis tools like clang, coverity and manual inspection) thanks to Simo Sorce and John Dennis from RedHat - xsd:choices are now parsed correctly by implementing a real finite automata for parsing XML documents. New flag for jumping forward and backward in schema snippets have been added. It fixes parsing of message from third party not following the ordre from the schema (they are entitled to do it but most SAML implementations do not) - added C CGI examples for SP and IdP side - removed the _POSIX_SOURCE declaration - added support for the SHA-2 family of hash functions - fixed protocol profile selection when parsing AuthnRequest - added support for Python 3, thanks to Houzefa Abbasbhay from XCG Consulting - fixed default value of WantAuthnRequestSigned in metadata parsing - SAML 2.0 ECP is now functionnal, thanks to John Dennis from RedHat - added two new API function to LassoProfile to extract the Issuer and InResponseTo attribute of messages, allowing pre-treatment before parsing the message, to load the metadata of the remote provider, or find the request which the response matches. - fixed segfault when parsing HTTP-Redirect marlformed base64 content - added support for automake 1.15 (jdennis) --- security/lasso/Makefile | 4 ++-- security/lasso/Makefile.common | 5 +++-- security/lasso/PLIST | 7 ++++++- security/lasso/distinfo | 9 ++++----- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/security/lasso/Makefile b/security/lasso/Makefile index 6a5d01e0728bd..5953b8283513b 100644 --- a/security/lasso/Makefile +++ b/security/lasso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2016/03/05 11:27:54 jperkin Exp $ +# $NetBSD: Makefile,v 1.28 2016/03/14 09:43:42 manu Exp $ CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-php5 @@ -9,5 +9,5 @@ PYTHON_FOR_BUILD_ONLY= yes EXTRACT_USING= bsdtar -PKGREVISION= 2 +#PKGREVISION= 1 .include "../../security/lasso/Makefile.common" diff --git a/security/lasso/Makefile.common b/security/lasso/Makefile.common index 20a4a02f14b48..0fca660bcd633 100644 --- a/security/lasso/Makefile.common +++ b/security/lasso/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.11 2015/04/03 09:49:00 manu Exp $ +# $NetBSD: Makefile.common,v 1.12 2016/03/14 09:43:42 manu Exp $ # # used by security/lasso/Makefile # used by security/py-lasso/Makefile -DISTNAME= lasso-2.4.1 +DISTNAME= lasso-2.5.1 CATEGORIES= security MASTER_SITES= https://dev.entrouvert.org/lasso/ @@ -23,6 +23,7 @@ USE_TOOLS+= pkg-config perl PKGCONFIG_OVERRIDE+= lasso.pc.in +DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six BUILDLINK_ABI_DEPENDS.glib2+= glib2>=2.35 .include "../../lang/python/application.mk" diff --git a/security/lasso/PLIST b/security/lasso/PLIST index 731b628dc9598..4326b76f0d881 100644 --- a/security/lasso/PLIST +++ b/security/lasso/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2015/04/01 14:05:02 manu Exp $ +@comment $NetBSD: PLIST,v 1.10 2016/03/14 09:43:42 manu Exp $ include/lasso/backward_comp.h include/lasso/ctypes.h include/lasso/debug.h @@ -36,6 +36,9 @@ include/lasso/xml/dsig/ds_rsa_key_value.h include/lasso/xml/dsig/ds_x509_data.h include/lasso/xml/dsig/strings.h include/lasso/xml/dsig/xml_dsig.h +include/lasso/xml/ecp/ecp_relaystate.h +include/lasso/xml/ecp/ecp_request.h +include/lasso/xml/ecp/ecp_response.h include/lasso/xml/lib_assertion.h include/lasso/xml/lib_authentication_statement.h include/lasso/xml/lib_authn_context.h @@ -58,6 +61,8 @@ include/lasso/xml/lib_scoping.h include/lasso/xml/lib_status_response.h include/lasso/xml/lib_subject.h include/lasso/xml/misc_text_node.h +include/lasso/xml/paos_request.h +include/lasso/xml/paos_response.h include/lasso/xml/saml-2.0/saml2_action.h include/lasso/xml/saml-2.0/saml2_advice.h include/lasso/xml/saml-2.0/saml2_assertion.h diff --git a/security/lasso/distinfo b/security/lasso/distinfo index 69da8ac784597..c87a482790620 100644 --- a/security/lasso/distinfo +++ b/security/lasso/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.18 2015/11/04 01:17:47 agc Exp $ +$NetBSD: distinfo,v 1.19 2016/03/14 09:43:42 manu Exp $ -SHA1 (lasso-2.4.1.tar.gz) = 4596b8037932d4281828d27c3d4065522b4775dc -RMD160 (lasso-2.4.1.tar.gz) = 7fc4855135fe662b00e353ad21b0646ce24692e3 -SHA512 (lasso-2.4.1.tar.gz) = 6816eb7f4f70728ed419c572db6c0e6668964e3c5e84bb55f7dce59a8a2ba259fdf1bd8922b9dfe3e494174f3176c0bef93238e87386df07c69d583221de1926 -Size (lasso-2.4.1.tar.gz) = 4392038 bytes +SHA1 (lasso-2.5.1.tar.gz) = fe0e68010bab6e11383003b5cf869c0447ed7a6e +RMD160 (lasso-2.5.1.tar.gz) = 8cc0506fe8cbac770e952fdb0f067c7e58f5bb43 +Size (lasso-2.5.1.tar.gz) = 4552152 bytes SHA1 (patch-configure) = 8acdd57ba89fea824ea0bc6b0080298b78226678 SHA1 (patch-configure.ac) = 8cb6a7ad3aec9a7c17892ae4e0493ad3d6a8cde1 From 3ec9db225897061a19dade36e1d3912471051979 Mon Sep 17 00:00:00 2001 From: manu Date: Mon, 14 Mar 2016 09:45:08 +0000 Subject: [PATCH 0064/2457] Updated security/lasso to 2.5.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index e0fb98ba55e3c..d88867d03d00c 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1159 2016/03/14 09:23:43 fhajny Exp $ +$NetBSD: CHANGES-2016,v 1.1160 2016/03/14 09:45:08 manu Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1548,3 +1548,4 @@ Changes to the packages collection and infrastructure in 2016: Updated databases/mongo-tools to 3.2.4 [fhajny 2016-03-13] Removed databases/postgresql-postgis successor databases/postgresql-postgis2 [gdt 2016-03-14] Updated net/haproxy to 1.6.4 [fhajny 2016-03-14] + Updated security/lasso to 2.5.1 [manu 2016-03-14] From 1bc2e39185e9829fa94b640da329d61d10492bb0 Mon Sep 17 00:00:00 2001 From: manu Date: Mon, 14 Mar 2016 09:58:57 +0000 Subject: [PATCH 0065/2457] Update mod_auth_mellon to 0.12.0 Fixes CVE-2016-2145 and CVE-2016-2146 Changes since 0.10.0 frome NEWS file and patches/patch-0274 patch-0274 --------------------------------------------------------------------------- * Return 500 Internal Server Error if probe discovery fails. Version 0.12.0 --------------------------------------------------------------------------- Security fixes: * [CVE-2016-2145] Fix DOS attack (Apache worker process crash) due to incorrect error handling when reading POST data from client. * [CVE-2016-2146] Fix DOS attack (Apache worker process crash / resource exhaustion) due to missing size checks when reading POST data. In addition this release contains the following new features and fixes: * Add MellonRedirecDomains option to limit the sites that mod_auth_mellon can redirect to. This option is enabled by default. * Add support for ECP service options in PAOS requests. * Fix AssertionConsumerService lookup for PAOS requests. Version 0.11.1 --------------------------------------------------------------------------- Security fixes: * [CVE-2016-2145] Fix DOS attack (Apache worker process crash) due to incorrect error handling when reading POST data from client. * [CVE-2016-2146] Fix DOS attack (Apache worker process crash / resource exhaustion) due to missing size checks when reading POST data Version 0.11.0 --------------------------------------------------------------------------- * Add SAML 2.0 ECP support. * The MellonDecode option has been disabled. It was used to decode attributes in a Feide-specific encoding that is no longer used. * Set max-age=0 in Cache-Control header, to ensure that all browsers verifies the data on each request. * MellonMergeEnvVars On now accepts second optional parameter, the separator to be used instead of the default ';'. * Add option MellonEnvVarsSetCount to specify if the number of values for any attribute should also be stored in environment variable suffixed _N. * Add option MellonEnvVarsIndexStart to specify if environment variables for multi-valued attributes should start indexing with 0 (default) or with 1. * Bugfixes: * Fix error about missing authentication with DirectoryIndex in Apache 2.4. --- www/ap2-auth-mellon/Makefile | 8 ++-- www/ap2-auth-mellon/distinfo | 10 ++--- www/ap2-auth-mellon/patches/patch-0274 | 53 ++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 www/ap2-auth-mellon/patches/patch-0274 diff --git a/www/ap2-auth-mellon/Makefile b/www/ap2-auth-mellon/Makefile index 28f62f1c1b22e..d1c84e02de142 100644 --- a/www/ap2-auth-mellon/Makefile +++ b/www/ap2-auth-mellon/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.32 2016/03/05 11:29:34 jperkin Exp $ +# $NetBSD: Makefile,v 1.33 2016/03/14 09:58:57 manu Exp $ # -DISTNAME= mod_auth_mellon-0.10.0 +DISTNAME= mod_auth_mellon-0.12.0 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//:S/_/-/g} PKGREVISION= 1 -#PKGREVISION= 1 CATEGORIES= www security MASTER_SITES= https://github.com/UNINETT/mod_auth_mellon/releases/download/v${DISTNAME:C/.*-//}/ @@ -16,7 +15,6 @@ LICENSE= gnu-gpl-v2 # or later GNU_CONFIGURE= YES USE_LIBTOOL= YES USE_TOOLS+= pkg-config -CFLAGS+= -DLASSO_SERVER_LOAD_METADATA_FLAG_DEFAULT=0 APACHE_MODULE= YES PKG_APACHE_ACCEPTED= apache22 apache24 @@ -36,6 +34,8 @@ do-install: ${APXS} -i -S LIBEXECDIR=${DESTDIR}"$${libexecdir}" \ -n auth_mellon mod_auth_mellon.la +BUILDLINK_ABI_DEPENDS.lasso+= lasso>=2.1.0 + .include "../../security/lasso/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/www/ap2-auth-mellon/distinfo b/www/ap2-auth-mellon/distinfo index 642dbbf972516..df84839f148ac 100644 --- a/www/ap2-auth-mellon/distinfo +++ b/www/ap2-auth-mellon/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.14 2015/11/04 02:46:47 agc Exp $ +$NetBSD: distinfo,v 1.15 2016/03/14 09:58:57 manu Exp $ -SHA1 (mod_auth_mellon-0.10.0.tar.gz) = 853bd8506c3e70c9f0b7f7c6625a0c896dcf92bc -RMD160 (mod_auth_mellon-0.10.0.tar.gz) = 7f8e40a9a7a5a7c5df772523dbb2c65e34658364 -SHA512 (mod_auth_mellon-0.10.0.tar.gz) = 7a3958f1e151a3f1521b8cddf605c201bdd2fd23d44a12052192c13faa9bec46dc4b9c731ed94e6f85fd1e2b0c5b3798136867db2404df478a83485fe7bd24ed -Size (mod_auth_mellon-0.10.0.tar.gz) = 115727 bytes +SHA1 (mod_auth_mellon-0.12.0.tar.gz) = 3d5cd4137154a7c848d8f3121e6497b88dc5f23e +RMD160 (mod_auth_mellon-0.12.0.tar.gz) = 7ef278de6f4d0f0669d99c113706dc63d64f6fbc +Size (mod_auth_mellon-0.12.0.tar.gz) = 136754 bytes +SHA1 (patch-0274) = e523b560f8220352090db686a32a5f81f6579fda diff --git a/www/ap2-auth-mellon/patches/patch-0274 b/www/ap2-auth-mellon/patches/patch-0274 new file mode 100644 index 0000000000000..69832367fcba0 --- /dev/null +++ b/www/ap2-auth-mellon/patches/patch-0274 @@ -0,0 +1,53 @@ +From fe0eb56e29f89513b2dcf3c222fa3a2e8a09383f Mon Sep 17 00:00:00 2001 +From: Olav Morken +Date: Mon, 14 Mar 2016 09:47:48 +0100 +Subject: [PATCH 274/274] Return 500 Internal Server Error if probe discovery + fails. + +If we don't, we can end up sending an authentication request to an IdP +that is not in the MellonProbeDiscoveryIdP list, which is probably not +what the user wants. + +Patch by Emmanuel Dreyfus. +--- + README | 3 +++ + auth_mellon_handler.c | 10 +++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/README b/README +index 638329c..4e4f229 100644 +--- README ++++ README +@@ -471,6 +471,9 @@ MellonPostCount 100 + + # MellonProbeDiscoveryIdP can be used to restrict the + # list of IdP queried by the IdP probe discovery service. ++ # If probe discovery fails and this is provided, an ++ # HTTP error 500 is returned, instead of proceeding ++ # with first available IdP. + # + # Default unset, which means that all configured IdP are + # queried. +diff --git a/auth_mellon_handler.c b/auth_mellon_handler.c +index 7f4b73a..a72e1ca 100644 +--- auth_mellon_handler.c ++++ auth_mellon_handler.c +@@ -3316,9 +3316,17 @@ static int am_handle_probe_discovery(request_rec *r) { + } + + /* +- * On failure, try default ++ * On failure, fail if a MellonProbeDiscoveryIdP ++ * list was provided, otherwise try first IdP. + */ + if (disco_idp == NULL) { ++ if (!apr_is_empty_table(cfg->probe_discovery_idp)) { ++ ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, ++ "probeDiscovery failed and non empty " ++ "MellonProbeDiscoveryIdP was provided."); ++ return HTTP_INTERNAL_SERVER_ERROR; ++ } ++ + disco_idp = am_first_idp(r); + if (disco_idp == NULL) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, From eb9967e7ae65ded99500415fccc29a642f99420f Mon Sep 17 00:00:00 2001 From: manu Date: Mon, 14 Mar 2016 10:00:22 +0000 Subject: [PATCH 0066/2457] Updated www/ap-auth-mellon to 0.12.0 Fixes CVE-2016-2145] and CVE-2016-2146 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index d88867d03d00c..384149f026681 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1160 2016/03/14 09:45:08 manu Exp $ +$NetBSD: CHANGES-2016,v 1.1161 2016/03/14 10:00:22 manu Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1549,3 +1549,4 @@ Changes to the packages collection and infrastructure in 2016: Removed databases/postgresql-postgis successor databases/postgresql-postgis2 [gdt 2016-03-14] Updated net/haproxy to 1.6.4 [fhajny 2016-03-14] Updated security/lasso to 2.5.1 [manu 2016-03-14] + Updated www/ap-auth-mellon to 0.12.0 [manu 2016-03-14] From f2a3b51c33ca707a8884eae71b0bf10121c391df Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 14 Mar 2016 10:49:55 +0000 Subject: [PATCH 0067/2457] Changes 3.5.0: The cmake-gui(1) gained options to control warnings about deprecated functionality. The cmake-gui(1) learned an option to set the toolset to be used with VS IDE and Xcode generators, much like the existing -T option to cmake(1). The cmake-gui(1) gained a Regular Expression Explorer which may be used to create and evaluate regular expressions in real-time. The explorer window is available via the Tools menu. The -Wdev and -Wno-dev cmake(1) options now also enable and suppress the deprecated warnings output by default. The suppression of developer warnings as errors can now be controlled with the new -Werror=dev and -Wno-error=dev cmake(1) options. The cmake(1) -E command-line tools copy, copy_if_different, copy_directory, and make_directory learned to support multiple input files or directories. The cmake_parse_arguments() command is now implemented natively. The CMakeParseArguments module remains as an empty placeholder for compatibility. The install(DIRECTORY) command learned to support generator expressions in the list of directories. The CMAKE_ERROR_DEPRECATED variable can now be set using the -Werror=deprecated and -Wno-error=deprecated cmake(1) options. The CMAKE_WARN_DEPRECATED variable can now be set using the -Wdeprecated and -Wno-deprecated cmake(1) options. The VS_GLOBAL_ target property is now implemented for VS 2010 and above. Previously it worked only in VS 2008 and below. The ExternalProject module learned a new GIT_REMOTE_NAME option to control the git clone --origin value. The FindBoost module now provides imported targets such as Boost::boost and Boost::filesystem. The FindFLEX module FLEX_TARGET macro learned a new DEFINES_FILE option to specify a custom output header to be generated. The FindGTest module now provides imported targets. The FindGTK2 module, when GTK2_USE_IMPORTED_TARGETS is enabled, now sets GTK2_LIBRARIES to contain the list of imported targets instead of the paths to the libraries. Moreover it now sets a new GTK2_TARGETS variable containing all the targets imported. The FindOpenMP module learned to support Clang. The FindOpenSSL module gained a new OPENSSL_MSVC_STATIC_RT option to search for libraries using the MSVC static runtime. The FindPNG module now provides imported targets. The FindTIFF module now provides imported targets. A FindXalanC module was introduced to find the Apache Xalan-C++ XSL transform processing library. The FindXercesC module now provides imported targets. --- devel/cmake/Makefile | 7 ++-- devel/cmake/PLIST | 33 ++++++++++++++++++- devel/cmake/distinfo | 14 ++++---- devel/cmake/patches/patch-Source_cmELF.cxx | 14 ++++---- .../patch-Utilities_KWIML_CMakeLists.txt | 12 ++++--- 5 files changed, 56 insertions(+), 24 deletions(-) diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 019b7c98f2123..e56ab1131312c 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.113 2016/03/05 11:28:20 jperkin Exp $ +# $NetBSD: Makefile,v 1.114 2016/03/14 10:49:55 adam Exp $ -DISTNAME= cmake-${CMAKE_API}.3 -PKGREVISION= 1 +DISTNAME= cmake-${CMAKE_API}.0 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v${CMAKE_API}/ -CMAKE_API= 3.4 +CMAKE_API= 3.5 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cmake.org/ diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST index 540564f00fe99..47240197371a7 100644 --- a/devel/cmake/PLIST +++ b/devel/cmake/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.40 2015/11/17 12:12:11 wiz Exp $ +@comment $NetBSD: PLIST,v 1.41 2016/03/14 10:49:55 adam Exp $ bin/ccmake bin/cmake bin/cpack @@ -22,6 +22,7 @@ share/cmake-${CMAKE_API}/Help/command/build_command.rst share/cmake-${CMAKE_API}/Help/command/build_name.rst share/cmake-${CMAKE_API}/Help/command/cmake_host_system_information.rst share/cmake-${CMAKE_API}/Help/command/cmake_minimum_required.rst +share/cmake-${CMAKE_API}/Help/command/cmake_parse_arguments.rst share/cmake-${CMAKE_API}/Help/command/cmake_policy.rst share/cmake-${CMAKE_API}/Help/command/configure_file.rst share/cmake-${CMAKE_API}/Help/command/continue.rst @@ -354,6 +355,7 @@ share/cmake-${CMAKE_API}/Help/module/FindWish.rst share/cmake-${CMAKE_API}/Help/module/FindX11.rst share/cmake-${CMAKE_API}/Help/module/FindXCTest.rst share/cmake-${CMAKE_API}/Help/module/FindXMLRPC.rst +share/cmake-${CMAKE_API}/Help/module/FindXalanC.rst share/cmake-${CMAKE_API}/Help/module/FindXercesC.rst share/cmake-${CMAKE_API}/Help/module/FindZLIB.rst share/cmake-${CMAKE_API}/Help/module/Findosg.rst @@ -690,6 +692,7 @@ share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_SOURCES.rst share/cmake-${CMAKE_API}/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst share/cmake-${CMAKE_API}/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst +share/cmake-${CMAKE_API}/Help/prop_tgt/IOS_INSTALL_COMBINED.rst share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_COMPILE.rst share/cmake-${CMAKE_API}/Help/prop_tgt/JOB_POOL_LINK.rst share/cmake-${CMAKE_API}/Help/prop_tgt/LABELS.rst @@ -786,6 +789,7 @@ share/cmake-${CMAKE_API}/Help/release/3.1.rst share/cmake-${CMAKE_API}/Help/release/3.2.rst share/cmake-${CMAKE_API}/Help/release/3.3.rst share/cmake-${CMAKE_API}/Help/release/3.4.rst +share/cmake-${CMAKE_API}/Help/release/3.5.rst share/cmake-${CMAKE_API}/Help/release/dev.txt share/cmake-${CMAKE_API}/Help/release/index.rst share/cmake-${CMAKE_API}/Help/variable/APPLE.rst @@ -868,6 +872,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATI share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst +share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXTRA_GENERATOR.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst @@ -919,6 +924,7 @@ share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_PREFIX.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst +share/cmake-${CMAKE_API}/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_COMPILE.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_JOB_POOL_LINK.rst share/cmake-${CMAKE_API}/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst @@ -1254,10 +1260,12 @@ share/cmake-${CMAKE_API}/Modules/CMakeFortranCompilerId.F.in share/cmake-${CMAKE_API}/Modules/CMakeFortranInformation.cmake share/cmake-${CMAKE_API}/Modules/CMakeGenericSystem.cmake share/cmake-${CMAKE_API}/Modules/CMakeGraphVizOptions.cmake +share/cmake-${CMAKE_API}/Modules/CMakeIOSInstallCombined.cmake share/cmake-${CMAKE_API}/Modules/CMakeImportBuildSettings.cmake share/cmake-${CMAKE_API}/Modules/CMakeJOMFindMake.cmake share/cmake-${CMAKE_API}/Modules/CMakeJavaCompiler.cmake.in share/cmake-${CMAKE_API}/Modules/CMakeJavaInformation.cmake +share/cmake-${CMAKE_API}/Modules/CMakeLanguageInformation.cmake share/cmake-${CMAKE_API}/Modules/CMakeMSYSFindMake.cmake share/cmake-${CMAKE_API}/Modules/CMakeMinGWFindMake.cmake share/cmake-${CMAKE_API}/Modules/CMakeNMakeFindMake.cmake @@ -1354,6 +1362,11 @@ share/cmake-${CMAKE_API}/Modules/CheckTypeSizeMap.cmake.in share/cmake-${CMAKE_API}/Modules/CheckVariableExists.c share/cmake-${CMAKE_API}/Modules/CheckVariableExists.cmake share/cmake-${CMAKE_API}/Modules/Compiler/ADSP-DetermineCompiler.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC-ASM.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC-C.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC-DetermineCompiler.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/ARMCC.cmake share/cmake-${CMAKE_API}/Modules/Compiler/Absoft-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-ASM.cmake share/cmake-${CMAKE_API}/Modules/Compiler/AppleClang-C-FeatureTests.cmake @@ -1379,6 +1392,22 @@ share/cmake-${CMAKE_API}/Modules/Compiler/Cray-C.cmake share/cmake-${CMAKE_API}/Modules/Compiler/Cray-CXX.cmake share/cmake-${CMAKE_API}/Modules/Compiler/Cray-DetermineCompiler.cmake share/cmake-${CMAKE_API}/Modules/Compiler/Cray-Fortran.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-C.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Cray-C.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Fortran.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-GNU-C.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Intel-C.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-PGI-C.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake +share/cmake-${CMAKE_API}/Modules/Compiler/CrayPrgEnv.cmake share/cmake-${CMAKE_API}/Modules/Compiler/Embarcadero-DetermineCompiler.cmake share/cmake-${CMAKE_API}/Modules/Compiler/Fujitsu-DetermineCompiler.cmake share/cmake-${CMAKE_API}/Modules/Compiler/G95-Fortran.cmake @@ -1607,6 +1636,7 @@ share/cmake-${CMAKE_API}/Modules/FindWish.cmake share/cmake-${CMAKE_API}/Modules/FindX11.cmake share/cmake-${CMAKE_API}/Modules/FindXCTest.cmake share/cmake-${CMAKE_API}/Modules/FindXMLRPC.cmake +share/cmake-${CMAKE_API}/Modules/FindXalanC.cmake share/cmake-${CMAKE_API}/Modules/FindXercesC.cmake share/cmake-${CMAKE_API}/Modules/FindZLIB.cmake share/cmake-${CMAKE_API}/Modules/Findosg.cmake @@ -1726,6 +1756,7 @@ share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-GNU.cmake share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN-windres.cmake share/cmake-${CMAKE_API}/Modules/Platform/CYGWIN.cmake share/cmake-${CMAKE_API}/Modules/Platform/Catamount.cmake +share/cmake-${CMAKE_API}/Modules/Platform/CrayLinuxEnvironment.cmake share/cmake-${CMAKE_API}/Modules/Platform/Darwin-Absoft-Fortran.cmake share/cmake-${CMAKE_API}/Modules/Platform/Darwin-AppleClang-C.cmake share/cmake-${CMAKE_API}/Modules/Platform/Darwin-AppleClang-CXX.cmake diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index c09bfe77cbb7f..25fcd4789b9cb 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.85 2016/01/26 16:33:38 adam Exp $ +$NetBSD: distinfo,v 1.86 2016/03/14 10:49:55 adam Exp $ -SHA1 (cmake-3.4.3.tar.gz) = 49e4f05d46d4752e514b19ba36bf97d20a7da66a -RMD160 (cmake-3.4.3.tar.gz) = 4328fe65c290f641ee37c21ddd117bde33533ed8 -SHA512 (cmake-3.4.3.tar.gz) = a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11 -Size (cmake-3.4.3.tar.gz) = 6722311 bytes +SHA1 (cmake-3.5.0.tar.gz) = 4a10116e061bbe806ffdd5164aca7780b0e98f4e +RMD160 (cmake-3.5.0.tar.gz) = 201368d60ee8375f91f584ba109fc7e3e3e48b9e +SHA512 (cmake-3.5.0.tar.gz) = 4fef712560f1975f8d19e897c7b1903811f7bad9314602961b5b32ac58f367bf1308f96cc5edaceb99ac9084b1e0517e4ecb4b5996d2ad53b6aec305ae879b09 +Size (cmake-3.5.0.tar.gz) = 6861686 bytes SHA1 (patch-CMakeLists.txt) = ae722c41e0d9a1396fe80f1000266a33e406e2f6 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c SHA1 (patch-Modules_Platform_SCO__SV.cmake) = 3ed230b3a06ea693812db8f57bc73aebec12b99f SHA1 (patch-Source_CursesDialog_ccmake.cxx) = c77cf55df2b047908178e7ed1db6e5454834ea49 -SHA1 (patch-Source_cmELF.cxx) = 5eb9dc0b3567b5685596ddf0a03ca8e5c76e6f92 +SHA1 (patch-Source_cmELF.cxx) = ad6fa581da8ad36223aa53285a1a8dbec0c02a9d SHA1 (patch-Source_kwsys_SystemInformation.cxx) = 5e8c8ff7875c329e48c54ee03570ea4a6d52953a SHA1 (patch-Source_kwsys_SystemTools.cxx) = 634348b9bc8ccf8c72f23837baa6ba0bcacf5961 -SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = 4e8cef0eab2ad8cb27cd7076e077bb5e7425a95c +SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796 SHA1 (patch-aa) = bab24334e025b7c1bf7caa2e69d6a439cc421ea9 SHA1 (patch-ab) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f SHA1 (patch-ac) = b5cedc6a2354beaf08e06d416c150154a7dc1f05 diff --git a/devel/cmake/patches/patch-Source_cmELF.cxx b/devel/cmake/patches/patch-Source_cmELF.cxx index 8d624d5047e1b..a1ac398cdfe41 100644 --- a/devel/cmake/patches/patch-Source_cmELF.cxx +++ b/devel/cmake/patches/patch-Source_cmELF.cxx @@ -1,10 +1,10 @@ -$NetBSD: patch-Source_cmELF.cxx,v 1.2 2015/01/17 13:29:55 adam Exp $ +$NetBSD: patch-Source_cmELF.cxx,v 1.3 2016/03/14 10:49:55 adam Exp $ * SCO OpenServer 5.0.7/3.2 has not 64bit ELF support. ---- Source/cmELF.cxx.orig 2014-12-15 20:07:43.000000000 +0000 +--- Source/cmELF.cxx.orig 2016-03-08 14:36:22.000000000 +0000 +++ Source/cmELF.cxx -@@ -49,6 +49,9 @@ +@@ -45,6 +45,9 @@ #if defined(__sun) # include // For dynamic section information #endif @@ -14,7 +14,7 @@ //---------------------------------------------------------------------------- // Low-level byte swapping implementation. -@@ -203,6 +206,8 @@ struct cmELFTypes32 +@@ -199,6 +202,8 @@ struct cmELFTypes32 }; // Configure the implementation template for 64-bit ELF files. @@ -23,15 +23,15 @@ struct cmELFTypes64 { typedef Elf64_Ehdr ELF_Ehdr; -@@ -212,6 +217,7 @@ struct cmELFTypes64 - typedef cmIML_INT_uint64_t tagtype; +@@ -208,6 +213,7 @@ struct cmELFTypes64 + typedef KWIML_INT_uint64_t tagtype; static const char* GetName() { return "64-bit"; } }; +#endif //---------------------------------------------------------------------------- // Parser implementation template. -@@ -788,11 +794,14 @@ cmELF::cmELF(const char* fname): Interna +@@ -790,11 +796,14 @@ cmELF::cmELF(const char* fname): Interna // 32-bit ELF this->Internal = new cmELFInternalImpl(this, fin, order); } diff --git a/devel/cmake/patches/patch-Utilities_KWIML_CMakeLists.txt b/devel/cmake/patches/patch-Utilities_KWIML_CMakeLists.txt index 1840b4a643907..ad44a40cae088 100644 --- a/devel/cmake/patches/patch-Utilities_KWIML_CMakeLists.txt +++ b/devel/cmake/patches/patch-Utilities_KWIML_CMakeLists.txt @@ -1,12 +1,14 @@ -$NetBSD: patch-Utilities_KWIML_CMakeLists.txt,v 1.1 2012/01/08 17:44:23 adam Exp $ +$NetBSD: patch-Utilities_KWIML_CMakeLists.txt,v 1.2 2016/03/14 10:49:55 adam Exp $ Disable tests. Solves some preprocessor problems. ---- Utilities/KWIML/CMakeLists.txt.orig 2012-01-08 16:31:36.000000000 +0000 +--- Utilities/KWIML/CMakeLists.txt.orig 2016-03-08 14:36:25.000000000 +0000 +++ Utilities/KWIML/CMakeLists.txt -@@ -75,5 +75,4 @@ endforeach() +@@ -42,7 +42,6 @@ if(KWIML_INSTALL_INCLUDE_DIR) + endif() - #----------------------------------------------------------------------------- - if(BUILD_TESTING) + if(KWIML_TEST_ENABLE) - add_subdirectory(test) endif() + + if(NOT kwiml_standalone) From 9bc8680e94d411a864d922c1065398392e66899d Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 14 Mar 2016 10:50:59 +0000 Subject: [PATCH 0068/2457] Updated devel/cmake to 3.5.0 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 384149f026681..1247bdc365771 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1161 2016/03/14 10:00:22 manu Exp $ +$NetBSD: CHANGES-2016,v 1.1162 2016/03/14 10:50:59 adam Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1550,3 +1550,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/haproxy to 1.6.4 [fhajny 2016-03-14] Updated security/lasso to 2.5.1 [manu 2016-03-14] Updated www/ap-auth-mellon to 0.12.0 [manu 2016-03-14] + Updated devel/cmake to 3.5.0 [adam 2016-03-14] diff --git a/doc/TODO b/doc/TODO index c0c659d29f402..1d34f2c5c0b5a 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15591 2016/03/14 09:11:44 dbj Exp $ +$NetBSD: TODO,v 1.15592 2016/03/14 10:50:59 adam Exp $ Suggested new packages ====================== @@ -551,7 +551,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o clusterssh-4.05 o clutter-1.24 o clutter-gst-3.0.2 - o cmake-3.5.0 o cmake-fedora-2.6.0 o cmocka-1.0.1 o cmus-2.7.1 From 7a1061b7fa5e1865ac8fe1df83c7079de80e6a27 Mon Sep 17 00:00:00 2001 From: bouyer Date: Mon, 14 Mar 2016 11:01:06 +0000 Subject: [PATCH 0069/2457] Update OpenCPN to 4.2.0. Changes since 4.0.0: As a successor to OpenCPN Version 4.0, OpenCPN Version 4.2 contains many new features and enhanced functions. Among them are: ..Increased performance in all modes, particularly when using OpenGL graphics acceleration. ..Integrated Chart Downloader PlugIn, allowing systematic tracking and donwload of latest online charts from several popular sources. ..Integrated World Magnetic Model (WMM) PlugIn, providing accuratley calculated magnetic variation worldwide. ..Major update to embedded Users Manual. ..Measurably improved performance and reliability over all supported platforms. more details here: http://opencpn.org/ocpn/release4.2 --- geography/opencpn/Makefile | 27 +- geography/opencpn/PLIST | 1319 +++++++++++------ geography/opencpn/distinfo | 20 +- .../opencpn/patches/patch-CMakeLists.txt | 21 +- ...s_chartdldr_pi_cmake_PluginConfigure.cmake | 16 + .../patch-plugins_dashboard_pi_CMakeLists.txt | 13 + .../patch-plugins_grib_pi_CMakeLists.txt | 10 + ...plugins_wmm_pi_cmake_PluginConfigure.cmake | 16 + .../opencpn/patches/patch-src_chartimg.cpp | 15 + .../opencpn/patches/patch-src_chcanv.cpp | 18 + .../patches/patch-src_glu_libtess_sweep.c | 61 + .../opencpn/patches/patch-src_mipmap_mipmap.c | 15 + 12 files changed, 1043 insertions(+), 508 deletions(-) create mode 100644 geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake create mode 100644 geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt create mode 100644 geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt create mode 100644 geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake create mode 100644 geography/opencpn/patches/patch-src_chartimg.cpp create mode 100644 geography/opencpn/patches/patch-src_chcanv.cpp create mode 100644 geography/opencpn/patches/patch-src_glu_libtess_sweep.c create mode 100644 geography/opencpn/patches/patch-src_mipmap_mipmap.c diff --git a/geography/opencpn/Makefile b/geography/opencpn/Makefile index fd0aff15b7ba2..6679655f61638 100644 --- a/geography/opencpn/Makefile +++ b/geography/opencpn/Makefile @@ -1,12 +1,15 @@ -# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:06 tnn Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/14 11:01:06 bouyer Exp $ # -VERSION= 4.0.0 -DISTNAME= OpenCPN-${VERSION}-Source +VERSION= 4.2.0 +#PKGREVISION= 1 +DISTNAME= OpenCPN-${VERSION} PKGNAME= opencpn-${VERSION} -PKGREVISION= 1 CATEGORIES= geography -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencpn/${VERSION}/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenCPN/} +GITHUB_PROJECT= OpenCPN +GITHUB_TAG= a555b4988b50f555be052394c184ef26c5ad0e8a +EXTRACT_SUFX= .zip MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://www.opencpn.org/ @@ -19,12 +22,13 @@ USE_CMAKE= yes CMAKE_ARGS+= -DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn CMAKE_ARGS+= -DBUNDLE_DOCS=ON -DBUNDLE_GSHHS=CRUDE -DBUNDLE_TCDATA=ON +CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug CMAKE_MODULE_PATH_OVERRIDE = \ - plugins/grib_pi/CMakeLists.txt \ - plugins/demo_pi_sample/src/CMakeLists.txt \ - plugins/demo_pi_sample/CMakeLists.txt \ - plugins/dashboard_pi/CMakeLists.txt \ - plugins/CMakeLists.txt + plugins/chartdldr_pi/CMakeLists.txt \ + plugins/dashboard_pi/CMakeLists.txt \ + plugins/grib_pi/CMakeLists.txt \ + plugins/wmm_pi/CMakeLists.txt \ + plugins/CMakeLists.txt SUBST_CLASSES+= prefix SUBST_STAGE.prefix= pre-configure @@ -40,7 +44,7 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} .include "../../devel/cmake/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../x11/wxGTK30/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../archivers/bzip2/buildlink3.mk" @@ -48,4 +52,5 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} .include "../../textproc/tinyxml/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../www/curl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/opencpn/PLIST b/geography/opencpn/PLIST index 089b7d6608223..6bc7fc21eccc6 100644 --- a/geography/opencpn/PLIST +++ b/geography/opencpn/PLIST @@ -1,218 +1,271 @@ -@comment $NetBSD: PLIST,v 1.2 2015/01/22 12:34:15 bouyer Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/14 11:01:06 bouyer Exp $ bin/opencpn +lib/opencpn/libchartdldr_pi.so lib/opencpn/libdashboard_pi.so lib/opencpn/libgrib_pi.so +lib/opencpn/libwmm_pi.so share/applications/opencpn.desktop share/doc/opencpn/changelog.Debian.gz share/doc/opencpn/copyright share/icons/hicolor/48x48/apps/opencpn.png share/icons/hicolor/scalable/apps/opencpn.svg +share/locale/ca/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/ca/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/ca/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/ca/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/ca_ES/LC_MESSAGES/opencpn.mo +share/locale/cs/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/cs/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/cs/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/cs/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/cs/LC_MESSAGES/opencpn.mo +share/locale/da/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/da/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/da/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/da/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/da/LC_MESSAGES/opencpn.mo +share/locale/de/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/de/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/de/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/de/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/de/LC_MESSAGES/opencpn.mo +share/locale/el/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/el/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/el/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/el/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/el_GR/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/el_GR/LC_MESSAGES/opencpn-grib_pi.mo share/locale/el_GR/LC_MESSAGES/opencpn.mo +share/locale/es/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/es/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/es/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/es/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/es/LC_MESSAGES/opencpn.mo +share/locale/et/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/et/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/et/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/et/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/et/LC_MESSAGES/opencpn.mo +share/locale/fi/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/fi/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/fi/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/fi/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/fi_FI/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/fi_FI/LC_MESSAGES/opencpn-grib_pi.mo share/locale/fi_FI/LC_MESSAGES/opencpn.mo +share/locale/fr/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/fr/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/fr/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/fr/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/fr/LC_MESSAGES/opencpn.mo +share/locale/gl/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/gl/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/gl/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/gl/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/gl_ES/LC_MESSAGES/opencpn.mo +share/locale/hu/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/hu/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/hu/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/hu/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/hu_HU/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/hu_HU/LC_MESSAGES/opencpn.mo +share/locale/it/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/it/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/it/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/it/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/it/LC_MESSAGES/opencpn.mo +share/locale/ja/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/ja/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/ja/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/ja/LC_MESSAGES/opencpn-wmm_pi.mo +share/locale/nb/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/nb/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/nb/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/nb/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/nb_NO/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/nb_NO/LC_MESSAGES/opencpn-grib_pi.mo share/locale/nb_NO/LC_MESSAGES/opencpn.mo +share/locale/nl/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/nl/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/nl/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/nl/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/nl/LC_MESSAGES/opencpn.mo +share/locale/pl/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/pl/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/pl/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/pl/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/pl/LC_MESSAGES/opencpn.mo share/locale/pl_PL/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/pl_PL/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/pt/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/pt/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/pt/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/pt/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/pt_BR/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/pt_BR/LC_MESSAGES/opencpn-grib_pi.mo share/locale/pt_BR/LC_MESSAGES/opencpn.mo share/locale/pt_PT/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/pt_PT/LC_MESSAGES/opencpn-grib_pi.mo share/locale/pt_PT/LC_MESSAGES/opencpn.mo +share/locale/ru/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/ru/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/ru/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/ru/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/ru/LC_MESSAGES/opencpn.mo +share/locale/sv/LC_MESSAGES/opencpn-chartdldr_pi.mo share/locale/sv/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/sv/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/sv/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/sv/LC_MESSAGES/opencpn.mo +share/locale/tr/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/tr/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/tr/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/tr/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/tr_TR/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/tr_TR/LC_MESSAGES/opencpn-grib_pi.mo share/locale/tr_TR/LC_MESSAGES/opencpn.mo +share/locale/vi/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/vi/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/vi/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/zh/LC_MESSAGES/opencpn-chartdldr_pi.mo +share/locale/zh/LC_MESSAGES/opencpn-dashboard_pi.mo +share/locale/zh/LC_MESSAGES/opencpn-grib_pi.mo +share/locale/zh/LC_MESSAGES/opencpn-wmm_pi.mo share/locale/zh_TW/LC_MESSAGES/opencpn-dashboard_pi.mo share/locale/zh_TW/LC_MESSAGES/opencpn-grib_pi.mo share/locale/zh_TW/LC_MESSAGES/opencpn.mo share/opencpn/doc/help_en_US.html share/opencpn/doc/help_web.html -share/opencpn/doc/images/0.png -share/opencpn/doc/images/10_1mile.png -share/opencpn/doc/images/1_2.png -share/opencpn/doc/images/2.png -share/opencpn/doc/images/2624.png -share/opencpn/doc/images/3.png +share/opencpn/doc/images/0.jpg +share/opencpn/doc/images/02.jpg +share/opencpn/doc/images/03-Chart-Downloader-Tab-First-Time.jpg +share/opencpn/doc/images/08-AfterDownloading.jpg +share/opencpn/doc/images/1.jpg +share/opencpn/doc/images/10_1mile.jpg +share/opencpn/doc/images/15-Chart-Status-Selection.jpg +share/opencpn/doc/images/16-Show-Local-Files.jpg +share/opencpn/doc/images/17preferences.jpg +share/opencpn/doc/images/1AU-Add-Edit-Custom-Chart-Source.jpg +share/opencpn/doc/images/1AUAddNewChartSource-Predefined201.jpg +share/opencpn/doc/images/1AUpreferences.jpg +share/opencpn/doc/images/1Charts.jpg +share/opencpn/doc/images/1PleaseUpdate.jpg +share/opencpn/doc/images/1_2.jpg +share/opencpn/doc/images/1ancorIcon.jpg +share/opencpn/doc/images/1sliders.jpg +share/opencpn/doc/images/2.jpg +share/opencpn/doc/images/3.jpg share/opencpn/doc/images/33AISlist2.jpg -share/opencpn/doc/images/33AISlist2.png -share/opencpn/doc/images/33Accuracy_10K.png -share/opencpn/doc/images/33Accuracy_12m.png -share/opencpn/doc/images/33Accuracy_info.png -share/opencpn/doc/images/33Accuracy_info2.png -share/opencpn/doc/images/33Aton2.png -share/opencpn/doc/images/33AtonOnPos.png -share/opencpn/doc/images/33Blacklist.png -share/opencpn/doc/images/33Dash-App.png -share/opencpn/doc/images/33GFS16.png -share/opencpn/doc/images/33GribInterpolation.png -share/opencpn/doc/images/33GribOverlayColors.png -share/opencpn/doc/images/33GribPreference2.png -share/opencpn/doc/images/33GribUnits.png +share/opencpn/doc/images/33Accuracy_10K.jpg +share/opencpn/doc/images/33Accuracy_12m.jpg +share/opencpn/doc/images/33Accuracy_info.jpg +share/opencpn/doc/images/33Accuracy_info2.jpg +share/opencpn/doc/images/33Aton2.jpg +share/opencpn/doc/images/33AtonOnPos.jpg +share/opencpn/doc/images/33Blacklist.jpg +share/opencpn/doc/images/33Dash-App.jpg +share/opencpn/doc/images/33GFS16.jpg +share/opencpn/doc/images/33GribInterpolation.jpg +share/opencpn/doc/images/33GribOverlayColors.jpg +share/opencpn/doc/images/33GribPreference2.jpg +share/opencpn/doc/images/33GribUnits.jpg share/opencpn/doc/images/33Gribmail1.jpg share/opencpn/doc/images/33Gribmail10.jpg -share/opencpn/doc/images/33Gribmail10.png share/opencpn/doc/images/33Gribmail2.jpg -share/opencpn/doc/images/33Gribmail2.png share/opencpn/doc/images/33Gribmail3.jpg -share/opencpn/doc/images/33Gribmail3.png share/opencpn/doc/images/33Gribmail4.jpg -share/opencpn/doc/images/33Gribmail4.png share/opencpn/doc/images/33Gribmail5.jpg -share/opencpn/doc/images/33Gribmail5.png share/opencpn/doc/images/33Gribmail6.jpg -share/opencpn/doc/images/33Gribmail6.png share/opencpn/doc/images/33Gribmail7.jpg -share/opencpn/doc/images/33Gribmail7.png share/opencpn/doc/images/33Gribmail8.jpg -share/opencpn/doc/images/33Gribmail8.png share/opencpn/doc/images/33Gribmail9.jpg -share/opencpn/doc/images/33Gribmail9.png -share/opencpn/doc/images/33HideTrack.png -share/opencpn/doc/images/33OptionsConnections.png -share/opencpn/doc/images/33VAton2.png -share/opencpn/doc/images/33WxTable.png -share/opencpn/doc/images/33WxTable_1.png -share/opencpn/doc/images/33YellowOwnShip.png -share/opencpn/doc/images/33_S57_info.png -share/opencpn/doc/images/33ais-showname.png -share/opencpn/doc/images/33ereqZy2.png -share/opencpn/doc/images/33gribcurrent.png -share/opencpn/doc/images/33jmantoolbar.png -share/opencpn/doc/images/33speed12.png -share/opencpn/doc/images/33speed50.png -share/opencpn/doc/images/33tradtoolbar.png -share/opencpn/doc/images/33vec.png -share/opencpn/doc/images/33vofpos.png -share/opencpn/doc/images/3jmanflattoolbar.png -share/opencpn/doc/images/4-S63-1.png -share/opencpn/doc/images/4-S63.png -share/opencpn/doc/images/4.png -share/opencpn/doc/images/48px-Under_construction_icon-blue.png -share/opencpn/doc/images/4Chartgroups2.png -share/opencpn/doc/images/4DefaultMark.png -share/opencpn/doc/images/4GL-expert.png -share/opencpn/doc/images/4GribAreaSelection.png -share/opencpn/doc/images/4GribControledColours.png -share/opencpn/doc/images/4GribCurrent_0.png -share/opencpn/doc/images/4GribDisplayChoices.png -share/opencpn/doc/images/4GribGraph-Selection.png -share/opencpn/doc/images/4GribRequest.png -share/opencpn/doc/images/4GribSettings.png -share/opencpn/doc/images/4GribSettingsATemp.png -share/opencpn/doc/images/4GribSettingsCAPE.png -share/opencpn/doc/images/4GribSettingsGusts.png -share/opencpn/doc/images/4GribSettingsPressure.png -share/opencpn/doc/images/4GribSettingsWaves.png -share/opencpn/doc/images/4GribWind.png -share/opencpn/doc/images/4MMSI-prop.png -share/opencpn/doc/images/4MOB1.png -share/opencpn/doc/images/4MOB3.png +share/opencpn/doc/images/33HideTrack.jpg +share/opencpn/doc/images/33VAton2.jpg +share/opencpn/doc/images/33WxTable.jpg +share/opencpn/doc/images/33WxTable_1.jpg +share/opencpn/doc/images/33YellowOwnShip.jpg +share/opencpn/doc/images/33_S57_info.jpg +share/opencpn/doc/images/33ais-showname.jpg +share/opencpn/doc/images/33gribcurrent.jpg +share/opencpn/doc/images/33jmantoolbar.jpg +share/opencpn/doc/images/33speed12.jpg +share/opencpn/doc/images/33speed50.jpg +share/opencpn/doc/images/33tradtoolbar.jpg +share/opencpn/doc/images/33vec.jpg +share/opencpn/doc/images/33vofpos.jpg +share/opencpn/doc/images/3jmanflattoolbar.jpg +share/opencpn/doc/images/4-S63-1.jpg +share/opencpn/doc/images/4-S63.jpg +share/opencpn/doc/images/4.jpg +share/opencpn/doc/images/420OptionConnections.jpg +share/opencpn/doc/images/421OptionConnections.jpg +share/opencpn/doc/images/42AddSerialConnection.jpg +share/opencpn/doc/images/48px-Under_construction_icon-blue.jpg +share/opencpn/doc/images/4Chartgroups2.jpg +share/opencpn/doc/images/4GL-expert.jpg +share/opencpn/doc/images/4GribAreaSelection.jpg +share/opencpn/doc/images/4GribControledColours.jpg +share/opencpn/doc/images/4GribCurrent_0.jpg +share/opencpn/doc/images/4GribDisplayChoices.jpg +share/opencpn/doc/images/4GribGraph-Selection.jpg +share/opencpn/doc/images/4MMSI-prop.jpg +share/opencpn/doc/images/4MOB1.jpg +share/opencpn/doc/images/4MOB3.jpg share/opencpn/doc/images/4MOB4.jpg -share/opencpn/doc/images/4MOB4.png -share/opencpn/doc/images/4MOB6.png -share/opencpn/doc/images/4Objq.png -share/opencpn/doc/images/4OptChartTide.png -share/opencpn/doc/images/4Options-Connections.jpg -share/opencpn/doc/images/4Options-Connections.png -share/opencpn/doc/images/4OptionsDisplayAdvanced2.png -share/opencpn/doc/images/4OptionsOwnShipAddMMSI_1.png -share/opencpn/doc/images/4OptionsUserInterface2.png -share/opencpn/doc/images/4PlugIns.png -share/opencpn/doc/images/4RNG.png -share/opencpn/doc/images/4RealScaleBitmap.png -share/opencpn/doc/images/4RightClRoute.png -share/opencpn/doc/images/4RightclickLayerTrack.png -share/opencpn/doc/images/4RightclickTrack.png -share/opencpn/doc/images/4SendtoGPS.png -share/opencpn/doc/images/4ShowRadarRings.png -share/opencpn/doc/images/4Start-Charts.png -share/opencpn/doc/images/4Start-Charts1.png -share/opencpn/doc/images/4Start-Charts2.png -share/opencpn/doc/images/4Start-Charts3.png -share/opencpn/doc/images/4Start-Charts4.png -share/opencpn/doc/images/4Target-Query1.png -share/opencpn/doc/images/4Target-Query2.png -share/opencpn/doc/images/4Target-Real-Size.png -share/opencpn/doc/images/4TrackProperties.png -share/opencpn/doc/images/4TracksTab.png +share/opencpn/doc/images/4MOB6.jpg +share/opencpn/doc/images/4Objq.jpg +share/opencpn/doc/images/4OptChartTide.jpg +share/opencpn/doc/images/4PlugIns.jpg +share/opencpn/doc/images/4RNG.jpg +share/opencpn/doc/images/4RealScaleBitmap.jpg +share/opencpn/doc/images/4RightClRoute.jpg +share/opencpn/doc/images/4RightclickLayerTrack.jpg +share/opencpn/doc/images/4RightclickTrack.jpg +share/opencpn/doc/images/4SendtoGPS.jpg +share/opencpn/doc/images/4ShowRadarRings.jpg +share/opencpn/doc/images/4Start-Charts.jpg +share/opencpn/doc/images/4Start-Charts1.jpg +share/opencpn/doc/images/4Start-Charts2.jpg +share/opencpn/doc/images/4Start-Charts3.jpg +share/opencpn/doc/images/4Start-Charts4.jpg +share/opencpn/doc/images/4Target-Query1.jpg +share/opencpn/doc/images/4Target-Query2.jpg +share/opencpn/doc/images/4Target-Real-Size.jpg +share/opencpn/doc/images/4TrackProperties.jpg +share/opencpn/doc/images/4TracksTab.jpg share/opencpn/doc/images/4VectorChartsDisplay.jpg -share/opencpn/doc/images/4fps.png -share/opencpn/doc/images/4gribControl.png -share/opencpn/doc/images/5.png -share/opencpn/doc/images/500mb.png -share/opencpn/doc/images/5GL-non-expert.png -share/opencpn/doc/images/6.png -share/opencpn/doc/images/7.png -share/opencpn/doc/images/8.png -share/opencpn/doc/images/9.png -share/opencpn/doc/images/About32.png -share/opencpn/doc/images/Anch2.png -share/opencpn/doc/images/Anch3.png -share/opencpn/doc/images/Anch4.png -share/opencpn/doc/images/Anch5.png -share/opencpn/doc/images/Anch6.png -share/opencpn/doc/images/Anch8.png -share/opencpn/doc/images/Anch9.png +share/opencpn/doc/images/4fps.jpg +share/opencpn/doc/images/4gribControl.jpg +share/opencpn/doc/images/5.jpg +share/opencpn/doc/images/500mb.jpg +share/opencpn/doc/images/5GL-non-expert.jpg +share/opencpn/doc/images/6.jpg +share/opencpn/doc/images/7.jpg +share/opencpn/doc/images/8.jpg +share/opencpn/doc/images/9.jpg +share/opencpn/doc/images/Activation_NVC-Charts.jpg +share/opencpn/doc/images/Anch2.jpg +share/opencpn/doc/images/Anch3.jpg +share/opencpn/doc/images/Anch4.jpg +share/opencpn/doc/images/Anch5.jpg +share/opencpn/doc/images/Anch6.jpg +share/opencpn/doc/images/Anch8.jpg +share/opencpn/doc/images/Anch9.jpg +share/opencpn/doc/images/AtoN_all.jpg share/opencpn/doc/images/BGchart.jpg share/opencpn/doc/images/CCC-Castine-Climatology-Config-Standard-Current.jpg share/opencpn/doc/images/CCC-Castine-Climatology-Config-Standard-SeaLevelPressure.jpg share/opencpn/doc/images/CCC-Castine-Climatology-Config-Standard-SeaSurfaceTemperatur.jpg share/opencpn/doc/images/CCC-Castine-Climatology-Config-Standard-Wind.jpg share/opencpn/doc/images/CCC-Castine-Climatology-Config-Wind.jpg -share/opencpn/doc/images/CCC-Castine-Grib.png +share/opencpn/doc/images/CCC-Castine-Grib.jpg share/opencpn/doc/images/CCC-Castine-Wx-Rte-1d-23h.jpg share/opencpn/doc/images/CM-top.jpg share/opencpn/doc/images/ChartGroups321.jpg share/opencpn/doc/images/ChartGroups322.jpg -share/opencpn/doc/images/ChartGroups322.png -share/opencpn/doc/images/Chartbar32.png -share/opencpn/doc/images/Chartbar322.png -share/opencpn/doc/images/ClassicShell_zpsbfed952c.png +share/opencpn/doc/images/Chartbar32.jpg +share/opencpn/doc/images/ClassicShell_zpsbfed952c.jpg share/opencpn/doc/images/Climatology-Clouds-in-July.jpg -share/opencpn/doc/images/Climatology-Current-Dec.png share/opencpn/doc/images/Climatology-Cyclones-Dec.jpg share/opencpn/doc/images/Climatology-Precipitation-in-July.jpg share/opencpn/doc/images/Climatology-Pressure-Dec.jpg @@ -220,127 +273,279 @@ share/opencpn/doc/images/Climatology-RelativeHumidity-in-July.jpg share/opencpn/doc/images/Climatology-SeaDepth.jpg share/opencpn/doc/images/Climatology-SeaLevelPressure-in-July.jpg share/opencpn/doc/images/Climatology-SeaLevelTemperature-in-July.jpg -share/opencpn/doc/images/Climatology-Wind-Dec.png +share/opencpn/doc/images/Climatology-Wind-Dec.jpg share/opencpn/doc/images/ClimatologyCycloneConfig.jpg -share/opencpn/doc/images/Con-net2.png -share/opencpn/doc/images/Connections.png -share/opencpn/doc/images/Dash24.png -share/opencpn/doc/images/Dashprop322.png +share/opencpn/doc/images/Connections-Output-Filter-Sentence.jpg +share/opencpn/doc/images/Connections.jpg +share/opencpn/doc/images/Dashprop322.jpg share/opencpn/doc/images/Debug_win.jpg +share/opencpn/doc/images/Des-activation_NVC-Charts.jpg share/opencpn/doc/images/DeviceManager-1.jpg -share/opencpn/doc/images/DeviceManager_zpsb0197e16.png +share/opencpn/doc/images/DeviceManager_zpsb0197e16.jpg +share/opencpn/doc/images/Diagram-0-sm.jpg +share/opencpn/doc/images/Diagram-1-sm.jpg +share/opencpn/doc/images/Diagram-2-sm.jpg +share/opencpn/doc/images/Diagram-3-sm.jpg +share/opencpn/doc/images/Diagram-4-sm.jpg +share/opencpn/doc/images/Draw-Toolbar.jpg +share/opencpn/doc/images/Draw_Manager_and_Draw_Toolbar_Icons.jpg +share/opencpn/doc/images/Ecran_affichage_1.jpg +share/opencpn/doc/images/Ecran_affichage_2.jpg +share/opencpn/doc/images/Ecran_affichage_3.jpg +share/opencpn/doc/images/Ecran_affichage_4.jpg +share/opencpn/doc/images/FI-Setup.jpg +share/opencpn/doc/images/Find-Logbook.jpg share/opencpn/doc/images/Four-Circles-of-Position.jpg share/opencpn/doc/images/Four-Sights-Entered.jpg -share/opencpn/doc/images/GD_NGA24390.png -share/opencpn/doc/images/GeolocationTCP_zps5cb554ea.png -share/opencpn/doc/images/MOB-choice.png +share/opencpn/doc/images/GD_NGA24390.jpg +share/opencpn/doc/images/GeolocationTCP_zps5cb554ea.jpg +share/opencpn/doc/images/Girb-Hide-Data.jpg +share/opencpn/doc/images/Grib-Menu-2.jpg +share/opencpn/doc/images/Grib-Settings-Bottom-Slider.jpg +share/opencpn/doc/images/Grib-Settings-Data-Air-Temperature.jpg +share/opencpn/doc/images/Grib-Settings-Data-CAPE.jpg +share/opencpn/doc/images/Grib-Settings-Data-Pressure.jpg +share/opencpn/doc/images/Grib-Settings-Data-Waves-Data.jpg +share/opencpn/doc/images/Grib-Settings-Data-Waves-Gui.jpg +share/opencpn/doc/images/Grib-Settings-Data-Waves-Playback.jpg +share/opencpn/doc/images/Grib-Settings-Data-Wind-Gust.jpg +share/opencpn/doc/images/Grib-Settings-Data-Wind.jpg +share/opencpn/doc/images/Grib-Settings-Message-Saildocs.jpg +share/opencpn/doc/images/Grib-Settings-Message-Zygrib.jpg +share/opencpn/doc/images/Help-About.jpg +share/opencpn/doc/images/IEC_AIS_AtoN_sym-Real.jpg +share/opencpn/doc/images/IEC_AIS_AtoN_sym-Virtual.jpg +share/opencpn/doc/images/IMGP0105.jpg +share/opencpn/doc/images/IMGP0107.jpg +share/opencpn/doc/images/Icon-Enc-Text-On.jpg +share/opencpn/doc/images/Installationnvc_pi_2.jpg +share/opencpn/doc/images/Installationnvc_pi_3.jpg +share/opencpn/doc/images/Installationnvc_pi_4.jpg +share/opencpn/doc/images/Installationvc_pi_1.jpg +share/opencpn/doc/images/Locations.jpg +share/opencpn/doc/images/MMSI_Prop_List1.jpg +share/opencpn/doc/images/MOB-choice.jpg share/opencpn/doc/images/MagnifierZoomB.jpg -share/opencpn/doc/images/Menu-Tools.png -share/opencpn/doc/images/MenuBar.png -share/opencpn/doc/images/MenuBar3.png -share/opencpn/doc/images/MenuBar5.png -share/opencpn/doc/images/MenuBarView.png -share/opencpn/doc/images/MenuNavigateExit.png -share/opencpn/doc/images/Mob2.png +share/opencpn/doc/images/MenuBar.jpg +share/opencpn/doc/images/Menubar-AIS.jpg +share/opencpn/doc/images/Menubar-Help.jpg +share/opencpn/doc/images/Menubar-Navigation.jpg +share/opencpn/doc/images/Menubar-Tools.jpg +share/opencpn/doc/images/Menubar-View.jpg +share/opencpn/doc/images/Menubar-toolbar-chart.jpg +share/opencpn/doc/images/NV_Verlag_web_site.jpg share/opencpn/doc/images/Nassau_to_Newport_May.jpg -share/opencpn/doc/images/Nr9.png -share/opencpn/doc/images/OZ.png -share/opencpn/doc/images/OZ1.png +share/opencpn/doc/images/Nr9.jpg +share/opencpn/doc/images/OCPN-BSB4-DLL-Enable.jpg +share/opencpn/doc/images/OCPN-BSB4-Install.jpg +share/opencpn/doc/images/OCPN-OptionsMenu.jpg +share/opencpn/doc/images/OD-Preferences-About.jpg +share/opencpn/doc/images/OD-Preferences-Boundary-Point.jpg +share/opencpn/doc/images/OD-Preferences-Boundary.jpg +share/opencpn/doc/images/OD-Preferences-DR-Point.jpg +share/opencpn/doc/images/OD-Preferences-DR.jpg +share/opencpn/doc/images/OD-Preferences-EBL.jpg +share/opencpn/doc/images/OD-Preferences-Path.jpg +share/opencpn/doc/images/OD-Preferences-Text-Point.jpg +share/opencpn/doc/images/OD-Preferences-dialog.jpg +share/opencpn/doc/images/OD-objects.jpg +share/opencpn/doc/images/OZ.jpg +share/opencpn/doc/images/OZ1.jpg share/opencpn/doc/images/OZ2-INT702.jpg -share/opencpn/doc/images/OZ2-INT702.png -share/opencpn/doc/images/Options-Charts-ChartFiles.png -share/opencpn/doc/images/Options-Charts-ChartGroups.png -share/opencpn/doc/images/Options-Charts-Tides.png -share/opencpn/doc/images/Options-Charts-VectorChartDisplay.png -share/opencpn/doc/images/Options-Connections-Network_0.png -share/opencpn/doc/images/Options-Connections-Serial_0.png -share/opencpn/doc/images/Options-Connections_zps80f51d7f.png -share/opencpn/doc/images/Options-Display-General.png -share/opencpn/doc/images/Options-Display-Units.png -share/opencpn/doc/images/Options-Plugins-32.png -share/opencpn/doc/images/Options-Plugins.png -share/opencpn/doc/images/Options-Ships-AisTargets.jpg -share/opencpn/doc/images/Options-Ships-OwnShip-Routes.png -share/opencpn/doc/images/Options-Ships-OwnShip.png -share/opencpn/doc/images/Options-UserInterface_zpsfc3672fb.png +share/opencpn/doc/images/Options-Chart-Buttons-ENC.jpg +share/opencpn/doc/images/Options-Chart-Buttons-RNC-Icon.jpg +share/opencpn/doc/images/Options-Charts-Icon.jpg +share/opencpn/doc/images/Options-Connection-Icon.jpg +share/opencpn/doc/images/Options-Connections-Network_0.jpg +share/opencpn/doc/images/Options-Connections_zps80f51d7f.jpg +share/opencpn/doc/images/Options-GPS-Orient-Icon.jpg +share/opencpn/doc/images/Options-Plugins-Icon.jpg +share/opencpn/doc/images/Options-Plugins.jpg +share/opencpn/doc/images/Options-Ships-OwnShip-Routes.jpg +share/opencpn/doc/images/Options-UserInterface_zpsfc3672fb.jpg share/opencpn/doc/images/ParticleMap.jpg +share/opencpn/doc/images/Polar-Pi-eliminate-zeros.jpg share/opencpn/doc/images/Prolific.jpg +share/opencpn/doc/images/Provisions.jpg share/opencpn/doc/images/Puerto_Morelos1.jpg -share/opencpn/doc/images/Puerto_Morelos2.png +share/opencpn/doc/images/Puerto_Morelos2.jpg share/opencpn/doc/images/Quilt1.jpg share/opencpn/doc/images/Quilt2.jpg -share/opencpn/doc/images/Quilt2.png share/opencpn/doc/images/Quilt3.jpg -share/opencpn/doc/images/Quilt3.png share/opencpn/doc/images/Quilt4.jpg -share/opencpn/doc/images/Quilt4.png -share/opencpn/doc/images/Reduce-Data.png -share/opencpn/doc/images/Reduce-Data1.png +share/opencpn/doc/images/Reduce-Data.jpg +share/opencpn/doc/images/Reduce-Data1.jpg +share/opencpn/doc/images/Right-Click-ENC-quilting.jpg +share/opencpn/doc/images/Right-Click-ENC-single-chart.jpg +share/opencpn/doc/images/Right-Click-RNC-quilting.jpg +share/opencpn/doc/images/Right-Click-RNC-single-chart.jpg share/opencpn/doc/images/Route-Properties.jpg -share/opencpn/doc/images/Route-Properties1.png -share/opencpn/doc/images/Route-Properties2.png +share/opencpn/doc/images/Route-Properties1.jpg +share/opencpn/doc/images/Route-Properties2.jpg share/opencpn/doc/images/Route-rollover.jpg -share/opencpn/doc/images/Route-rollover.png -share/opencpn/doc/images/Route21.png -share/opencpn/doc/images/Route23.png +share/opencpn/doc/images/Route21.jpg share/opencpn/doc/images/Routing1.jpg -share/opencpn/doc/images/Routing2.png -share/opencpn/doc/images/Routing3.png -share/opencpn/doc/images/Routing5.png -share/opencpn/doc/images/Routing7.png -share/opencpn/doc/images/Routing8.png -share/opencpn/doc/images/S63-3.png -share/opencpn/doc/images/S63message.png -share/opencpn/doc/images/S64usp.png -share/opencpn/doc/images/S65inst.png -share/opencpn/doc/images/SART1.png -share/opencpn/doc/images/SART3.png -share/opencpn/doc/images/SART4.png -share/opencpn/doc/images/SART5.png -share/opencpn/doc/images/SARTalarm.png -share/opencpn/doc/images/Sight-1-Degrees-Minutes-Uncertainty.png -share/opencpn/doc/images/Sight-2-Date-Time-Certainty-Shift.png -share/opencpn/doc/images/Sight-3-Configuration.png -share/opencpn/doc/images/Sight-4-Parameters.png -share/opencpn/doc/images/Sight-5-Calculations.png +share/opencpn/doc/images/Routing2.jpg +share/opencpn/doc/images/Routing3.jpg +share/opencpn/doc/images/Routing5.jpg +share/opencpn/doc/images/Routing7.jpg +share/opencpn/doc/images/Routing8.jpg +share/opencpn/doc/images/S-63-keys-permits.png +share/opencpn/doc/images/S-WDpi-01-Husky.jpg +share/opencpn/doc/images/S-WDpi-02.jpg +share/opencpn/doc/images/S-WDpi-03.jpg +share/opencpn/doc/images/S-WDpi-04.jpg +share/opencpn/doc/images/S-WDpi-04aa.jpg +share/opencpn/doc/images/S-WDpi-04b.jpg +share/opencpn/doc/images/S-WDpi-05.jpg +share/opencpn/doc/images/S-WDpi-06.jpg +share/opencpn/doc/images/S-WDpi-07.jpg +share/opencpn/doc/images/S-WDpi-08_0.jpg +share/opencpn/doc/images/S-WDpi-09.jpg +share/opencpn/doc/images/S-WDpi-10.jpg +share/opencpn/doc/images/S-WDpi-11.jpg +share/opencpn/doc/images/S-WDpi-12.jpg +share/opencpn/doc/images/S-WDpi-13_0.jpg +share/opencpn/doc/images/S-WDpi-14.jpg +share/opencpn/doc/images/S-WDpi-15.jpg +share/opencpn/doc/images/S-WDpi-16.jpg +share/opencpn/doc/images/S-WDpi-17.jpg +share/opencpn/doc/images/S-WDpi-18.jpg +share/opencpn/doc/images/S-WDpi-19.jpg +share/opencpn/doc/images/S-WDpi-20.jpg +share/opencpn/doc/images/S-WDpi-21_0.jpg +share/opencpn/doc/images/S-WDpi-22.jpg +share/opencpn/doc/images/S-WDpi-23.jpg +share/opencpn/doc/images/S-WDpi-24.jpg +share/opencpn/doc/images/S-WDpi-25.jpg +share/opencpn/doc/images/S-WDpi-26.jpg +share/opencpn/doc/images/S-WDpi-27.jpg +share/opencpn/doc/images/S-WDpi-28.jpg +share/opencpn/doc/images/S-WDpi-29.jpg +share/opencpn/doc/images/S-WDpi-30.jpg +share/opencpn/doc/images/S-WDpi-31.jpg +share/opencpn/doc/images/S-WDpi-32_0.jpg +share/opencpn/doc/images/S-WDpi-32a.jpg +share/opencpn/doc/images/S-WDpi-32b.jpg +share/opencpn/doc/images/S-WDpi-32c.jpg +share/opencpn/doc/images/S-WDpi-33.jpg +share/opencpn/doc/images/S-WDpi-34.jpg +share/opencpn/doc/images/S-WDpi-35.jpg +share/opencpn/doc/images/S-WDpi-36.jpg +share/opencpn/doc/images/S-WDpi-37.jpg +share/opencpn/doc/images/S-WDpi-38.jpg +share/opencpn/doc/images/S-WDpi-39.jpg +share/opencpn/doc/images/S-WDpi-40.jpg +share/opencpn/doc/images/S-WDpi-41.jpg +share/opencpn/doc/images/S-WDpi-42.jpg +share/opencpn/doc/images/S-WDpi-43.jpg +share/opencpn/doc/images/S-WDpi-44.jpg +share/opencpn/doc/images/S-WDpi-45.jpg +share/opencpn/doc/images/S-WDpi-46.jpg +share/opencpn/doc/images/S-WDpi-47.jpg +share/opencpn/doc/images/S-WDpi-48.jpg +share/opencpn/doc/images/S-WDpi-49_0.jpg +share/opencpn/doc/images/S-WDpi-50.jpg +share/opencpn/doc/images/S-WDpi-51.jpg +share/opencpn/doc/images/S-WDpi-52.jpg +share/opencpn/doc/images/S-WDpi-53_0.jpg +share/opencpn/doc/images/S-WDpi-54.jpg +share/opencpn/doc/images/S-WDpi-55.jpg +share/opencpn/doc/images/S-WDpi-56.jpg +share/opencpn/doc/images/S-WDpi-57.jpg +share/opencpn/doc/images/S-WDpi-58.jpg +share/opencpn/doc/images/S-WDpi-59_0.jpg +share/opencpn/doc/images/S-WDpi-60-0.jpg +share/opencpn/doc/images/S-WDpi-61-0.jpg +share/opencpn/doc/images/S-WDpi-62-0.jpg +share/opencpn/doc/images/S-WDpi-62-01.jpg +share/opencpn/doc/images/S-WDpi-62-02.jpg +share/opencpn/doc/images/S-WDpi-63_0.jpg +share/opencpn/doc/images/S-WDpi-64.jpg +share/opencpn/doc/images/S-WDpi-65.jpg +share/opencpn/doc/images/S-WDpi-66.jpg +share/opencpn/doc/images/S-WDpi-67.jpg +share/opencpn/doc/images/S-WDpi-68_0.jpg +share/opencpn/doc/images/S-WDpi-69.jpg +share/opencpn/doc/images/S-WDpi-70.jpg +share/opencpn/doc/images/S-WDpi-71.jpg +share/opencpn/doc/images/S-WDpi-72.jpg +share/opencpn/doc/images/S-WDpi-73.jpg +share/opencpn/doc/images/S-WDpi-AlarmAction.jpg +share/opencpn/doc/images/S-WDpi-slider.jpg +share/opencpn/doc/images/S63-3.jpg +share/opencpn/doc/images/S63message.jpg +share/opencpn/doc/images/S64usp.jpg +share/opencpn/doc/images/S65inst.jpg +share/opencpn/doc/images/SART1.jpg +share/opencpn/doc/images/SART3.jpg +share/opencpn/doc/images/SART4.jpg +share/opencpn/doc/images/SART5.jpg +share/opencpn/doc/images/SARTalarm.jpg +share/opencpn/doc/images/Settings-Ship-MMSI-Add-MMSI-Properties.jpg +share/opencpn/doc/images/Settings-Ship-MMSI-Less-than-Nine.jpg +share/opencpn/doc/images/Settings.jpg +share/opencpn/doc/images/Sight-1-Degrees-Minutes-Uncertainty.jpg +share/opencpn/doc/images/Sight-2-Date-Time-Certainty-Shift.jpg +share/opencpn/doc/images/Sight-3-Configuration.jpg +share/opencpn/doc/images/Sight-4-Parameters.jpg +share/opencpn/doc/images/Sight-5-Calculations.jpg share/opencpn/doc/images/TS1.jpg -share/opencpn/doc/images/TS2.png -share/opencpn/doc/images/TargetCPA.png -share/opencpn/doc/images/Tide-interference.png -share/opencpn/doc/images/Tide1.png -share/opencpn/doc/images/Tide2.png -share/opencpn/doc/images/Tide4.png -share/opencpn/doc/images/Tide5.png -share/opencpn/doc/images/Tide6.png -share/opencpn/doc/images/Tide7.png -share/opencpn/doc/images/ToolBAR22.png +share/opencpn/doc/images/TS2.jpg +share/opencpn/doc/images/TargetCPA.jpg +share/opencpn/doc/images/Telechargement_nvc_pi-1.jpg +share/opencpn/doc/images/Tide-interference.jpg +share/opencpn/doc/images/Tide1.jpg +share/opencpn/doc/images/Tide2.jpg +share/opencpn/doc/images/Tide4.jpg +share/opencpn/doc/images/Tide5.jpg +share/opencpn/doc/images/Tide6.jpg +share/opencpn/doc/images/Tide7.jpg +share/opencpn/doc/images/ToolBAR22.jpg +share/opencpn/doc/images/Toolbar-AIS.jpg +share/opencpn/doc/images/Toolbar-Options-Charts-Chart-Files.jpg +share/opencpn/doc/images/Toolbar-Options-Charts-Chart-Groups.jpg +share/opencpn/doc/images/Toolbar-Options-Charts-Tides-Currents.jpg +share/opencpn/doc/images/Toolbar-Options-Charts-Vector-Chart-Display.jpg +share/opencpn/doc/images/Toolbar-Options-Connections-Net-1.jpg +share/opencpn/doc/images/Toolbar-Options-Connections-Net-2.jpg +share/opencpn/doc/images/Toolbar-Options-Display-Advanced.jpg +share/opencpn/doc/images/Toolbar-Options-Display-General_0.jpg +share/opencpn/doc/images/Toolbar-Options-Display-Units_0.jpg +share/opencpn/doc/images/Toolbar-Options-Ships-AIS-Targets-1.jpg +share/opencpn/doc/images/Toolbar-Options-Ships-AIS-Targets-2.jpg +share/opencpn/doc/images/Toolbar-Options-Ships-Own-Ship.jpg +share/opencpn/doc/images/Toolbar-Options-User-Interface.jpg +share/opencpn/doc/images/Units.jpg share/opencpn/doc/images/VDR-AIS_Simulation-2.jpg -share/opencpn/doc/images/VDR-AIS_Simulation-2.png share/opencpn/doc/images/WH.jpg -share/opencpn/doc/images/WH1.png -share/opencpn/doc/images/WH2.png -share/opencpn/doc/images/WMM1.png -share/opencpn/doc/images/WMM2.png -share/opencpn/doc/images/WMM3.png -share/opencpn/doc/images/WMM4.png -share/opencpn/doc/images/WMM5.png -share/opencpn/doc/images/WMM6.png -share/opencpn/doc/images/WMM7.png -share/opencpn/doc/images/WMM8.png -share/opencpn/doc/images/WMM9.png +share/opencpn/doc/images/WH1.jpg +share/opencpn/doc/images/WH2.jpg +share/opencpn/doc/images/WMM1.jpg +share/opencpn/doc/images/WMM2.jpg +share/opencpn/doc/images/WMM3.jpg +share/opencpn/doc/images/WMM4.jpg +share/opencpn/doc/images/WMM5.jpg +share/opencpn/doc/images/WMM6.jpg +share/opencpn/doc/images/WMM7.jpg +share/opencpn/doc/images/WMM8.jpg +share/opencpn/doc/images/WMM9.jpg +share/opencpn/doc/images/Waypoint-Rings-Bottom.jpg +share/opencpn/doc/images/Waypoint-Rings.jpg +share/opencpn/doc/images/Waypoint-Rings_0.jpg share/opencpn/doc/images/WeatherRoutingConfiguration.jpg share/opencpn/doc/images/WeatherRoutingConfiguration1.jpg -share/opencpn/doc/images/Werror1.png -share/opencpn/doc/images/Werror2.png -share/opencpn/doc/images/Werror3.png -share/opencpn/doc/images/Wpt21.png +share/opencpn/doc/images/Werror1.jpg +share/opencpn/doc/images/Werror2.jpg +share/opencpn/doc/images/Werror3.jpg +share/opencpn/doc/images/Wpt21.jpg share/opencpn/doc/images/Wx-0-Retrieve-Internet-Overlaid-on-Chart.jpg -share/opencpn/doc/images/Wx-1-File-Menu.png -share/opencpn/doc/images/Wx-2-Retrieve-Menu.png -share/opencpn/doc/images/Wx-A1-Ret-AudioCapture-Recieving.png -share/opencpn/doc/images/Wx-B1-Ret-HFRadioSch-FilterTab-Menu.png -share/opencpn/doc/images/Wx-B2-Ret-HFRadioSch-AlarmTab-Menu.png -share/opencpn/doc/images/Wx-B3-Ret-HFRadioSch-CaptureOptionsTab-Menu.png +share/opencpn/doc/images/Wx-1-File-Menu.jpg +share/opencpn/doc/images/Wx-2-Retrieve-Menu.jpg +share/opencpn/doc/images/Wx-A1-Ret-AudioCapture-Recieving.jpg +share/opencpn/doc/images/Wx-B1-Ret-HFRadioSch-FilterTab-Menu.jpg +share/opencpn/doc/images/Wx-B2-Ret-HFRadioSch-AlarmTab-Menu.jpg +share/opencpn/doc/images/Wx-B3-Ret-HFRadioSch-CaptureOptionsTab-Menu.jpg share/opencpn/doc/images/Wx-B4-Ret-HFRadioSch-InfoTab-Menu.jpg share/opencpn/doc/images/Wx-C0-Ret-Inet-Menu-1_0.jpg share/opencpn/doc/images/Wx-C1-Ret-Inet-Aviation-Americas.jpg @@ -350,324 +555,377 @@ share/opencpn/doc/images/Wx-C4-Ret-Inet-Noaa-Atlantic-24hr-500mb.jpg share/opencpn/doc/images/Wx-C5-Ret-Inet-Noaa-Atlantic-24hrSurf.jpg share/opencpn/doc/images/Wx-C6-Ret-Inet-Passage-NE.jpg share/opencpn/doc/images/Wx-C7-Ret-Inet-Passage-NovaSoctia.jpg -share/opencpn/doc/images/Wx-C8-Ret-Inet-Downloaded-List.png -share/opencpn/doc/images/ZeroXTE.png -share/opencpn/doc/images/aa-mob.png -share/opencpn/doc/images/action-filter.png -share/opencpn/doc/images/activeroutewpt.png -share/opencpn/doc/images/aground.png +share/opencpn/doc/images/Wx-C8-Ret-Inet-Downloaded-List.jpg +share/opencpn/doc/images/ZeroXTE.jpg +share/opencpn/doc/images/aa-mob.jpg +share/opencpn/doc/images/action-filter.jpg +share/opencpn/doc/images/activeroutewpt.jpg +share/opencpn/doc/images/add_options.jpg +share/opencpn/doc/images/after_clipboard.jpg +share/opencpn/doc/images/aground.jpg share/opencpn/doc/images/ais-alarm.jpg -share/opencpn/doc/images/ais-green.png -share/opencpn/doc/images/ais-grey.png -share/opencpn/doc/images/ais-lemon.png -share/opencpn/doc/images/ais-lost.png -share/opencpn/doc/images/ais-moor.png -share/opencpn/doc/images/ais-red.png -share/opencpn/doc/images/ais-yellow.png -share/opencpn/doc/images/ais.png -share/opencpn/doc/images/ais11.png -share/opencpn/doc/images/ais2.png -share/opencpn/doc/images/ais_alarm.png -share/opencpn/doc/images/ais_alive_active.png -share/opencpn/doc/images/ais_disabled.png -share/opencpn/doc/images/ais_supressed.png -share/opencpn/doc/images/aisfocus.png -share/opencpn/doc/images/anch.png +share/opencpn/doc/images/ais-green.jpg +share/opencpn/doc/images/ais-grey.jpg +share/opencpn/doc/images/ais-lemon.jpg +share/opencpn/doc/images/ais-lost.jpg +share/opencpn/doc/images/ais-moor.jpg +share/opencpn/doc/images/ais-red.jpg +share/opencpn/doc/images/ais-yellow.jpg +share/opencpn/doc/images/ais.jpg +share/opencpn/doc/images/ais11.jpg +share/opencpn/doc/images/ais2.jpg +share/opencpn/doc/images/ais_alarm.jpg +share/opencpn/doc/images/ais_alive_active.jpg +share/opencpn/doc/images/ais_disabled.jpg +share/opencpn/doc/images/ais_supressed.jpg +share/opencpn/doc/images/aisfocus.jpg +share/opencpn/doc/images/anch.jpg share/opencpn/doc/images/anegpass.jpg -share/opencpn/doc/images/aprs.png +share/opencpn/doc/images/aprs.jpg share/opencpn/doc/images/area-query.jpg -share/opencpn/doc/images/arpa1.png -share/opencpn/doc/images/arpa2.png -share/opencpn/doc/images/arpa3.png -share/opencpn/doc/images/arpa4.png -share/opencpn/doc/images/aton_off.png -share/opencpn/doc/images/aton_std.png -share/opencpn/doc/images/aton_virt.png -share/opencpn/doc/images/attachment.jpeg -share/opencpn/doc/images/attachment_002.jpeg -share/opencpn/doc/images/attachment_003.jpeg -share/opencpn/doc/images/auto-follow_0.png -share/opencpn/doc/images/base.png -share/opencpn/doc/images/base_raster_quilt.png -share/opencpn/doc/images/base_raster_single.png -share/opencpn/doc/images/base_vector_quilt.png -share/opencpn/doc/images/base_vectot_single1.png -share/opencpn/doc/images/basestn.png -share/opencpn/doc/images/bluesquare.png -share/opencpn/doc/images/br24_advanced_emu_osx.png -share/opencpn/doc/images/br24_button.png -share/opencpn/doc/images/br24_controls.png +share/opencpn/doc/images/arpa1.jpg +share/opencpn/doc/images/arpa2.jpg +share/opencpn/doc/images/arpa3.jpg +share/opencpn/doc/images/arpa4.jpg +share/opencpn/doc/images/aton_off.jpg +share/opencpn/doc/images/aton_std.jpg +share/opencpn/doc/images/aton_virt.jpg +share/opencpn/doc/images/attachment.jpg +share/opencpn/doc/images/attachment_002.jpg +share/opencpn/doc/images/attachment_003.jpg +share/opencpn/doc/images/auto-follow_0.jpg +share/opencpn/doc/images/base.jpg +share/opencpn/doc/images/basestn.jpg +share/opencpn/doc/images/bluesquare.jpg +share/opencpn/doc/images/boundaryPoint.jpg +share/opencpn/doc/images/br24_advanced_emu_osx.jpg +share/opencpn/doc/images/br24_button.jpg +share/opencpn/doc/images/br24_controls.jpg share/opencpn/doc/images/br24_emulator.jpg -share/opencpn/doc/images/br24_overlay_messages.png -share/opencpn/doc/images/br24_plugin_11_status.png +share/opencpn/doc/images/br24_overlay_messages.jpg +share/opencpn/doc/images/br24_plugin_11_status.jpg share/opencpn/doc/images/br24_preferences_097.jpg -share/opencpn/doc/images/br24_preferences_097.png -share/opencpn/doc/images/bramb.png -share/opencpn/doc/images/bramb1.png -share/opencpn/doc/images/bramb2.png +share/opencpn/doc/images/bramb.jpg +share/opencpn/doc/images/bramb1.jpg +share/opencpn/doc/images/bramb2.jpg share/opencpn/doc/images/brazil.jpg -share/opencpn/doc/images/bud-icon.png -share/opencpn/doc/images/buttons-select.png -share/opencpn/doc/images/classB.png +share/opencpn/doc/images/bud-icon.jpg +share/opencpn/doc/images/buttons-select.jpg +share/opencpn/doc/images/classB.jpg share/opencpn/doc/images/climatology1thumb.jpg share/opencpn/doc/images/climatologyctr_0.jpg -share/opencpn/doc/images/cm93.png -share/opencpn/doc/images/cm93grp.png -share/opencpn/doc/images/colscheme.png -share/opencpn/doc/images/composite.png -share/opencpn/doc/images/composite1.png +share/opencpn/doc/images/clipboard_gpsbabel.jpg +share/opencpn/doc/images/cm93.jpg +share/opencpn/doc/images/cm93grp.jpg +share/opencpn/doc/images/colscheme.jpg +share/opencpn/doc/images/composite.jpg +share/opencpn/doc/images/composite1.jpg share/opencpn/doc/images/course-up.jpg -share/opencpn/doc/images/course-up_0.png -share/opencpn/doc/images/cur1_0.png -share/opencpn/doc/images/current-digits.png -share/opencpn/doc/images/current.png -share/opencpn/doc/images/current1.png -share/opencpn/doc/images/currents_box.png -share/opencpn/doc/images/dark-green.png +share/opencpn/doc/images/course-up_0.jpg +share/opencpn/doc/images/current-digits.jpg +share/opencpn/doc/images/current.jpg +share/opencpn/doc/images/current1.jpg +share/opencpn/doc/images/currents_box.jpg +share/opencpn/doc/images/dark-green.jpg share/opencpn/doc/images/dash-big-fonts.jpg share/opencpn/doc/images/dash-drag.jpg -share/opencpn/doc/images/dash-select-instr_0.png -share/opencpn/doc/images/dash-set.png +share/opencpn/doc/images/dash-select-instr_0.jpg +share/opencpn/doc/images/dash-set.jpg share/opencpn/doc/images/dashboard-docked32.jpg -share/opencpn/doc/images/dashboard-docked32.png -share/opencpn/doc/images/dashboard-plugin32.png +share/opencpn/doc/images/dashboard-plugin32.jpg share/opencpn/doc/images/dashboard32.jpg -share/opencpn/doc/images/dashboard32.png -share/opencpn/doc/images/dashn3.png -share/opencpn/doc/images/dataconnections4.png +share/opencpn/doc/images/dashn3.jpg share/opencpn/doc/images/ddd1.jpg share/opencpn/doc/images/ddd2.jpg -share/opencpn/doc/images/ddd2.png share/opencpn/doc/images/ddd3.jpg -share/opencpn/doc/images/ddd3.png share/opencpn/doc/images/ddd4.jpg -share/opencpn/doc/images/ddd4.png -share/opencpn/doc/images/dh.png -share/opencpn/doc/images/dim1.png -share/opencpn/doc/images/dpare.png -share/opencpn/doc/images/dsc-alert.png +share/opencpn/doc/images/dh.jpg +share/opencpn/doc/images/dim1.jpg +share/opencpn/doc/images/dpare.jpg +share/opencpn/doc/images/dsc-alert.jpg share/opencpn/doc/images/dsc-list.jpg -share/opencpn/doc/images/dsc-not-ok.png -share/opencpn/doc/images/dsc-ok.png -share/opencpn/doc/images/dsc-ok2.png +share/opencpn/doc/images/dsc-not-ok.jpg +share/opencpn/doc/images/dsc-ok.jpg +share/opencpn/doc/images/dsc-ok2.jpg share/opencpn/doc/images/dsc_distress.jpg -share/opencpn/doc/images/dse1.png -share/opencpn/doc/images/dyngnaset.png +share/opencpn/doc/images/dse1.jpg +share/opencpn/doc/images/dyngnaset.jpg share/opencpn/doc/images/europe1.jpg -share/opencpn/doc/images/europe3.png -share/opencpn/doc/images/explain.png -share/opencpn/doc/images/eye33.png -share/opencpn/doc/images/filtering.png -share/opencpn/doc/images/fishing.png -share/opencpn/doc/images/folderoptions.png -share/opencpn/doc/images/font.png -share/opencpn/doc/images/font1.png +share/opencpn/doc/images/europe3.jpg +share/opencpn/doc/images/explain.jpg +share/opencpn/doc/images/export_dr_gpx.jpg +share/opencpn/doc/images/export_route.jpg +share/opencpn/doc/images/eye33.jpg +share/opencpn/doc/images/file_gpsbabel.jpg +share/opencpn/doc/images/filtering.jpg +share/opencpn/doc/images/fishing.jpg +share/opencpn/doc/images/folderoptions.jpg +share/opencpn/doc/images/font.jpg +share/opencpn/doc/images/font1.jpg share/opencpn/doc/images/gc-comp.jpg -share/opencpn/doc/images/gc1.png -share/opencpn/doc/images/gc3.png -share/opencpn/doc/images/gc4.png -share/opencpn/doc/images/gc6.png -share/opencpn/doc/images/gc7.png -share/opencpn/doc/images/gc8.png +share/opencpn/doc/images/gc1.jpg +share/opencpn/doc/images/gc3.jpg +share/opencpn/doc/images/gc4.jpg +share/opencpn/doc/images/gc6.jpg +share/opencpn/doc/images/gc7.jpg +share/opencpn/doc/images/gc8.jpg share/opencpn/doc/images/gdb.jpg share/opencpn/doc/images/gdb1.jpg -share/opencpn/doc/images/gl.png -share/opencpn/doc/images/gps1.png -share/opencpn/doc/images/gps2.png -share/opencpn/doc/images/gps3.png -share/opencpn/doc/images/gpsGrn.png -share/opencpn/doc/images/gpsRed.png -share/opencpn/doc/images/gpsd-con1.png +share/opencpn/doc/images/gl.jpg +share/opencpn/doc/images/gps1.jpg +share/opencpn/doc/images/gps2.jpg +share/opencpn/doc/images/gps3.jpg +share/opencpn/doc/images/gpsGrn.jpg +share/opencpn/doc/images/gpsRed.jpg +share/opencpn/doc/images/gpsd-con1.jpg share/opencpn/doc/images/gpsg_buddy.jpg -share/opencpn/doc/images/gradar_domecont.png -share/opencpn/doc/images/gradar_icon_green.png -share/opencpn/doc/images/gradar_icon_red.png -share/opencpn/doc/images/gradar_noisecont.png -share/opencpn/doc/images/gradar_opcont.png -share/opencpn/doc/images/gradar_rangecont.png -share/opencpn/doc/images/gradar_rightclick.png -share/opencpn/doc/images/gray-nogps.png -share/opencpn/doc/images/grib.png -share/opencpn/doc/images/grib2.png -share/opencpn/doc/images/grib_0.png +share/opencpn/doc/images/gradar_domecont.jpg +share/opencpn/doc/images/gradar_icon_green.jpg +share/opencpn/doc/images/gradar_icon_red.jpg +share/opencpn/doc/images/gradar_log.jpg +share/opencpn/doc/images/gradar_noisecont.jpg +share/opencpn/doc/images/gradar_opcont.jpg +share/opencpn/doc/images/gradar_optionenable.jpg +share/opencpn/doc/images/gradar_rangecont.jpg +share/opencpn/doc/images/gradar_rightclick.jpg +share/opencpn/doc/images/gray-nogps.jpg +share/opencpn/doc/images/grib.jpg +share/opencpn/doc/images/grib_0.jpg share/opencpn/doc/images/gribplugin33.jpg -share/opencpn/doc/images/gribplugin33.png -share/opencpn/doc/images/group.jpeg -share/opencpn/doc/images/halfadegree.png -share/opencpn/doc/images/havannah-ext.png -share/opencpn/doc/images/havannah-noext.png -share/opencpn/doc/images/headingline1.png -share/opencpn/doc/images/help.png -share/opencpn/doc/images/help_002.png -share/opencpn/doc/images/help_1.png -share/opencpn/doc/images/hidden-quilt.png -share/opencpn/doc/images/highlight.png -share/opencpn/doc/images/hotkeys3.gif -share/opencpn/doc/images/hsc.png -share/opencpn/doc/images/ifeahche_1.png -share/opencpn/doc/images/in1.png -share/opencpn/doc/images/in11.png -share/opencpn/doc/images/in2.png -share/opencpn/doc/images/in22.png -share/opencpn/doc/images/incwpt.png -share/opencpn/doc/images/incwpt1.png -share/opencpn/doc/images/incwpt2.png -share/opencpn/doc/images/incwpt3.png -share/opencpn/doc/images/incwpt4.png -share/opencpn/doc/images/incwpt5.png -share/opencpn/doc/images/incwpt6.png +share/opencpn/doc/images/group.jpg +share/opencpn/doc/images/halfadegree.jpg +share/opencpn/doc/images/havannah-ext.jpg +share/opencpn/doc/images/havannah-noext.jpg +share/opencpn/doc/images/headingline1.jpg +share/opencpn/doc/images/help.jpg +share/opencpn/doc/images/help_002.jpg +share/opencpn/doc/images/help_1.jpg +share/opencpn/doc/images/hidden-quilt.jpg +share/opencpn/doc/images/highlight.jpg +share/opencpn/doc/images/hotkeys3.jpg +share/opencpn/doc/images/hotkeys3_(2).jpg +share/opencpn/doc/images/hotkeys3_(3).jpg +share/opencpn/doc/images/hotkeys3_(4).jpg +share/opencpn/doc/images/hotkeys3_(5).jpg +share/opencpn/doc/images/hotkeys3_(6).jpg +share/opencpn/doc/images/hsc.jpg +share/opencpn/doc/images/ifeahche_1.jpg +share/opencpn/doc/images/import_dr_gpx.jpg +share/opencpn/doc/images/import_dr_gpx_route_manager.jpg +share/opencpn/doc/images/import_gpx.jpg +share/opencpn/doc/images/in1.jpg +share/opencpn/doc/images/in11.jpg +share/opencpn/doc/images/in2.jpg +share/opencpn/doc/images/in22.jpg +share/opencpn/doc/images/incwpt.jpg +share/opencpn/doc/images/incwpt1.jpg +share/opencpn/doc/images/incwpt2.jpg +share/opencpn/doc/images/incwpt3.jpg +share/opencpn/doc/images/incwpt4.jpg +share/opencpn/doc/images/incwpt5.jpg +share/opencpn/doc/images/incwpt6.jpg share/opencpn/doc/images/incwpt7.jpg -share/opencpn/doc/images/incwpt7.png -share/opencpn/doc/images/incwpt8.png -share/opencpn/doc/images/inland-blue.png -share/opencpn/doc/images/last-button.png -share/opencpn/doc/images/layer-prop.png -share/opencpn/doc/images/layer-prop1.png -share/opencpn/doc/images/layer-track2.png +share/opencpn/doc/images/incwpt8.jpg +share/opencpn/doc/images/inland-blue.jpg +share/opencpn/doc/images/kml_clipboard.jpg +share/opencpn/doc/images/last-button.jpg +share/opencpn/doc/images/layer-prop.jpg +share/opencpn/doc/images/layer-prop1.jpg +share/opencpn/doc/images/layer-track2.jpg share/opencpn/doc/images/layer22.jpg -share/opencpn/doc/images/layer22.png -share/opencpn/doc/images/layer_route1.png -share/opencpn/doc/images/layers-show2.png -share/opencpn/doc/images/lockwpt.png -share/opencpn/doc/images/lowprec.png -share/opencpn/doc/images/lowprec1.png -share/opencpn/doc/images/mad-track.png -share/opencpn/doc/images/mad-track2.png -share/opencpn/doc/images/magnetic_show.png -share/opencpn/doc/images/marina_grn.png -share/opencpn/doc/images/mark10.png -share/opencpn/doc/images/mark2.png -share/opencpn/doc/images/mark3.png +share/opencpn/doc/images/layer_route1.jpg +share/opencpn/doc/images/layers-show2.jpg +share/opencpn/doc/images/lockwpt.jpg +share/opencpn/doc/images/lowprec.jpg +share/opencpn/doc/images/lowprec1.jpg +share/opencpn/doc/images/mad-track.jpg +share/opencpn/doc/images/mad-track2.jpg +share/opencpn/doc/images/magnetic_show.jpg +share/opencpn/doc/images/main_screen_start.jpg +share/opencpn/doc/images/marina_grn.jpg +share/opencpn/doc/images/mark-create.jpg +share/opencpn/doc/images/mark-shipwreck.jpg +share/opencpn/doc/images/mark-triangle.jpg +share/opencpn/doc/images/mark-undo-create-waypoint.jpg +share/opencpn/doc/images/mark10.jpg +share/opencpn/doc/images/mark2.jpg +share/opencpn/doc/images/mark3.jpg share/opencpn/doc/images/mark4.jpg -share/opencpn/doc/images/mark4.png -share/opencpn/doc/images/mark6.png -share/opencpn/doc/images/mark7.png -share/opencpn/doc/images/mark8.png -share/opencpn/doc/images/mark9.png -share/opencpn/doc/images/meta.png -share/opencpn/doc/images/mob_btn.png -share/opencpn/doc/images/moored.png -share/opencpn/doc/images/multileg.png -share/opencpn/doc/images/nmea-debug-dsc.png -share/opencpn/doc/images/nogl.png -share/opencpn/doc/images/north-up.png -share/opencpn/doc/images/not_participate.png -share/opencpn/doc/images/notundcom.png -share/opencpn/doc/images/objq.png +share/opencpn/doc/images/mark6.jpg +share/opencpn/doc/images/mark7.jpg +share/opencpn/doc/images/mark8.jpg +share/opencpn/doc/images/mark9.jpg +share/opencpn/doc/images/menu_bar.jpg +share/opencpn/doc/images/meta.jpg +share/opencpn/doc/images/mob_btn.jpg +share/opencpn/doc/images/moored.jpg +share/opencpn/doc/images/multileg.jpg +share/opencpn/doc/images/nmea-converter.jpg +share/opencpn/doc/images/nmea-debug-dsc.jpg +share/opencpn/doc/images/nogl.jpg +share/opencpn/doc/images/north-up.jpg +share/opencpn/doc/images/not_participate.jpg +share/opencpn/doc/images/notundcom.jpg +share/opencpn/doc/images/ob_options.jpg +share/opencpn/doc/images/ob_using%20kml.jpg +share/opencpn/doc/images/objq.jpg share/opencpn/doc/images/offsets2.jpg -share/opencpn/doc/images/offsets2.png share/opencpn/doc/images/offsets4.jpg -share/opencpn/doc/images/offsets4.png share/opencpn/doc/images/offsets5.jpg -share/opencpn/doc/images/offsets5.png share/opencpn/doc/images/offsets6.jpg -share/opencpn/doc/images/offsets6.png share/opencpn/doc/images/opencpn.jpg -share/opencpn/doc/images/opencpn2.png -share/opencpn/doc/images/opencpn_002.png -share/opencpn/doc/images/options-Ships2.png -share/opencpn/doc/images/options-Ships3.png -share/opencpn/doc/images/options-Ships4.png -share/opencpn/doc/images/options-Ships5.png -share/opencpn/doc/images/options-Ships6.png -share/opencpn/doc/images/options-charts-tides-2.png -share/opencpn/doc/images/options-ships-ais.png -share/opencpn/doc/images/options-user2.png -share/opencpn/doc/images/orig.png -share/opencpn/doc/images/orig1.png -share/opencpn/doc/images/orig2.png -share/opencpn/doc/images/out11.png -share/opencpn/doc/images/out12.png -share/opencpn/doc/images/out21.png -share/opencpn/doc/images/out22.png +share/opencpn/doc/images/opencpn2.jpg +share/opencpn/doc/images/opencpn4.jpg +share/opencpn/doc/images/opencpn_002.jpg +share/opencpn/doc/images/options-Ships2.jpg +share/opencpn/doc/images/options-Ships4.jpg +share/opencpn/doc/images/options-Ships6.jpg +share/opencpn/doc/images/orig.jpg +share/opencpn/doc/images/orig1.jpg +share/opencpn/doc/images/orig2.jpg +share/opencpn/doc/images/ot_browse_button.jpg +share/opencpn/doc/images/ot_interval_select.jpg +share/opencpn/doc/images/ot_next_button.jpg +share/opencpn/doc/images/ot_now_button.jpg +share/opencpn/doc/images/ot_preferences.jpg +share/opencpn/doc/images/ot_select_button.jpg +share/opencpn/doc/images/ot_toolbar_icon.jpg +share/opencpn/doc/images/out11.jpg +share/opencpn/doc/images/out12.jpg +share/opencpn/doc/images/out21.jpg +share/opencpn/doc/images/out22.jpg share/opencpn/doc/images/overzoom.jpg share/opencpn/doc/images/overzoom2.jpg -share/opencpn/doc/images/overzoom2.png -share/opencpn/doc/images/own4.png -share/opencpn/doc/images/own5.png -share/opencpn/doc/images/own_vector.png -share/opencpn/doc/images/pencil.png -share/opencpn/doc/images/pencil2.png +share/opencpn/doc/images/own4.jpg +share/opencpn/doc/images/own5.jpg +share/opencpn/doc/images/own_vector.jpg +share/opencpn/doc/images/pencil.jpg +share/opencpn/doc/images/pencil2.jpg share/opencpn/doc/images/plan1.jpg share/opencpn/doc/images/plan2.jpg -share/opencpn/doc/images/plan2.png share/opencpn/doc/images/plan5.jpg -share/opencpn/doc/images/plan5.png -share/opencpn/doc/images/polyconic.png -share/opencpn/doc/images/portable.png -share/opencpn/doc/images/print.png -share/opencpn/doc/images/printroute.png -share/opencpn/doc/images/quilt-ref.png +share/opencpn/doc/images/polyconic.jpg +share/opencpn/doc/images/portable.jpg +share/opencpn/doc/images/ppa_1.jpg +share/opencpn/doc/images/ppa_2.jpg +share/opencpn/doc/images/ppa_3.jpg +share/opencpn/doc/images/ppa_4.jpg +share/opencpn/doc/images/ppa_5.jpg +share/opencpn/doc/images/ppa_6.jpg +share/opencpn/doc/images/print.jpg +share/opencpn/doc/images/printroute.jpg +share/opencpn/doc/images/quilt-ref.jpg share/opencpn/doc/images/r820t.jpg -share/opencpn/doc/images/rad13.jpeg +share/opencpn/doc/images/rad13.jpg share/opencpn/doc/images/rasteroverz.jpg -share/opencpn/doc/images/rc_active-route.png -share/opencpn/doc/images/rc_wpt-del-mv.png -share/opencpn/doc/images/red-gps.png -share/opencpn/doc/images/restrman_1.png -share/opencpn/doc/images/rollover.png -share/opencpn/doc/images/route-button.png -share/opencpn/doc/images/route-legs.png -share/opencpn/doc/images/route-legs1.png -share/opencpn/doc/images/route.png -share/opencpn/doc/images/route_002.png -share/opencpn/doc/images/route_focus3.png -share/opencpn/doc/images/route_manager.png -share/opencpn/doc/images/route_plugin.png -share/opencpn/doc/images/routing6.png -share/opencpn/doc/images/rtlsdr.png +share/opencpn/doc/images/rc_wpt-del-mv.jpg +share/opencpn/doc/images/red-gps.jpg +share/opencpn/doc/images/restrman_1.jpg +share/opencpn/doc/images/rollover.jpg +share/opencpn/doc/images/route-button.jpg +share/opencpn/doc/images/route-legs.jpg +share/opencpn/doc/images/route-legs1.jpg +share/opencpn/doc/images/route.jpg +share/opencpn/doc/images/route_002.jpg +share/opencpn/doc/images/route_manager.jpg +share/opencpn/doc/images/route_plugin.jpg +share/opencpn/doc/images/routing6.jpg +share/opencpn/doc/images/rtlsdr.jpg share/opencpn/doc/images/sart-alarm2.jpg -share/opencpn/doc/images/sart-alarm2.png -share/opencpn/doc/images/sart-testing.png -share/opencpn/doc/images/scin.png -share/opencpn/doc/images/scout.png -share/opencpn/doc/images/seg.png -share/opencpn/doc/images/sentence-filters.png -share/opencpn/doc/images/sentence-filters1.png -share/opencpn/doc/images/sentence-filters2.png -share/opencpn/doc/images/settings.png -share/opencpn/doc/images/settings_002.png -share/opencpn/doc/images/settings_003.png -share/opencpn/doc/images/ship_grey.png -share/opencpn/doc/images/ship_red.png -share/opencpn/doc/images/skewed.png -share/opencpn/doc/images/skewed32.png -share/opencpn/doc/images/sounding.png -share/opencpn/doc/images/stXhole1.png -share/opencpn/doc/images/start.png -share/opencpn/doc/images/start1.png -share/opencpn/doc/images/start2.png +share/opencpn/doc/images/sart-testing.jpg +share/opencpn/doc/images/scin.jpg +share/opencpn/doc/images/scout.jpg +share/opencpn/doc/images/seg.jpg +share/opencpn/doc/images/sentence-filters.jpg +share/opencpn/doc/images/sentence-filters1.jpg +share/opencpn/doc/images/sentence-filters2.jpg +share/opencpn/doc/images/settings_002.jpg +share/opencpn/doc/images/settings_003.jpg +share/opencpn/doc/images/ship_grey.jpg +share/opencpn/doc/images/ship_red.jpg +share/opencpn/doc/images/show_dr_gpx.jpg +share/opencpn/doc/images/skewed.jpg +share/opencpn/doc/images/sounding.jpg +share/opencpn/doc/images/stXhole1.jpg +share/opencpn/doc/images/start.jpg +share/opencpn/doc/images/start1.jpg share/opencpn/doc/images/start3.jpg -share/opencpn/doc/images/start3.png -share/opencpn/doc/images/status-bar.png -share/opencpn/doc/images/std-grib.png +share/opencpn/doc/images/status-bar.jpg +share/opencpn/doc/images/std-grib.jpg share/opencpn/doc/images/swlook.jpg -share/opencpn/doc/images/text.png -share/opencpn/doc/images/tide-select1.png -share/opencpn/doc/images/tide-select2.png -share/opencpn/doc/images/tide.png -share/opencpn/doc/images/tmerc.png -share/opencpn/doc/images/tongue.gif -share/opencpn/doc/images/toolbar-2.png -share/opencpn/doc/images/track-pressed.png -share/opencpn/doc/images/track-prop1.png -share/opencpn/doc/images/track_off.png -share/opencpn/doc/images/tracks.png -share/opencpn/doc/images/trail.png -share/opencpn/doc/images/us_rnc_charts_structure.png -share/opencpn/doc/images/vdr-control.png -share/opencpn/doc/images/vdr-icons.png +share/opencpn/doc/images/text.jpg +share/opencpn/doc/images/tide-select1.jpg +share/opencpn/doc/images/tide-select2.jpg +share/opencpn/doc/images/tide.jpg +share/opencpn/doc/images/tmerc.jpg +share/opencpn/doc/images/tongue.jpg +share/opencpn/doc/images/toolbar-2.jpg +share/opencpn/doc/images/tools_plugins.jpg +share/opencpn/doc/images/track-pressed.jpg +share/opencpn/doc/images/track-prop1.jpg +share/opencpn/doc/images/track_off.jpg +share/opencpn/doc/images/tracks.jpg +share/opencpn/doc/images/trail.jpg +share/opencpn/doc/images/us_rnc_charts_structure.jpg +share/opencpn/doc/images/v05_settings.jpg +share/opencpn/doc/images/vdr-control.jpg +share/opencpn/doc/images/vdr-icons.jpg share/opencpn/doc/images/vecoverz.jpg -share/opencpn/doc/images/vector-light.png +share/opencpn/doc/images/vector-light.jpg +share/opencpn/doc/images/waypoint-active.jpg +share/opencpn/doc/images/waypoint-delete.jpg share/opencpn/doc/images/weather_route_data_types_1.jpg -share/opencpn/doc/images/wpt_focus2.png -share/opencpn/doc/images/zoomin.png -share/opencpn/doc/images/zoomout.png +share/opencpn/doc/images/wpt_focus2.jpg +share/opencpn/doc/images/wwm.jpg +share/opencpn/doc/images/xxmtamessage2.jpg +share/opencpn/doc/images/zoomin.jpg +share/opencpn/doc/images/zoomout.jpg share/opencpn/doc/readme share/opencpn/gshhs/poly-c-1.dat share/opencpn/gshhs/wdb_borders_c.b share/opencpn/gshhs/wdb_rivers_c.b share/opencpn/license.txt +share/opencpn/plugins/chartdldr_pi/data/chart_sources.xml +share/opencpn/plugins/chartdldr_pi/data/doc/03-Chart-Downloader-Tab-First-Time.png +share/opencpn/plugins/chartdldr_pi/data/doc/04-AddNewChartSource-Predefined.png +share/opencpn/plugins/chartdldr_pi/data/doc/05-PleaseUpdate.png +share/opencpn/plugins/chartdldr_pi/data/doc/08-AfterDownloading.png +share/opencpn/plugins/chartdldr_pi/data/doc/12-Add-Edit-Custom-Chart-Source.png +share/opencpn/plugins/chartdldr_pi/data/doc/15-Chart-Status-Selection.png +share/opencpn/plugins/chartdldr_pi/data/doc/16-Show-Local-Files.png +share/opencpn/plugins/chartdldr_pi/data/doc/MathJax.js +share/opencpn/plugins/chartdldr_pi/data/doc/advanced.html +share/opencpn/plugins/chartdldr_pi/data/doc/basic.html +share/opencpn/plugins/chartdldr_pi/data/doc/github.min.css +share/opencpn/plugins/chartdldr_pi/data/doc/highlight.min.js +share/opencpn/plugins/chartdldr_pi/data/doc/index.html +share/opencpn/plugins/chartdldr_pi/data/doc/preferences.png +share/opencpn/plugins/chartdldr_pi/data/folder215.png +share/opencpn/plugins/chartdldr_pi/data/open182.png +share/opencpn/plugins/dashboard_pi/data/Dashboard.svg +share/opencpn/plugins/dashboard_pi/data/Dashboard_rollover.svg +share/opencpn/plugins/dashboard_pi/data/Dashboard_toggled.svg +share/opencpn/plugins/grib_pi/data/altitude.svg +share/opencpn/plugins/grib_pi/data/curdata.svg +share/opencpn/plugins/grib_pi/data/grib.svg +share/opencpn/plugins/grib_pi/data/grib_rollover.svg +share/opencpn/plugins/grib_pi/data/grib_toggled.svg +share/opencpn/plugins/grib_pi/data/ncurdata.svg +share/opencpn/plugins/grib_pi/data/next.svg +share/opencpn/plugins/grib_pi/data/now.svg +share/opencpn/plugins/grib_pi/data/openfile.svg +share/opencpn/plugins/grib_pi/data/play.svg +share/opencpn/plugins/grib_pi/data/prev.svg +share/opencpn/plugins/grib_pi/data/request.svg +share/opencpn/plugins/grib_pi/data/request_end.svg +share/opencpn/plugins/grib_pi/data/selzone.svg +share/opencpn/plugins/grib_pi/data/setting.svg +share/opencpn/plugins/grib_pi/data/slider.svg +share/opencpn/plugins/grib_pi/data/stop.svg +share/opencpn/plugins/grib_pi/data/zoomto.svg +share/opencpn/plugins/wmm_pi/data/WMM.COF +share/opencpn/plugins/wmm_pi/data/wmm_live.svg +share/opencpn/plugins/wmm_pi/data/wmm_pi.svg share/opencpn/s57data/S52RAZDS.RLE share/opencpn/s57data/attdecode.csv share/opencpn/s57data/chartsymbols.xml @@ -683,7 +941,98 @@ share/opencpn/sounds/README.bells share/opencpn/tcdata/HARMONIC share/opencpn/tcdata/HARMONIC.IDX share/opencpn/tcdata/README.harmonics +share/opencpn/uidata/journeyman/CompassRose.svg +share/opencpn/uidata/journeyman/CompassRoseBlue.svg +share/opencpn/uidata/journeyman/gps1Bar.svg +share/opencpn/uidata/journeyman/gps2Bar.svg +share/opencpn/uidata/journeyman/gps3Bar.svg +share/opencpn/uidata/journeyman/gpsGrn.svg +share/opencpn/uidata/journeyman/gpsGry.svg +share/opencpn/uidata/journeyman/gpsRed.svg +share/opencpn/uidata/journeyman_flat/CompassRose.svg +share/opencpn/uidata/journeyman_flat/CompassRoseBlue.svg +share/opencpn/uidata/journeyman_flat/gps1Bar.svg +share/opencpn/uidata/journeyman_flat/gps2Bar.svg +share/opencpn/uidata/journeyman_flat/gps3Bar.svg +share/opencpn/uidata/journeyman_flat/gpsGrn.svg +share/opencpn/uidata/journeyman_flat/gpsGry.svg +share/opencpn/uidata/journeyman_flat/gpsRed.svg share/opencpn/uidata/styles.xml share/opencpn/uidata/toolicons_journeyman.png share/opencpn/uidata/toolicons_journeyman_flat.png share/opencpn/uidata/toolicons_traditional.png +share/opencpn/uidata/traditional/AIS.svg +share/opencpn/uidata/traditional/AIS_AlertGeneral.svg +share/opencpn/uidata/traditional/AIS_AlertGeneral_Active.svg +share/opencpn/uidata/traditional/AIS_AlertGeneral_Active_rollover.svg +share/opencpn/uidata/traditional/AIS_AlertGeneral_rollover.svg +share/opencpn/uidata/traditional/AIS_Disabled.svg +share/opencpn/uidata/traditional/AIS_Disabled_rollover.svg +share/opencpn/uidata/traditional/AIS_Normal_Active.svg +share/opencpn/uidata/traditional/AIS_Normal_Active_rollover.svg +share/opencpn/uidata/traditional/AIS_Suppressed.svg +share/opencpn/uidata/traditional/AIS_Suppressed_Active.svg +share/opencpn/uidata/traditional/AIS_Suppressed_Active_rollover.svg +share/opencpn/uidata/traditional/AIS_Suppressed_rollover.svg +share/opencpn/uidata/traditional/AIS_rollover.svg +share/opencpn/uidata/traditional/CompassRose.svg +share/opencpn/uidata/traditional/CompassRoseBlue.svg +share/opencpn/uidata/traditional/colorscheme.svg +share/opencpn/uidata/traditional/colorscheme_rollover.svg +share/opencpn/uidata/traditional/current.svg +share/opencpn/uidata/traditional/current_rollover.svg +share/opencpn/uidata/traditional/current_rollover_toggled.svg +share/opencpn/uidata/traditional/current_toggled.svg +share/opencpn/uidata/traditional/down.svg +share/opencpn/uidata/traditional/follow.svg +share/opencpn/uidata/traditional/follow_rollover.svg +share/opencpn/uidata/traditional/follow_rollover_toggled.svg +share/opencpn/uidata/traditional/follow_toggled.svg +share/opencpn/uidata/traditional/gps1Bar.svg +share/opencpn/uidata/traditional/gps2Bar.svg +share/opencpn/uidata/traditional/gps3Bar.svg +share/opencpn/uidata/traditional/gpsGrn.svg +share/opencpn/uidata/traditional/gpsGry.svg +share/opencpn/uidata/traditional/gpsRed.svg +share/opencpn/uidata/traditional/help.svg +share/opencpn/uidata/traditional/help_rollover.svg +share/opencpn/uidata/traditional/left.svg +share/opencpn/uidata/traditional/mob.svg +share/opencpn/uidata/traditional/mob_btn.svg +share/opencpn/uidata/traditional/mob_btn_rollover.svg +share/opencpn/uidata/traditional/pencil.svg +share/opencpn/uidata/traditional/print.svg +share/opencpn/uidata/traditional/print_rollover.svg +share/opencpn/uidata/traditional/right.svg +share/opencpn/uidata/traditional/route.svg +share/opencpn/uidata/traditional/route_manager.svg +share/opencpn/uidata/traditional/route_manager_rollover.svg +share/opencpn/uidata/traditional/route_rollover.svg +share/opencpn/uidata/traditional/route_rollover_toggled.svg +share/opencpn/uidata/traditional/route_toggled.svg +share/opencpn/uidata/traditional/scin.svg +share/opencpn/uidata/traditional/scin_disabled.svg +share/opencpn/uidata/traditional/scin_rollover.svg +share/opencpn/uidata/traditional/scout.svg +share/opencpn/uidata/traditional/scout_disabled.svg +share/opencpn/uidata/traditional/scout_rollover.svg +share/opencpn/uidata/traditional/settings.svg +share/opencpn/uidata/traditional/settings_disabled.svg +share/opencpn/uidata/traditional/settings_rollover.svg +share/opencpn/uidata/traditional/text.svg +share/opencpn/uidata/traditional/text_rollover.svg +share/opencpn/uidata/traditional/text_rollover_toggled.svg +share/opencpn/uidata/traditional/text_toggled.svg +share/opencpn/uidata/traditional/tide.svg +share/opencpn/uidata/traditional/tide_rollover.svg +share/opencpn/uidata/traditional/tide_rollover_toggled.svg +share/opencpn/uidata/traditional/tide_toggled.svg +share/opencpn/uidata/traditional/track.svg +share/opencpn/uidata/traditional/track_rollover.svg +share/opencpn/uidata/traditional/track_rollover_toggled.svg +share/opencpn/uidata/traditional/track_toggled.svg +share/opencpn/uidata/traditional/up.svg +share/opencpn/uidata/traditional/zoomin.svg +share/opencpn/uidata/traditional/zoomin_rollover.svg +share/opencpn/uidata/traditional/zoomout.svg +share/opencpn/uidata/traditional/zoomout_rollover.svg diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo index 47503aeab34de..bc55b3be81af8 100644 --- a/geography/opencpn/distinfo +++ b/geography/opencpn/distinfo @@ -1,12 +1,20 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 00:08:43 agc Exp $ +$NetBSD: distinfo,v 1.5 2016/03/14 11:01:06 bouyer Exp $ -SHA1 (OpenCPN-4.0.0-Source.tar.gz) = a8fe31476a3472cff18e55179094cbc4434699ce -RMD160 (OpenCPN-4.0.0-Source.tar.gz) = 614889e41c8cd5453f3210781201cb29912d8cc1 -SHA512 (OpenCPN-4.0.0-Source.tar.gz) = d815a0e299debb726c982341e43338ea4ebacc0346ddb31a033e5380f27b56615ecd730f2462696cab4096185207b3c463b8c3a071f81493adc8641e4def6317 -Size (OpenCPN-4.0.0-Source.tar.gz) = 193305992 bytes -SHA1 (patch-CMakeLists.txt) = 57abad7a02bf5fa64a522aceeddc4c67a3d5a3e2 +SHA1 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 39baa5f89ded9a5c62824e6e1445dbfc4f168578 +RMD160 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = d344b9caffe40dabcad1d9ac148ce54d75f1573c +SHA512 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 3ea2136ab777f711aeaa66f34722b3b091af91104ff60303b61c587f95354826afae6dbc8f6a9228357399ae36e96a34098596c0a278d2184ce59283c88f4051 +Size (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 42779485 bytes +SHA1 (patch-CMakeLists.txt) = 472b73f0e337d49d94b1cfb892962247d4e1959f SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a +SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 9d6ade1c32f7d52b53848a2e382a4838d0240530 +SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = f96234755ccdb0cf4d890b44c3983a71700e6de7 +SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = fbac6b6da5c8efceb6931a6b41bec4a8ea7cbccb +SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = 086de4106760df22b30330a40e3ec52d88d8b996 SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6 +SHA1 (patch-src_chartimg.cpp) = f0e3841ab1920dcab74462a5007b74e905d794c0 +SHA1 (patch-src_chcanv.cpp) = af76f36b6fd6d613720945195d5a24902012a020 SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 +SHA1 (patch-src_glu_libtess_sweep.c) = 68e3e69239d8bdce353bcad0f5606be5b447b5a7 +SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040 SHA1 (patch-src_texcmp_squish_squish.cpp) = 3a70d4da7a3d6b54cac122a3e80a35b46a91af19 diff --git a/geography/opencpn/patches/patch-CMakeLists.txt b/geography/opencpn/patches/patch-CMakeLists.txt index bc788e4c15a32..d6189b13dd28b 100644 --- a/geography/opencpn/patches/patch-CMakeLists.txt +++ b/geography/opencpn/patches/patch-CMakeLists.txt @@ -1,8 +1,17 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2015/01/22 12:34:15 bouyer Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.3 2016/03/14 11:01:06 bouyer Exp $ ---- CMakeLists.txt.orig 2014-05-26 21:26:36.000000000 +0200 -+++ CMakeLists.txt 2014-06-16 11:41:17.000000000 +0200 -@@ -1007,9 +1007,9 @@ +--- CMakeLists.txt.orig 2016-02-03 18:44:17.000000000 +0100 ++++ CMakeLists.txt 2016-02-17 17:40:51.000000000 +0100 +@@ -282,7 +282,7 @@ + + # Search for opengles, short of running a program to test the speed + # of acceleration, I simply use gles on "native linux" arm systems +-IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) ) ++IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Linux" ) + find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h ) + IF (OPENGLESv1_INCLUDE_DIR) + MESSAGE (STATUS "Found OpenGLESv1") +@@ -1755,9 +1755,9 @@ # Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries # So, add them manually. These declarations may be redundant in some architectures, but do no harm. @@ -12,5 +21,5 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2015/01/22 12:34:15 bouyer Exp $ -ENDIF(UNIX) +ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") - IF(GTK2_FOUND) - TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} gobject-2.0 ) + IF(QT_LINUX) + TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} Qt5Widgets Qt5OpenGL Qt5Gui Qt5Test Qt5Core ) diff --git a/geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake b/geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake new file mode 100644 index 0000000000000..2b575bd772f69 --- /dev/null +++ b/geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake @@ -0,0 +1,16 @@ +--- plugins/chartdldr_pi/cmake/PluginConfigure.cmake.orig 2016-02-10 17:29:03.000000000 +0100 ++++ plugins/chartdldr_pi/cmake/PluginConfigure.cmake 2016-02-10 17:29:36.000000000 +0100 +@@ -41,11 +41,9 @@ + ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O2 -fexceptions" ) + ENDIF(PROFILING) + +- IF(NOT APPLE) +- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic") +- ELSE(NOT APPLE) ++ IF(APPLE) + SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup") +- ENDIF(NOT APPLE) ++ ENDIF(APPLE) + + ENDIF(NOT MSVC) + diff --git a/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt b/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt new file mode 100644 index 0000000000000..907f91e7eb8af --- /dev/null +++ b/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt @@ -0,0 +1,13 @@ +--- plugins/dashboard_pi/CMakeLists.txt.orig 2016-02-10 17:24:22.000000000 +0100 ++++ plugins/dashboard_pi/CMakeLists.txt 2016-02-10 17:24:27.000000000 +0100 +@@ -43,10 +43,9 @@ + #ADD_DEFINITIONS( "-Wall -ansi -pedantic -Wno-variadic-macros" ) + #TODO: Should we use -fno-stack-protector + # IF NOT DEBUGGING CFLAGS="-O2 -march=native" + IF(NOT WIN32 AND NOT APPLE) + ADD_DEFINITIONS( "-Wall -O2 -fexceptions -fvisibility=hidden" ) +- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic") + ENDIF(NOT WIN32 AND NOT APPLE) + + IF( APPLE ) + ADD_DEFINITIONS( "-O3 -fexceptions -fvisibility=hidden" ) diff --git a/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt b/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt new file mode 100644 index 0000000000000..dfa38d0125d48 --- /dev/null +++ b/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt @@ -0,0 +1,10 @@ +--- plugins/grib_pi/CMakeLists.txt.orig 2016-02-10 17:26:23.000000000 +0100 ++++ plugins/grib_pi/CMakeLists.txt 2016-02-10 17:27:16.000000000 +0100 +@@ -44,7 +44,6 @@ + # IF NOT DEBUGGING CFLAGS="-O2 -march=native" + IF(NOT WIN32 AND NOT APPLE) + ADD_DEFINITIONS( "-Wall -fexceptions -fvisibility=hidden" ) +- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic") + ENDIF(NOT WIN32 AND NOT APPLE) + + IF( APPLE ) diff --git a/geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake b/geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake new file mode 100644 index 0000000000000..6909cd6513b8f --- /dev/null +++ b/geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake @@ -0,0 +1,16 @@ +--- plugins/wmm_pi/cmake/PluginConfigure.cmake.orig 2016-02-10 17:29:03.000000000 +0100 ++++ plugins/wmm_pi/cmake/PluginConfigure.cmake 2016-02-10 17:30:10.000000000 +0100 +@@ -41,11 +41,9 @@ + ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O2 -fexceptions" ) + ENDIF(PROFILING) + +- IF(NOT APPLE) +- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic") +- ELSE(NOT APPLE) ++ IF(APPLE) + SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup") +- ENDIF(NOT APPLE) ++ ENDIF(APPLE) + + ENDIF(NOT MSVC) + diff --git a/geography/opencpn/patches/patch-src_chartimg.cpp b/geography/opencpn/patches/patch-src_chartimg.cpp new file mode 100644 index 0000000000000..d9ee9a58f1a34 --- /dev/null +++ b/geography/opencpn/patches/patch-src_chartimg.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_chartimg.cpp,v 1.1 2016/03/14 11:01:06 bouyer Exp $ +From master: +https://github.com/OpenCPN/OpenCPN/commit/39f9b1af047330d0a8ea3a72ac66ddb15ff96285 + +--- src/chartimg.cpp.orig ++++ src/chartimg.cpp +@@ -2886,7 +2886,7 @@ void ChartBaseBSB::latlong_to_chartpix(double lat, double lon, double &pixx, dou + alat = lat + m_lat_datum_adjust; + + // Get e/n from Projection +- xlon = AdjustLongitude(xlon); ++ xlon = AdjustLongitude(alon); + + toSM_ECC(alat, xlon, m_proj_lat, m_proj_lon, &easting, &northing); + diff --git a/geography/opencpn/patches/patch-src_chcanv.cpp b/geography/opencpn/patches/patch-src_chcanv.cpp new file mode 100644 index 0000000000000..f0035124cccc5 --- /dev/null +++ b/geography/opencpn/patches/patch-src_chcanv.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-src_chcanv.cpp,v 1.1 2016/03/14 11:01:06 bouyer Exp $ +From master: +https://github.com/OpenCPN/OpenCPN/commit/39c0b7c3367181ed92adfe0e41d59b7fb65d3a9a + +--- src/chcanv.cpp.orig ++++ src/chcanv.cpp +@@ -10172,6 +10172,11 @@ void ChartCanvas::DrawAllRoutesInBBox( ocpnDC& dc, LLBBox& BltBBox, const wxRegi + continue; + } + ++ if ( 0 == pRouteDraw->GetnPoints() ) { ++ node = node->GetNext(); ++ continue; ++ } ++ + LLBBox test_box = pRouteDraw->GetBBox(); + + if( b_run ) test_box.Expand( gLon, gLat ); diff --git a/geography/opencpn/patches/patch-src_glu_libtess_sweep.c b/geography/opencpn/patches/patch-src_glu_libtess_sweep.c new file mode 100644 index 0000000000000..f2114f05a96ab --- /dev/null +++ b/geography/opencpn/patches/patch-src_glu_libtess_sweep.c @@ -0,0 +1,61 @@ +$NetBSD: patch-src_glu_libtess_sweep.c,v 1.1 2016/03/14 11:01:06 bouyer Exp $ +Fix segfault; it seems that RegionAbove(regUp) can return NULL + +--- src/glu/libtess/sweep.c.orig 2016-02-03 18:44:17.000000000 +0100 ++++ src/glu/libtess/sweep.c 2016-02-11 13:50:32.000000000 +0100 +@@ -33,6 +33,7 @@ + */ + + #include "gluos.h" ++#include + #include + #include + #include /* longjmp */ +@@ -546,7 +547,9 @@ + if( EdgeSign( eUp->Dst, eLo->Org, eUp->Org ) < 0 ) return FALSE; + + /* eLo->Org appears to be above eUp, so splice eLo->Org into eUp */ +- RegionAbove(regUp)->dirty = regUp->dirty = TRUE; ++ if (RegionAbove(regUp)) ++ RegionAbove(regUp)->dirty = TRUE; ++ regUp->dirty = TRUE; + if (__gl_meshSplitEdge( eUp->Sym ) == NULL) longjmp(tess->env,1); + if ( !__gl_meshSplice( eLo->Oprev, eUp ) ) longjmp(tess->env,1); + } +@@ -584,7 +587,9 @@ + if( EdgeSign( eUp->Dst, eLo->Dst, eUp->Org ) < 0 ) return FALSE; + + /* eLo->Dst is above eUp, so splice eLo->Dst into eUp */ +- RegionAbove(regUp)->dirty = regUp->dirty = TRUE; ++ if (RegionAbove(regUp) != NULL) ++ RegionAbove(regUp)->dirty = TRUE; ++ regUp->dirty = TRUE; + e = __gl_meshSplitEdge( eUp ); + if (e == NULL) longjmp(tess->env,1); + if ( !__gl_meshSplice( eLo->Sym, e ) ) longjmp(tess->env,1); +@@ -1025,15 +1030,23 @@ + tmp.eUp = vEvent->anEdge->Sym; + /* __GL_DICTLISTKEY */ /* __gl_dictListSearch */ + regUp = (ActiveRegion *)dictKey( dictSearch( tess->dict, &tmp )); +- regLo = RegionBelow( regUp ); ++ if (regUp == NULL) { ++ fprintf(stderr, "ConnectLeftVertex botch 1\n"); ++ return; ++ } + eUp = regUp->eUp; +- eLo = regLo->eUp; + + /* Try merging with U or L first */ + if( EdgeSign( eUp->Dst, vEvent, eUp->Org ) == 0 ) { + ConnectLeftDegenerate( tess, regUp, vEvent ); + return; + } ++ regLo = RegionBelow( regUp ); ++ if (regLo == NULL) { ++ fprintf(stderr, "ConnectLeftVertex botch 2\n"); ++ return; ++ } ++ eLo = regLo->eUp; + + /* Connect vEvent to rightmost processed vertex of either chain. + * e->Dst is the vertex that we will connect to vEvent. diff --git a/geography/opencpn/patches/patch-src_mipmap_mipmap.c b/geography/opencpn/patches/patch-src_mipmap_mipmap.c new file mode 100644 index 0000000000000..359a7ed578504 --- /dev/null +++ b/geography/opencpn/patches/patch-src_mipmap_mipmap.c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_mipmap_mipmap.c,v 1.1 2016/03/14 11:01:06 bouyer Exp $ + +be consistent with #if where the function is defined + +--- src/mipmap/mipmap.c.orig 2016-02-10 16:22:54.000000000 +0100 ++++ src/mipmap/mipmap.c 2016-02-10 16:23:26.000000000 +0100 +@@ -184,7 +184,7 @@ + MipMap_24 = MipMap_24_ssse3; + } + +-#if (GCC_VERSION > 40800) || defined(__MSVC__) ++#if defined(__AVX2__) || (defined(__MSVC__) && (_MSC_VER >= 1700)) + if (nIds >= 0x00000007) { + cpuid(info,0x00000007); + From cfb7d8e92a76ee818f9e3444ceabdb5b0e3e50d7 Mon Sep 17 00:00:00 2001 From: bouyer Date: Mon, 14 Mar 2016 11:07:59 +0000 Subject: [PATCH 0070/2457] Update to version 20160208. Changes since 20150829: - support opencpn 4.2.0 - bug fixes and UI improvements - display currents along the route --- .../opencpn-plugin-weather_routing/Makefile | 11 +++++------ .../opencpn-plugin-weather_routing/PLIST | 2 +- .../opencpn-plugin-weather_routing/distinfo | 11 ++++++----- .../patches/patch-cmake_PluginConfigure.cmake | 19 +++++++++++++++++++ 4 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake diff --git a/geography/opencpn-plugin-weather_routing/Makefile b/geography/opencpn-plugin-weather_routing/Makefile index b137d5cac4d3b..62a257d41be5a 100644 --- a/geography/opencpn-plugin-weather_routing/Makefile +++ b/geography/opencpn-plugin-weather_routing/Makefile @@ -1,18 +1,17 @@ -# $NetBSD: Makefile,v 1.3 2015/09/09 11:07:07 bouyer Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/14 11:07:59 bouyer Exp $ # -VERSION= 20150829 +VERSION= 20160208 DISTNAME= weather_routing_pi-${VERSION} PKGNAME= opencpn-plugin-weather_routing-${VERSION} -#PKGREVISION= 1 CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/} GITHUB_PROJECT= weather_routing_pi -GITHUB_TAG= e652536aca24809cd3514c8c903603806b22bb0d +GITHUB_TAG= 509fd720895fcc19fd55bc175305d3a956b0cc8b MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://opencpn.org/ocpn/weather_routing_plugin -COMMENT= OpenCPN plugin to create optimized weather routes +COMMENT= Concise ChartPlotter/Navigator - developement version LICENSE= gnu-gpl-v2 USE_LANGUAGES= c c++ @@ -28,7 +27,7 @@ CMAKE_MODULE_PATH_OVERRIDE = \ .include "../../devel/cmake/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/wxGTK28/buildlink3.mk" +.include "../../x11/wxGTK30/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../textproc/tinyxml/buildlink3.mk" diff --git a/geography/opencpn-plugin-weather_routing/PLIST b/geography/opencpn-plugin-weather_routing/PLIST index 72d47eb691dbc..20b1ee3dd406f 100644 --- a/geography/opencpn-plugin-weather_routing/PLIST +++ b/geography/opencpn-plugin-weather_routing/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2015/09/09 11:07:07 bouyer Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/14 11:07:59 bouyer Exp $ lib/opencpn/libweather_routing_pi.so share/locale/ca/LC_MESSAGES/opencpn-weather_routing_pi.mo share/locale/cs/LC_MESSAGES/opencpn-weather_routing_pi.mo diff --git a/geography/opencpn-plugin-weather_routing/distinfo b/geography/opencpn-plugin-weather_routing/distinfo index 25c8121af2dfe..2e21264255016 100644 --- a/geography/opencpn-plugin-weather_routing/distinfo +++ b/geography/opencpn-plugin-weather_routing/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 00:08:43 agc Exp $ +$NetBSD: distinfo,v 1.4 2016/03/14 11:07:59 bouyer Exp $ -SHA1 (weather_routing_pi-20150829-e652536aca24809cd3514c8c903603806b22bb0d.tar.gz) = ee3a7a485f9e0f6be60ba7a5d92309b27acea029 -RMD160 (weather_routing_pi-20150829-e652536aca24809cd3514c8c903603806b22bb0d.tar.gz) = f563544b3601b5f325e5c00bb60eff847b52b467 -SHA512 (weather_routing_pi-20150829-e652536aca24809cd3514c8c903603806b22bb0d.tar.gz) = be0a3bd43b00ece9bc1353683c8245cbc800da4ebd3bc624eb6f8771025277b6287705761b653167f9c68c8b6e2761d5aa2bc8f4553df3470e89aed88e005154 -Size (weather_routing_pi-20150829-e652536aca24809cd3514c8c903603806b22bb0d.tar.gz) = 787968 bytes +SHA1 (weather_routing_pi-20160208-509fd720895fcc19fd55bc175305d3a956b0cc8b.tar.gz) = 5fa4e285a8628bf546e7aa674a79eb181594ee4d +RMD160 (weather_routing_pi-20160208-509fd720895fcc19fd55bc175305d3a956b0cc8b.tar.gz) = 484c173e0f85a384ae30d39f98ae429bcff40793 +SHA512 (weather_routing_pi-20160208-509fd720895fcc19fd55bc175305d3a956b0cc8b.tar.gz) = 93bc3147bf532cfc956e78a927f7e22be3f1628591ee0baf4a7df94adba6102947b2c6d2863f8429215522122a92c3dbe3acd4d0c258843bec6a2c0d5ae10a66 +Size (weather_routing_pi-20160208-509fd720895fcc19fd55bc175305d3a956b0cc8b.tar.gz) = 793334 bytes +SHA1 (patch-cmake_PluginConfigure.cmake) = e2873cbba3d776227d72b8538634f687dc04c439 diff --git a/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake b/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake new file mode 100644 index 0000000000000..004b0c89aa674 --- /dev/null +++ b/geography/opencpn-plugin-weather_routing/patches/patch-cmake_PluginConfigure.cmake @@ -0,0 +1,19 @@ +$NetBSD: patch-cmake_PluginConfigure.cmake,v 1.1 2016/03/14 11:07:59 bouyer Exp $ +Do not overwrite CMAKE_SHARED_LINKER_FLAGS + +--- cmake/PluginConfigure.cmake.orig 2016-02-10 19:43:27.000000000 +0100 ++++ cmake/PluginConfigure.cmake 2016-02-10 19:43:46.000000000 +0100 +@@ -43,11 +43,9 @@ + ENDIF(DEBUG) + ENDIF(PROFILING) + +- IF(NOT APPLE) +- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic") +- ELSE(NOT APPLE) ++ IF(APPLE) + SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup") +- ENDIF(NOT APPLE) ++ ENDIF(APPLE) + + ENDIF(NOT MSVC) + From 3271bd4015a55ee182a9ca88c297e2ee41bdfed1 Mon Sep 17 00:00:00 2001 From: bouyer Date: Mon, 14 Mar 2016 11:09:15 +0000 Subject: [PATCH 0071/2457] Updated geography/opencpn to 4.2.0 Updated geography/opencpn-plugin-weather_routing to 20160208 --- doc/CHANGES-2016 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 1247bdc365771..f345574025017 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1162 2016/03/14 10:50:59 adam Exp $ +$NetBSD: CHANGES-2016,v 1.1163 2016/03/14 11:09:15 bouyer Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1551,3 +1551,5 @@ Changes to the packages collection and infrastructure in 2016: Updated security/lasso to 2.5.1 [manu 2016-03-14] Updated www/ap-auth-mellon to 0.12.0 [manu 2016-03-14] Updated devel/cmake to 3.5.0 [adam 2016-03-14] + Updated geography/opencpn to 4.2.0 [bouyer 2016-03-14] + Updated geography/opencpn-plugin-weather_routing to 20160208 [bouyer 2016-03-14] From cb9313fee5177f569a7f769986043de6f256bebc Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 11:12:22 +0000 Subject: [PATCH 0072/2457] This package needs to be able to do atomic compare-and-swap on time_t. Since time_t is 64 bits, on i386 it needs at least a pentium-class CPU. --- sysutils/rsyslog/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile index 9663858cc3424..d8b74f4417376 100644 --- a/sysutils/rsyslog/Makefile +++ b/sysutils/rsyslog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/10/12 10:28:56 fhajny Exp $ +# $NetBSD: Makefile,v 1.7 2016/03/14 11:12:22 tnn Exp $ # BUILDLINK_DEPMETHOD.libestr= full @@ -31,6 +31,11 @@ PLIST.klog= yes RSYSLOG_SYSMOD= imklog .endif +# needs to be able to do compare-and-swap on time_t (cmpxchg8b) +.if ${MACHINE_ARCH} == "i386" +CFLAGS+= -march=i586 +.endif + BUILD_DEFS+= VARBASE RSYSLOG_PIDDIR RSYSLOG_WRKDIR RSYSLOG_PIDDIR?= ${VARBASE}/run RSYSLOG_WRKDIR?= ${VARBASE}/lib/rsyslog From 7b7f2e23d2dc8288e9cd891a0a641c4c3b3b8dab Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 11:41:15 +0000 Subject: [PATCH 0073/2457] add DESCR (Hi Wen!) --- devel/p5-Git-Version-Compare/DESCR | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 devel/p5-Git-Version-Compare/DESCR diff --git a/devel/p5-Git-Version-Compare/DESCR b/devel/p5-Git-Version-Compare/DESCR new file mode 100644 index 0000000000000..c9d71621bc580 --- /dev/null +++ b/devel/p5-Git-Version-Compare/DESCR @@ -0,0 +1,5 @@ +Git::Version::Compare contains a selection of subroutines that make +dealing with Git-related things (like versions) a little bit easier. + +The strings to compare can be version numbers, tags from git.git or +the output of git version or git describe. From a7dc0c9dad6c9f00cc012086d3767a087ca27f04 Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 11:48:10 +0000 Subject: [PATCH 0074/2457] BUILDLINK_TRANSFORM needs to go before bsd.pkg.mk --- audio/bml/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/audio/bml/Makefile b/audio/bml/Makefile index c6c578f47036f..e7d62ad97a003 100644 --- a/audio/bml/Makefile +++ b/audio/bml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2015/01/23 00:16:03 mef Exp $ +# $NetBSD: Makefile,v 1.10 2016/03/14 11:48:10 tnn Exp $ # DISTNAME= bml-0.8.0 @@ -25,9 +25,7 @@ CFLAGS+= -DHAVE_VSSCANF=1 # missing configure logic LDFLAGS+= -li386 # for i386_set_ldt .endif +BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} + .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/bsd.pkg.mk" - -.if empty(BUILDLINK_LDADD.dl) -BUILDLINK_TRANSFORM+= rm:-ldl -.endif From ba91eb7fcf8bf1169b45d9a85df311a0569bb0ea Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 11:54:45 +0000 Subject: [PATCH 0075/2457] Mark package as BROKEN, it tries to download stuff over plain HTTP during the build: ---8<--- downloading ICU data library (icudt) the files will be extracted to: /pkgsrc-obj/textproc/R-stringi/work/.destdir/usr/pkg/lib/R/library/stringi/libs no icudt in a local repo trying URL 'http://static.rexamine.com/packages/icudt55l.zip' Warning in download.file(paste(href, fname, sep = ""), outfname, mode = "wb") : unable to resolve 'static.rexamine.com' Error in download.file(paste(href, fname, sep = ""), outfname, mode = "wb"): cannot open URL 'http://static.rexamine.com/packages/icudt55l.zip' --- textproc/R-stringi/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/textproc/R-stringi/Makefile b/textproc/R-stringi/Makefile index 5892480d39c9d..70b71739baf9b 100644 --- a/textproc/R-stringi/Makefile +++ b/textproc/R-stringi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/01/01 12:59:19 wen Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/14 11:54:45 tnn Exp $ CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/} @@ -13,6 +13,8 @@ R_PKGVER= 1.0-1 USE_LANGUAGES= c c++ +BROKEN= "downloads during build" + .include "../../textproc/icu/buildlink3.mk" .include "../../math/R/Makefile.extension" .include "../../mk/bsd.pkg.mk" From dc3b0666d82e1b03f030835ebe88bf2737a3c56f Mon Sep 17 00:00:00 2001 From: imil Date: Mon, 14 Mar 2016 12:55:40 +0000 Subject: [PATCH 0076/2457] disable portability check for unused configure script --- sysutils/facette/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sysutils/facette/Makefile b/sysutils/facette/Makefile index deafa60d5359b..98b83c25a96b7 100644 --- a/sysutils/facette/Makefile +++ b/sysutils/facette/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2016/03/09 12:50:29 imil Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/14 12:55:40 imil Exp $ DISTNAME= facette-0.4.0dev -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=facette/} @@ -44,6 +44,8 @@ SUBST_STAGE.rrd= pre-build SUBST_FILES.rrd= docs/examples/providers/collectd.json SUBST_SED.rrd= -e 's,/var/lib,${VARBASE}/db,g' +CHECK_PORTABILITY_SKIP= vendor/src/github.com/influxdb/influxdb/configure + .include "../../mk/bsd.prefs.mk" FACETTE_USER?= facette From b95930d268ec1ca9ab60ae259d71a61f515e4e24 Mon Sep 17 00:00:00 2001 From: imil Date: Mon, 14 Mar 2016 12:55:54 +0000 Subject: [PATCH 0077/2457] Updated sysutils/facette to 0.4.0devnb6 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index f345574025017..1deb200ed8ec9 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1163 2016/03/14 11:09:15 bouyer Exp $ +$NetBSD: CHANGES-2016,v 1.1164 2016/03/14 12:55:54 imil Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1553,3 +1553,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/cmake to 3.5.0 [adam 2016-03-14] Updated geography/opencpn to 4.2.0 [bouyer 2016-03-14] Updated geography/opencpn-plugin-weather_routing to 20160208 [bouyer 2016-03-14] + Updated sysutils/facette to 0.4.0devnb6 [imil 2016-03-14] From 231d8030dd900448c73210aa756fb44d10e02336 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 14 Mar 2016 13:16:31 +0000 Subject: [PATCH 0078/2457] Update to 2.24 Changelog: * Noteworthy changes in release 2.24 (2016-03-10) [stable] ** Bug fixes grep -z would match strings it should not. To trigger the bug, you'd have to use a regular expression including an anchor (^ or $) and a feature like a range or a backreference, causing grep to forego its DFA matcher and resort to using re_search. With a multibyte locale, that matcher could mistakenly match a string containing a newline. For example, this command: printf 'a\nb\0' | LC_ALL=en_US.utf-8 grep -z '^[a-b]*b' would mistakenly match and print all four input bytes. After the fix, there is no match, as expected. [bug introduced in grep-2.7] grep -Pz now diagnoses attempts to use patterns containing ^ and $, instead of mishandling these patterns. This problem seems to be inherent to the PCRE API; removing this limitation is on PCRE's maint/README wish list. Patterns can continue to match literal ^ and $ by escaping them with \ (now needed even inside [...]). [bug introduced in grep-2.5] --- textproc/grep/Makefile | 4 ++-- textproc/grep/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile index 0832a97d5f2bc..7f1970da4b4cd 100644 --- a/textproc/grep/Makefile +++ b/textproc/grep/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.45 2016/02/12 23:28:43 ryoon Exp $ +# $NetBSD: Makefile,v 1.46 2016/03/14 13:16:31 ryoon Exp $ -DISTNAME= grep-2.23 +DISTNAME= grep-2.24 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU:=grep/} EXTRACT_SUFX= .tar.xz diff --git a/textproc/grep/distinfo b/textproc/grep/distinfo index d1242cff9b497..e9a5c8e6f1606 100644 --- a/textproc/grep/distinfo +++ b/textproc/grep/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.19 2016/02/12 23:28:43 ryoon Exp $ +$NetBSD: distinfo,v 1.20 2016/03/14 13:16:31 ryoon Exp $ -SHA1 (grep-2.23.tar.xz) = 76239b0c7f6d93acc820832b8241227619ff1cdb -RMD160 (grep-2.23.tar.xz) = e44f6a41cfced6cd08f7b0cbb838c63507b16f00 -SHA512 (grep-2.23.tar.xz) = 4b1d86bfe46039db6d5e1c773f73a30a1fd21a2bdceba6286df0e6b97d93f01750e9ba3a6363a31c06c9ff9fa3850b0a9bca214d52cccf4d0d27e087208ab3ab -Size (grep-2.23.tar.xz) = 1317488 bytes +SHA1 (grep-2.24.tar.xz) = 3ecbec7805b8c3082094dc4dd9c4d415c24b9669 +RMD160 (grep-2.24.tar.xz) = 79303252099639b42b5bcc01089f060cb281d056 +SHA512 (grep-2.24.tar.xz) = 44dafa41ef74687ef91efdb6fd8e81a1a8469f74ec98a6d681eee304455dd18561abca328b89e22b4b7ba5ce157b1d34cae3251d86354df36807b7042afc3650 +Size (grep-2.24.tar.xz) = 1321680 bytes From bad7f6d64c72ed4f582b0e7abe39481615f564b5 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 14 Mar 2016 13:17:49 +0000 Subject: [PATCH 0079/2457] Updated textproc/grep to 2.24 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 1deb200ed8ec9..1d0da324d1da1 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1164 2016/03/14 12:55:54 imil Exp $ +$NetBSD: CHANGES-2016,v 1.1165 2016/03/14 13:17:49 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1554,3 +1554,4 @@ Changes to the packages collection and infrastructure in 2016: Updated geography/opencpn to 4.2.0 [bouyer 2016-03-14] Updated geography/opencpn-plugin-weather_routing to 20160208 [bouyer 2016-03-14] Updated sysutils/facette to 0.4.0devnb6 [imil 2016-03-14] + Updated textproc/grep to 2.24 [ryoon 2016-03-14] diff --git a/doc/TODO b/doc/TODO index 1d34f2c5c0b5a..c98199e743bef 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15592 2016/03/14 10:50:59 adam Exp $ +$NetBSD: TODO,v 1.15593 2016/03/14 13:17:50 ryoon Exp $ Suggested new packages ====================== @@ -853,7 +853,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o gramps-4.1.0 o grantlee-5.0.0 o greed-4.1 - o grep-2.24 o grilo-0.2.12 o grilo-plugins-0.2.14 o gromacs-5.1.2 From afa3cfbfa0351a0c9228d3bd0011bf032196c005 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 14 Mar 2016 14:07:30 +0000 Subject: [PATCH 0080/2457] Update to 0.67 Changelog: 2016-03-05 PuTTY 0.67 released, fixing a SECURITY HOLE PuTTY 0.67, released today, fixes a security hole in 0.66 and before: vuln-pscp-sink-sscanf. It also contains a few other small bug fixes. Also, for the first time, the Windows executables in this release (including the installer) are signed using an Authenticode certificate, to help protect against tampering in transit from our website or after downloading. You should find that they list "Simon Tatham" as the verified publisher. --- security/putty/Makefile | 4 ++-- security/putty/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/security/putty/Makefile b/security/putty/Makefile index 64fe74cadfa0c..11eff6987c888 100644 --- a/security/putty/Makefile +++ b/security/putty/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2015/11/20 19:02:02 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2016/03/14 14:07:30 ryoon Exp $ # -DISTNAME= putty-0.66 +DISTNAME= putty-0.67 CATEGORIES= security MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PKGVERSION_NOREV}/ diff --git a/security/putty/distinfo b/security/putty/distinfo index 429d323194837..9b4b3b63a7006 100644 --- a/security/putty/distinfo +++ b/security/putty/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.19 2015/11/20 19:02:02 ryoon Exp $ +$NetBSD: distinfo,v 1.20 2016/03/14 14:07:30 ryoon Exp $ -SHA1 (putty-0.66.tar.gz) = 49a6eb85c2b6893b5de8485f7c59049bf4fa32f4 -RMD160 (putty-0.66.tar.gz) = 2121860be81416f96a93963e4771a1edfca279dc -SHA512 (putty-0.66.tar.gz) = 796fdb104fbdcad22d93274ea7c3599a34a94b35c849eafd1398f9a71721fbf2b6e4cec4abb64bb7fffe8ac45faefd8995339547fdc9b0beca5d7a76e0cb6bd3 -Size (putty-0.66.tar.gz) = 1948323 bytes +SHA1 (putty-0.67.tar.gz) = 132ff74266e590a007f86cbb4bea5642db7bdd76 +RMD160 (putty-0.67.tar.gz) = 910dc2257337eefcbe656d2d05bbf4ecc4fda22c +SHA512 (putty-0.67.tar.gz) = c2b17da46b8db3fe3837a10cb9cf5dd4b3ef6bfa15cadab83f3b87cf1479ed31fced90b774297ae53bdcbbdf230fc80d5c73d5ff3be6916fb591fd7ce3d35eca +Size (putty-0.67.tar.gz) = 1955547 bytes SHA1 (patch-import.c) = da6a34ec3412985858babb28821296c40e30d96b SHA1 (patch-ldisc.c) = e4dd89bfb2ddcb47aad46cc7c311f424aa6ab6be SHA1 (patch-misc.c) = fb7ba23f3c3301181d2ca7666a037f7bb3ac3f7b From a9bcfa6248f24610bdaf8435e01b0b74b695e45d Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 14 Mar 2016 14:08:50 +0000 Subject: [PATCH 0081/2457] Updated security/putty to 0.67 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 1d0da324d1da1..a4756bf18f9a4 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1165 2016/03/14 13:17:49 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1166 2016/03/14 14:08:50 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1555,3 +1555,4 @@ Changes to the packages collection and infrastructure in 2016: Updated geography/opencpn-plugin-weather_routing to 20160208 [bouyer 2016-03-14] Updated sysutils/facette to 0.4.0devnb6 [imil 2016-03-14] Updated textproc/grep to 2.24 [ryoon 2016-03-14] + Updated security/putty to 0.67 [ryoon 2016-03-14] From 84596619641ace43cd9bdc707ebcb48d10900c38 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 14 Mar 2016 14:30:47 +0000 Subject: [PATCH 0082/2457] Update to 5.5.3 Changelog: Rebase to Firefox 38.7.0 --- security/tor-browser/Makefile | 7 +++---- security/tor-browser/distinfo | 10 +++++----- .../patch-gfx_graphite2_moz-gr-update.sh | 20 ------------------- 3 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 security/tor-browser/patches/patch-gfx_graphite2_moz-gr-update.sh diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile index 9fe1c9c79e5b3..2db08d082fd9a 100644 --- a/security/tor-browser/Makefile +++ b/security/tor-browser/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2016/03/05 11:29:27 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/14 14:30:47 ryoon Exp $ -TORBVER= 5.5.2 +TORBVER= 5.5.3 -DISTNAME= tor-browser-38.6.1esr-5.5-1 +DISTNAME= tor-browser-38.7.0esr-5.5-1 PKGNAME= tor-browser-${TORBVER} -PKGREVISION= 1 CATEGORIES= www MASTER_SITES+= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .tar.xz diff --git a/security/tor-browser/distinfo b/security/tor-browser/distinfo index 8eac1ac3a76db..5f52d51adf6b3 100644 --- a/security/tor-browser/distinfo +++ b/security/tor-browser/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1 2016/02/14 07:30:54 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2016/03/14 14:30:47 ryoon Exp $ -SHA1 (tor-browser-38.6.1esr-5.5-1.tar.xz) = 6243bda76750790c6fb814f2b51f19edca6f61c6 -RMD160 (tor-browser-38.6.1esr-5.5-1.tar.xz) = d388fa267c8b715c934842c792a328e8b72d5e92 -SHA512 (tor-browser-38.6.1esr-5.5-1.tar.xz) = e83ef8fe33abc4d2b7312a837dbe4feaac59f21fa0b222371612da855443c60d59884b13a451ccf560d954876088f3919d356e45ec43317a5767abe163438fa5 -Size (tor-browser-38.6.1esr-5.5-1.tar.xz) = 150057228 bytes +SHA1 (tor-browser-38.7.0esr-5.5-1.tar.xz) = b6a35f91470572d175b461b6ba6e31be56c47e34 +RMD160 (tor-browser-38.7.0esr-5.5-1.tar.xz) = 751bb7429cecbb151df550aab7f53486c705ff8b +SHA512 (tor-browser-38.7.0esr-5.5-1.tar.xz) = 3d2ab2f82af7dfa1b1f777916ba450f8107da8c9c6a272fb0fe66281f4d89450c8cb9a02ae229b0c3bb8d063f825a359b1ca66af5fecad8ea4ba861ec11b2070 +Size (tor-browser-38.7.0esr-5.5-1.tar.xz) = 150084572 bytes SHA1 (patch-aa) = e9e8400fa86ae8d6910b49e3a98127122e714f1a SHA1 (patch-accessible_atk_Platform.cpp) = c2deb81b300de44c4500328589185bbd4b6b02fb SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 diff --git a/security/tor-browser/patches/patch-gfx_graphite2_moz-gr-update.sh b/security/tor-browser/patches/patch-gfx_graphite2_moz-gr-update.sh deleted file mode 100644 index 523725a6fa77f..0000000000000 --- a/security/tor-browser/patches/patch-gfx_graphite2_moz-gr-update.sh +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-gfx_graphite2_moz-gr-update.sh,v 1.1 2016/02/14 07:30:54 ryoon Exp $ - ---- gfx/graphite2/moz-gr-update.sh.orig 2014-11-21 03:37:30.000000000 +0000 -+++ gfx/graphite2/moz-gr-update.sh -@@ -23,8 +23,14 @@ echo "\nSee" $0 "for update procedure.\n - find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - -+# closest tag/release to require for system version -+TAG=$(cd ../graphitedev/ && hg parents --template {latesttag}) -+ -+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$TAG/ and tr/./,/ \ -+ if /GR2_VERSION_REQUIRE/" configure.in -+ - # summarize what's been touched --echo Updated to $CHANGESET. -+echo Updated to $CHANGESET \($TAG for --with-system-graphite2\) - echo Here is what changed in the gfx/graphite2 directory: - echo - From 89001503e09a75a033ffa82441f5863f5e72473f Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 14 Mar 2016 14:31:13 +0000 Subject: [PATCH 0083/2457] Updated security/tor-browser to 5.5.3 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index a4756bf18f9a4..0d6687c1aa179 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1166 2016/03/14 14:08:50 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1167 2016/03/14 14:31:13 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1556,3 +1556,4 @@ Changes to the packages collection and infrastructure in 2016: Updated sysutils/facette to 0.4.0devnb6 [imil 2016-03-14] Updated textproc/grep to 2.24 [ryoon 2016-03-14] Updated security/putty to 0.67 [ryoon 2016-03-14] + Updated security/tor-browser to 5.5.3 [ryoon 2016-03-14] diff --git a/doc/TODO b/doc/TODO index c98199e743bef..3b82e3126f534 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15593 2016/03/14 13:17:50 ryoon Exp $ +$NetBSD: TODO,v 1.15594 2016/03/14 14:31:13 ryoon Exp $ Suggested new packages ====================== @@ -1946,7 +1946,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o tomboy-1.10.2 o top-3.8beta1 o topgit-0.8 - o tor-browser-5.5.3 o totem-3.14.1 o totem-pl-parser-3.10.3 o transmission-2.92 From 323eb6fb1e6dc37871cb3ae1cc6bf87a3921e5c9 Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 14:36:39 +0000 Subject: [PATCH 0084/2457] try to fix build with clang-3.8 --- devel/include-what-you-use/Makefile | 3 +- devel/include-what-you-use/distinfo | 5 +- .../patches/patch-CMakeLists.txt | 14 ++++ .../patches/patch-iwyu__ast__util.cc | 72 +++++++++++++++++++ .../patches/patch-iwyu__ast__util.h | 15 ++++ 5 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 devel/include-what-you-use/patches/patch-CMakeLists.txt create mode 100644 devel/include-what-you-use/patches/patch-iwyu__ast__util.cc create mode 100644 devel/include-what-you-use/patches/patch-iwyu__ast__util.h diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile index a3d4e3ed30a5d..3696c33540fb4 100644 --- a/devel/include-what-you-use/Makefile +++ b/devel/include-what-you-use/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2015/12/30 16:23:52 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/14 14:36:39 tnn Exp $ DISTNAME= include-what-you-use-0.5.src +PKGREVISION= 1 PKGNAME= ${DISTNAME:.src=} CATEGORIES= devel MASTER_SITES= http://include-what-you-use.org/downloads/ diff --git a/devel/include-what-you-use/distinfo b/devel/include-what-you-use/distinfo index 103bb8eb2d028..27e8ca5ef04ad 100644 --- a/devel/include-what-you-use/distinfo +++ b/devel/include-what-you-use/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.1 2015/12/30 16:16:13 bsiegert Exp $ +$NetBSD: distinfo,v 1.2 2016/03/14 14:36:39 tnn Exp $ SHA1 (include-what-you-use-0.5.src.tar.gz) = 6d4e3040ecb2906f93d72ba14e61381f0a8c2509 RMD160 (include-what-you-use-0.5.src.tar.gz) = 73f92c5d018e9a49c34307a4ff5c5848b78a0e99 SHA512 (include-what-you-use-0.5.src.tar.gz) = 805395873b59e4f4236853ba9ac6818d60968190ad485d580ea80d69c518eb8c44822a4281a4219b4ccc02e2dc8f3db5c470170e27e67ea0d8e04ef78da9078c Size (include-what-you-use-0.5.src.tar.gz) = 404081 bytes +SHA1 (patch-CMakeLists.txt) = 08d51a0890df1382944bd35904d8171fb031dad5 +SHA1 (patch-iwyu__ast__util.cc) = 7fa08654fb9dfeb439d17f8ea095d816398724cd +SHA1 (patch-iwyu__ast__util.h) = da1326a0f2423a3967025bf5274a80e7a1a44c0e SHA1 (patch-iwyu__output.cc) = 072236f94c44ebd7e0ca20ad828dd938c9683b4a diff --git a/devel/include-what-you-use/patches/patch-CMakeLists.txt b/devel/include-what-you-use/patches/patch-CMakeLists.txt new file mode 100644 index 0000000000000..045d0e7bc58bd --- /dev/null +++ b/devel/include-what-you-use/patches/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2016/03/14 14:36:39 tnn Exp $ + +fix build w/ llvm-3.8 + +--- CMakeLists.txt.orig 2015-12-11 05:46:10.000000000 +0000 ++++ CMakeLists.txt +@@ -133,7 +133,6 @@ target_link_libraries(include-what-you-u + LLVMScalarOpts + LLVMInstCombine + LLVMTransformUtils +- LLVMipa + LLVMTarget # Analysis, MC, Core, Support + LLVMAnalysis # Core, Support + LLVMOption # Support diff --git a/devel/include-what-you-use/patches/patch-iwyu__ast__util.cc b/devel/include-what-you-use/patches/patch-iwyu__ast__util.cc new file mode 100644 index 0000000000000..c072c287d40a3 --- /dev/null +++ b/devel/include-what-you-use/patches/patch-iwyu__ast__util.cc @@ -0,0 +1,72 @@ +$NetBSD: patch-iwyu__ast__util.cc,v 1.1 2016/03/14 14:36:39 tnn Exp $ + +try to fix build w/ clang-3.8 +Not sure if this change is correct, but it seems to work + +--- iwyu_ast_util.cc.orig 2015-12-11 05:45:54.000000000 +0000 ++++ iwyu_ast_util.cc +@@ -105,6 +105,7 @@ using clang::TagDecl; + using clang::TagType; + using clang::TemplateArgument; + using clang::TemplateArgumentList; ++using clang::TemplateArgumentListInfo; + using clang::TemplateArgumentLoc; + using clang::TemplateDecl; + using clang::TemplateName; +@@ -759,7 +760,7 @@ map GetTplType + num_args = call_expr->getNumArgs(); + const Expr* callee_expr = call_expr->getCallee()->IgnoreParenCasts(); + if (const ASTTemplateArgumentListInfo* explicit_tpl_args +- = GetExplicitTplArgs(callee_expr)) { ++ = GetExplicitTplArgs(decl, callee_expr)) { + retval = GetTplTypeResugarMapForFunctionExplicitTplArgs( + decl, explicit_tpl_args); + start_of_implicit_args = explicit_tpl_args->NumTemplateArgs; +@@ -767,7 +768,7 @@ map GetTplType + } else { + // If calling_expr has explicit template args, then consider them. + if (const ASTTemplateArgumentListInfo* explicit_tpl_args +- = GetExplicitTplArgs(calling_expr)) { ++ = GetExplicitTplArgs(decl, calling_expr)) { + retval = GetTplTypeResugarMapForFunctionExplicitTplArgs( + decl, explicit_tpl_args); + retval = ResugarTypeComponents(retval); +@@ -1319,18 +1320,27 @@ bool IsCastToReferenceType(const CastExp + CHECK_UNREACHABLE_("Unexpected type of cast expression"); + } + +-const ASTTemplateArgumentListInfo* GetExplicitTplArgs(const Expr* expr) { +- if (const DeclRefExpr* decl_ref = DynCastFrom(expr)) +- return decl_ref->getOptionalExplicitTemplateArgs(); +- if (const MemberExpr* member_expr = DynCastFrom(expr)) +- return member_expr->getOptionalExplicitTemplateArgs(); ++const ASTTemplateArgumentListInfo* GetExplicitTplArgs(const FunctionDecl* decl, const Expr* expr) { ++ TemplateArgumentListInfo tali; ++ if (const DeclRefExpr* decl_ref = DynCastFrom(expr)) { ++ decl_ref->copyTemplateArgumentsInto(tali); ++ return ASTTemplateArgumentListInfo::Create(decl->getASTContext(), tali); ++ } ++ if (const MemberExpr* member_expr = DynCastFrom(expr)) { ++ member_expr->copyTemplateArgumentsInto(tali); ++ return ASTTemplateArgumentListInfo::Create(decl->getASTContext(), tali); ++ } + // Ugh, annoying casts needed because no const methods exist. +- if (const OverloadExpr* overload_expr = DynCastFrom(expr)) +- return const_cast(overload_expr) +- ->getOptionalExplicitTemplateArgs(); +- if (const DependentScopeDeclRefExpr* dependent_decl_ref = DynCastFrom(expr)) +- return const_cast(dependent_decl_ref) +- ->getOptionalExplicitTemplateArgs(); ++ if (const OverloadExpr* overload_expr = DynCastFrom(expr)) { ++ const_cast(overload_expr) ++ ->copyTemplateArgumentsInto(tali); ++ return ASTTemplateArgumentListInfo::Create(decl->getASTContext(), tali); ++ } ++ if (const DependentScopeDeclRefExpr* dependent_decl_ref = DynCastFrom(expr)) { ++ const_cast(dependent_decl_ref) ++ ->copyTemplateArgumentsInto(tali); ++ return ASTTemplateArgumentListInfo::Create(decl->getASTContext(), tali); ++ } + return NULL; + } + diff --git a/devel/include-what-you-use/patches/patch-iwyu__ast__util.h b/devel/include-what-you-use/patches/patch-iwyu__ast__util.h new file mode 100644 index 0000000000000..95ee80540765d --- /dev/null +++ b/devel/include-what-you-use/patches/patch-iwyu__ast__util.h @@ -0,0 +1,15 @@ +$NetBSD: patch-iwyu__ast__util.h,v 1.1 2016/03/14 14:36:39 tnn Exp $ + +try to fix build w/ clang-3.8 +Not sure if this change is correct, but it seems to work + +--- iwyu_ast_util.h.orig 2015-12-11 05:45:54.000000000 +0000 ++++ iwyu_ast_util.h +@@ -800,6 +800,7 @@ bool IsCastToReferenceType(const clang:: + // Returns the list of explicit template args for all exprs that support + // such a concept (declrefexpr, memberexpr), and NULL if none is present. + const clang::ASTTemplateArgumentListInfo* GetExplicitTplArgs( ++ const clang::FunctionDecl* decl, + const clang::Expr* expr); + + } // namespace include_what_you_use From 9dbedb6c603b61a73b98cf5f394cfc6210431b59 Mon Sep 17 00:00:00 2001 From: taca Date: Mon, 14 Mar 2016 15:08:58 +0000 Subject: [PATCH 0085/2457] Remove drupal6. --- www/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/www/Makefile b/www/Makefile index fa975cc1a3480..92ba20ef8e436 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1158 2016/03/12 09:26:51 fhajny Exp $ +# $NetBSD: Makefile,v 1.1159 2016/03/14 15:08:58 taca Exp $ # COMMENT= Packages related to the World Wide Web @@ -94,7 +94,6 @@ SUBDIR+= deforaos-surfer SUBDIR+= dillo SUBDIR+= drivel SUBDIR+= drraw -SUBDIR+= drupal6 SUBDIR+= drupal7 SUBDIR+= elinks SUBDIR+= eliom From dd94ccfc00164735b08d99bd6ecf904f227bd875 Mon Sep 17 00:00:00 2001 From: taca Date: Mon, 14 Mar 2016 15:09:24 +0000 Subject: [PATCH 0086/2457] Remove drupal6, it has been EOL. --- www/drupal6/DESCR | 21 - www/drupal6/MESSAGE | 16 - www/drupal6/Makefile | 94 ---- www/drupal6/PLIST | 470 -------------------- www/drupal6/distinfo | 7 - www/drupal6/files/drupal.conf | 124 ------ www/drupal6/options.mk | 52 --- www/drupal6/patches/patch-includes_path.inc | 15 - 8 files changed, 799 deletions(-) delete mode 100644 www/drupal6/DESCR delete mode 100644 www/drupal6/MESSAGE delete mode 100644 www/drupal6/Makefile delete mode 100644 www/drupal6/PLIST delete mode 100644 www/drupal6/distinfo delete mode 100644 www/drupal6/files/drupal.conf delete mode 100644 www/drupal6/options.mk delete mode 100644 www/drupal6/patches/patch-includes_path.inc diff --git a/www/drupal6/DESCR b/www/drupal6/DESCR deleted file mode 100644 index ee5503c9d99d2..0000000000000 --- a/www/drupal6/DESCR +++ /dev/null @@ -1,21 +0,0 @@ -Drupal is software that allows an individual or a community of users to easily -publish, manage and organize a great variety of content on a website. Tens of -thousands of people and organizations have used Drupal to set up scores of -different kinds of web sites, including - -* community web portals and discussion sites -* corporate web sites/intranet portals -* personal web sites -* aficionado sites -* e-commerce applications -* resource directories - -Drupal includes features to enable: - -* content management systems -* blogs -* collaborative authoring environments -* forums -* newsletters -* picture galleries -* file uploads and download diff --git a/www/drupal6/MESSAGE b/www/drupal6/MESSAGE deleted file mode 100644 index e4fcd4ad501ec..0000000000000 --- a/www/drupal6/MESSAGE +++ /dev/null @@ -1,16 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2008/04/06 10:15:27 adrianp Exp $ - -To complete the setup you will need to read the INSTALL.txt in order -to setup MySQL/PostgreSQL properly. - -You will need to make Drupal accessible through your HTTP server. If you -are running Apache then you may add the following lines to httpd.conf: - - Include ${PKG_SYSCONFDIR}/drupal.conf - -to make Drupal accessible through: - - http://localhost/drupal/ - -=========================================================================== diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile deleted file mode 100644 index 031ed89e056d8..0000000000000 --- a/www/drupal6/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -# $NetBSD: Makefile,v 1.56 2016/02/25 15:13:55 taca Exp $ - -DISTNAME= drupal-6.38 -PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME} -CATEGORIES= www -MASTER_SITES= http://ftp.drupal.org/files/projects/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://drupal.org/ -COMMENT= Open source content management system -LICENSE= gnu-gpl-v2 - -DEPENDS+= ${PHP_PKG_PREFIX}-gd>=4.3.5:../../graphics/php-gd - -NO_BUILD= YES -DRUPAL= share/drupal -PAX_DIRS= includes misc modules scripts themes -DOCS= CHANGELOG.txt COPYRIGHT.txt INSTALL.mysql.txt \ - INSTALL.pgsql.txt INSTALL.txt LICENSE.txt \ - MAINTAINERS.txt UPGRADE.txt - -PKG_GROUPS_VARS+= WWW_GROUP -PKG_USERS_VARS+= WWW_USER - -BUILD_DEFS+= WWW_USER WWW_GROUP -USE_TOOLS+= perl:run pax -REPLACE_PERL= scripts/code-style.pl - -OWN_DIRS_PERMS+= ${DRUPAL}/sites/default \ - ${WWW_USER} ${WWW_GROUP} 0750 -OWN_DIRS_PERMS+= ${DRUPAL}/files \ - ${WWW_USER} ${WWW_GROUP} 0750 - -CONF_FILES= share/examples/drupal/drupal.conf \ - ${PKG_SYSCONFDIR}/drupal.conf \ - share/examples/drupal/default.profile \ - ${DRUPAL}/profiles/default/default.profile \ - share/examples/drupal/default.settings.php \ - ${DRUPAL}/sites/default/default.settings.php - -REPLACE_INTERPRETER+= php -REPLACE.php.old= .*php[^ ]* -REPLACE.php.new= ${PREFIX}/bin/php -REPLACE_FILES.php= scripts/drupal.sh - -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-install -SUBST_FILES.conf= drupal.conf -SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g" -SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_MESSAGE.conf= Fixing configuration files. - -INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \ - share/doc/drupal share/examples/drupal -.for i in ${PAX_DIRS} -INSTALLATION_DIRS+= ${DRUPAL}/${i} -.endfor - -.include "options.mk" - -OWN_DIRS= share/drupal/sites/default -OWN_DIRS+= share/drupal/profiles -OWN_DIRS+= share/drupal/profiles/default - -post-extract: - ${CP} ${FILESDIR}/drupal.conf ${WRKSRC} - -pre-install: - ${FIND} ${WRKSRC} -type f -name "*.orig" -exec ${RM} -f {} \; - -do-install: - ${INSTALL_DATA} ${WRKSRC}/robots.txt ${DESTDIR}${PREFIX}/${DRUPAL} - ${INSTALL_DATA} ${WRKSRC}/sites/all/README.txt \ - ${DESTDIR}${PREFIX}/${DRUPAL}/sites/all - ${INSTALL_DATA} ${WRKSRC}/drupal.conf \ - ${DESTDIR}${PREFIX}/share/examples/drupal - ${INSTALL_DATA} ${WRKSRC}/sites/default/default.settings.php \ - ${DESTDIR}${PREFIX}/share/examples/drupal - ${INSTALL_DATA} ${WRKSRC}/profiles/default/default.profile \ - ${DESTDIR}${PREFIX}/share/examples/drupal - ${INSTALL_DATA} ${WRKSRC}/*.php ${DESTDIR}${PREFIX}/${DRUPAL} -.for i in ${PAX_DIRS} - cd ${WRKSRC}/${i} && ${PAX} -rw . ${DESTDIR}${PREFIX}/${DRUPAL}/${i} -.endfor -.for i in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/drupal -.endfor - -post-install: - ${FIND} ${DESTDIR}${PREFIX}/${DRUPAL} \ - \( -name '*.jpg' -o -name '*.png' \) | ${XARGS} ${CHMOD} 0644 - -.include "../../lang/php/phpversion.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/drupal6/PLIST b/www/drupal6/PLIST deleted file mode 100644 index 659ffcbf21b92..0000000000000 --- a/www/drupal6/PLIST +++ /dev/null @@ -1,470 +0,0 @@ -@comment $NetBSD: PLIST,v 1.9 2012/02/19 16:30:17 taca Exp $ -share/doc/drupal/CHANGELOG.txt -share/doc/drupal/COPYRIGHT.txt -share/doc/drupal/INSTALL.mysql.txt -share/doc/drupal/INSTALL.pgsql.txt -share/doc/drupal/INSTALL.txt -share/doc/drupal/LICENSE.txt -share/doc/drupal/MAINTAINERS.txt -share/doc/drupal/UPGRADE.txt -share/drupal/cron.php -share/drupal/includes/actions.inc -share/drupal/includes/batch.inc -share/drupal/includes/bootstrap.inc -share/drupal/includes/cache-install.inc -share/drupal/includes/cache.inc -share/drupal/includes/common.inc -share/drupal/includes/database.inc -share/drupal/includes/database.mysql-common.inc -share/drupal/includes/database.mysql.inc -share/drupal/includes/database.mysqli.inc -share/drupal/includes/database.pgsql.inc -share/drupal/includes/file.inc -share/drupal/includes/form.inc -share/drupal/includes/image.gd.inc -share/drupal/includes/image.inc -share/drupal/includes/install.inc -share/drupal/includes/install.mysql.inc -share/drupal/includes/install.mysqli.inc -share/drupal/includes/install.pgsql.inc -share/drupal/includes/language.inc -share/drupal/includes/locale.inc -share/drupal/includes/lock-install.inc -share/drupal/includes/lock.inc -share/drupal/includes/mail.inc -share/drupal/includes/menu.inc -share/drupal/includes/module.inc -share/drupal/includes/pager.inc -share/drupal/includes/path.inc -share/drupal/includes/session.inc -share/drupal/includes/tablesort.inc -share/drupal/includes/theme.inc -share/drupal/includes/theme.maintenance.inc -share/drupal/includes/unicode.entities.inc -share/drupal/includes/unicode.inc -share/drupal/includes/xmlrpc.inc -share/drupal/includes/xmlrpcs.inc -share/drupal/index.php -share/drupal/install.php -share/drupal/misc/ahah.js -share/drupal/misc/arrow-asc.png -share/drupal/misc/arrow-desc.png -share/drupal/misc/autocomplete.js -share/drupal/misc/batch.js -share/drupal/misc/blog.png -share/drupal/misc/collapse.js -share/drupal/misc/draggable.png -share/drupal/misc/drupal.js -share/drupal/misc/druplicon.png -share/drupal/misc/farbtastic/farbtastic.css -share/drupal/misc/farbtastic/farbtastic.js -share/drupal/misc/farbtastic/marker.png -share/drupal/misc/farbtastic/mask.png -share/drupal/misc/farbtastic/wheel.png -share/drupal/misc/favicon.ico -share/drupal/misc/feed.png -share/drupal/misc/form.js -share/drupal/misc/forum-closed.png -share/drupal/misc/forum-default.png -share/drupal/misc/forum-hot-new.png -share/drupal/misc/forum-hot.png -share/drupal/misc/forum-new.png -share/drupal/misc/forum-sticky.png -share/drupal/misc/grippie.png -share/drupal/misc/jquery.form.js -share/drupal/misc/jquery.js -share/drupal/misc/menu-collapsed-rtl.png -share/drupal/misc/menu-collapsed.png -share/drupal/misc/menu-expanded.png -share/drupal/misc/menu-leaf.png -share/drupal/misc/powered-black-135x42.png -share/drupal/misc/powered-black-80x15.png -share/drupal/misc/powered-black-88x31.png -share/drupal/misc/powered-blue-135x42.png -share/drupal/misc/powered-blue-80x15.png -share/drupal/misc/powered-blue-88x31.png -share/drupal/misc/powered-gray-135x42.png -share/drupal/misc/powered-gray-80x15.png -share/drupal/misc/powered-gray-88x31.png -share/drupal/misc/print-rtl.css -share/drupal/misc/print.css -share/drupal/misc/progress.gif -share/drupal/misc/progress.js -share/drupal/misc/tabledrag.js -share/drupal/misc/tableheader.js -share/drupal/misc/tableselect.js -share/drupal/misc/teaser.js -share/drupal/misc/textarea.js -share/drupal/misc/throbber.gif -share/drupal/misc/tree-bottom.png -share/drupal/misc/tree.png -share/drupal/misc/watchdog-error.png -share/drupal/misc/watchdog-ok.png -share/drupal/misc/watchdog-warning.png -share/drupal/misc/xml.png -share/drupal/modules/README.txt -share/drupal/modules/aggregator/aggregator-feed-source.tpl.php -share/drupal/modules/aggregator/aggregator-item.tpl.php -share/drupal/modules/aggregator/aggregator-rtl.css -share/drupal/modules/aggregator/aggregator-summary-item.tpl.php -share/drupal/modules/aggregator/aggregator-summary-items.tpl.php -share/drupal/modules/aggregator/aggregator-wrapper.tpl.php -share/drupal/modules/aggregator/aggregator.admin.inc -share/drupal/modules/aggregator/aggregator.css -share/drupal/modules/aggregator/aggregator.info -share/drupal/modules/aggregator/aggregator.install -share/drupal/modules/aggregator/aggregator.module -share/drupal/modules/aggregator/aggregator.pages.inc -share/drupal/modules/block/block-admin-display-form.tpl.php -share/drupal/modules/block/block.admin.inc -share/drupal/modules/block/block.css -share/drupal/modules/block/block.info -share/drupal/modules/block/block.install -share/drupal/modules/block/block.js -share/drupal/modules/block/block.module -share/drupal/modules/blog/blog.info -share/drupal/modules/blog/blog.module -share/drupal/modules/blog/blog.pages.inc -share/drupal/modules/blogapi/blogapi.info -share/drupal/modules/blogapi/blogapi.install -share/drupal/modules/blogapi/blogapi.module -share/drupal/modules/book/book-all-books-block.tpl.php -share/drupal/modules/book/book-export-html.tpl.php -share/drupal/modules/book/book-navigation.tpl.php -share/drupal/modules/book/book-node-export-html.tpl.php -share/drupal/modules/book/book-rtl.css -share/drupal/modules/book/book.admin.inc -share/drupal/modules/book/book.css -share/drupal/modules/book/book.info -share/drupal/modules/book/book.install -share/drupal/modules/book/book.module -share/drupal/modules/book/book.pages.inc -share/drupal/modules/color/color-rtl.css -share/drupal/modules/color/color.css -share/drupal/modules/color/color.info -share/drupal/modules/color/color.install -share/drupal/modules/color/color.js -share/drupal/modules/color/color.module -share/drupal/modules/color/images/hook-rtl.png -share/drupal/modules/color/images/hook.png -share/drupal/modules/color/images/lock.png -share/drupal/modules/comment/comment-folded.tpl.php -share/drupal/modules/comment/comment-rtl.css -share/drupal/modules/comment/comment-wrapper.tpl.php -share/drupal/modules/comment/comment.admin.inc -share/drupal/modules/comment/comment.css -share/drupal/modules/comment/comment.info -share/drupal/modules/comment/comment.install -share/drupal/modules/comment/comment.js -share/drupal/modules/comment/comment.module -share/drupal/modules/comment/comment.pages.inc -share/drupal/modules/comment/comment.tpl.php -share/drupal/modules/contact/contact.admin.inc -share/drupal/modules/contact/contact.info -share/drupal/modules/contact/contact.install -share/drupal/modules/contact/contact.module -share/drupal/modules/contact/contact.pages.inc -share/drupal/modules/dblog/dblog-rtl.css -share/drupal/modules/dblog/dblog.admin.inc -share/drupal/modules/dblog/dblog.css -share/drupal/modules/dblog/dblog.info -share/drupal/modules/dblog/dblog.install -share/drupal/modules/dblog/dblog.module -share/drupal/modules/filter/filter.admin.inc -share/drupal/modules/filter/filter.info -share/drupal/modules/filter/filter.install -share/drupal/modules/filter/filter.module -share/drupal/modules/filter/filter.pages.inc -share/drupal/modules/forum/forum-icon.tpl.php -share/drupal/modules/forum/forum-list.tpl.php -share/drupal/modules/forum/forum-rtl.css -share/drupal/modules/forum/forum-submitted.tpl.php -share/drupal/modules/forum/forum-topic-list.tpl.php -share/drupal/modules/forum/forum-topic-navigation.tpl.php -share/drupal/modules/forum/forum.admin.inc -share/drupal/modules/forum/forum.css -share/drupal/modules/forum/forum.info -share/drupal/modules/forum/forum.install -share/drupal/modules/forum/forum.module -share/drupal/modules/forum/forum.pages.inc -share/drupal/modules/forum/forums.tpl.php -share/drupal/modules/help/help-rtl.css -share/drupal/modules/help/help.admin.inc -share/drupal/modules/help/help.css -share/drupal/modules/help/help.info -share/drupal/modules/help/help.module -share/drupal/modules/locale/locale.css -share/drupal/modules/locale/locale.info -share/drupal/modules/locale/locale.install -share/drupal/modules/locale/locale.module -share/drupal/modules/menu/menu.admin.inc -share/drupal/modules/menu/menu.info -share/drupal/modules/menu/menu.install -share/drupal/modules/menu/menu.module -share/drupal/modules/node/content_types.inc -share/drupal/modules/node/node-rtl.css -share/drupal/modules/node/node.admin.inc -share/drupal/modules/node/node.css -share/drupal/modules/node/node.info -share/drupal/modules/node/node.install -share/drupal/modules/node/node.module -share/drupal/modules/node/node.pages.inc -share/drupal/modules/node/node.tpl.php -share/drupal/modules/openid/login-bg.png -share/drupal/modules/openid/openid.css -share/drupal/modules/openid/openid.inc -share/drupal/modules/openid/openid.info -share/drupal/modules/openid/openid.install -share/drupal/modules/openid/openid.js -share/drupal/modules/openid/openid.module -share/drupal/modules/openid/openid.pages.inc -share/drupal/modules/openid/xrds.inc -share/drupal/modules/path/path.admin.inc -share/drupal/modules/path/path.info -share/drupal/modules/path/path.module -share/drupal/modules/php/php.info -share/drupal/modules/php/php.install -share/drupal/modules/php/php.module -share/drupal/modules/ping/ping.info -share/drupal/modules/ping/ping.module -share/drupal/modules/poll/poll-bar-block.tpl.php -share/drupal/modules/poll/poll-bar.tpl.php -share/drupal/modules/poll/poll-results-block.tpl.php -share/drupal/modules/poll/poll-results.tpl.php -share/drupal/modules/poll/poll-rtl.css -share/drupal/modules/poll/poll-vote.tpl.php -share/drupal/modules/poll/poll.css -share/drupal/modules/poll/poll.info -share/drupal/modules/poll/poll.install -share/drupal/modules/poll/poll.module -share/drupal/modules/poll/poll.pages.inc -share/drupal/modules/profile/profile-block.tpl.php -share/drupal/modules/profile/profile-listing.tpl.php -share/drupal/modules/profile/profile-wrapper.tpl.php -share/drupal/modules/profile/profile.admin.inc -share/drupal/modules/profile/profile.css -share/drupal/modules/profile/profile.info -share/drupal/modules/profile/profile.install -share/drupal/modules/profile/profile.js -share/drupal/modules/profile/profile.module -share/drupal/modules/profile/profile.pages.inc -share/drupal/modules/search/search-block-form.tpl.php -share/drupal/modules/search/search-result.tpl.php -share/drupal/modules/search/search-results.tpl.php -share/drupal/modules/search/search-rtl.css -share/drupal/modules/search/search-theme-form.tpl.php -share/drupal/modules/search/search.admin.inc -share/drupal/modules/search/search.css -share/drupal/modules/search/search.info -share/drupal/modules/search/search.install -share/drupal/modules/search/search.module -share/drupal/modules/search/search.pages.inc -share/drupal/modules/statistics/statistics.admin.inc -share/drupal/modules/statistics/statistics.info -share/drupal/modules/statistics/statistics.install -share/drupal/modules/statistics/statistics.module -share/drupal/modules/statistics/statistics.pages.inc -share/drupal/modules/syslog/syslog.info -share/drupal/modules/syslog/syslog.install -share/drupal/modules/syslog/syslog.module -share/drupal/modules/system/admin-rtl.css -share/drupal/modules/system/admin.css -share/drupal/modules/system/block.tpl.php -share/drupal/modules/system/box.tpl.php -share/drupal/modules/system/defaults-rtl.css -share/drupal/modules/system/defaults.css -share/drupal/modules/system/maintenance-page.tpl.php -share/drupal/modules/system/maintenance.css -share/drupal/modules/system/page.tpl.php -share/drupal/modules/system/system-menus-rtl.css -share/drupal/modules/system/system-menus.css -share/drupal/modules/system/system-rtl.css -share/drupal/modules/system/system.admin.inc -share/drupal/modules/system/system.css -share/drupal/modules/system/system.info -share/drupal/modules/system/system.install -share/drupal/modules/system/system.js -share/drupal/modules/system/system.module -share/drupal/modules/taxonomy/taxonomy.admin.inc -share/drupal/modules/taxonomy/taxonomy.css -share/drupal/modules/taxonomy/taxonomy.info -share/drupal/modules/taxonomy/taxonomy.install -share/drupal/modules/taxonomy/taxonomy.js -share/drupal/modules/taxonomy/taxonomy.module -share/drupal/modules/taxonomy/taxonomy.pages.inc -share/drupal/modules/throttle/throttle.admin.inc -share/drupal/modules/throttle/throttle.info -share/drupal/modules/throttle/throttle.module -share/drupal/modules/tracker/tracker.css -share/drupal/modules/tracker/tracker.info -share/drupal/modules/tracker/tracker.module -share/drupal/modules/tracker/tracker.pages.inc -share/drupal/modules/translation/translation.info -share/drupal/modules/translation/translation.module -share/drupal/modules/translation/translation.pages.inc -share/drupal/modules/trigger/trigger.admin.inc -share/drupal/modules/trigger/trigger.info -share/drupal/modules/trigger/trigger.install -share/drupal/modules/trigger/trigger.module -share/drupal/modules/update/update-rtl.css -share/drupal/modules/update/update.compare.inc -share/drupal/modules/update/update.css -share/drupal/modules/update/update.fetch.inc -share/drupal/modules/update/update.info -share/drupal/modules/update/update.install -share/drupal/modules/update/update.module -share/drupal/modules/update/update.report.inc -share/drupal/modules/update/update.settings.inc -share/drupal/modules/upload/upload.admin.inc -share/drupal/modules/upload/upload.info -share/drupal/modules/upload/upload.install -share/drupal/modules/upload/upload.module -share/drupal/modules/user/user-picture.tpl.php -share/drupal/modules/user/user-profile-category.tpl.php -share/drupal/modules/user/user-profile-item.tpl.php -share/drupal/modules/user/user-profile.tpl.php -share/drupal/modules/user/user-rtl.css -share/drupal/modules/user/user.admin.inc -share/drupal/modules/user/user.css -share/drupal/modules/user/user.info -share/drupal/modules/user/user.install -share/drupal/modules/user/user.js -share/drupal/modules/user/user.module -share/drupal/modules/user/user.pages.inc -share/drupal/robots.txt -share/drupal/scripts/code-clean.sh -share/drupal/scripts/code-style.pl -share/drupal/scripts/cron-curl.sh -share/drupal/scripts/cron-lynx.sh -share/drupal/scripts/drupal.sh -share/drupal/sites/all/README.txt -share/drupal/themes/README.txt -share/drupal/themes/bluemarine/block.tpl.php -share/drupal/themes/bluemarine/bluemarine.info -share/drupal/themes/bluemarine/box.tpl.php -share/drupal/themes/bluemarine/comment.tpl.php -share/drupal/themes/bluemarine/logo.png -share/drupal/themes/bluemarine/node.tpl.php -share/drupal/themes/bluemarine/page.tpl.php -share/drupal/themes/bluemarine/screenshot.png -share/drupal/themes/bluemarine/style-rtl.css -share/drupal/themes/bluemarine/style.css -share/drupal/themes/chameleon/background.png -share/drupal/themes/chameleon/chameleon.info -share/drupal/themes/chameleon/chameleon.theme -share/drupal/themes/chameleon/common-rtl.css -share/drupal/themes/chameleon/common.css -share/drupal/themes/chameleon/logo.png -share/drupal/themes/chameleon/marvin/bullet.png -share/drupal/themes/chameleon/marvin/druplicon-watermark-rtl.png -share/drupal/themes/chameleon/marvin/druplicon-watermark.png -share/drupal/themes/chameleon/marvin/logo.png -share/drupal/themes/chameleon/marvin/marvin.info -share/drupal/themes/chameleon/marvin/screenshot.png -share/drupal/themes/chameleon/marvin/style-rtl.css -share/drupal/themes/chameleon/marvin/style.css -share/drupal/themes/chameleon/screenshot.png -share/drupal/themes/chameleon/style-rtl.css -share/drupal/themes/chameleon/style.css -share/drupal/themes/engines/phptemplate/phptemplate.engine -share/drupal/themes/garland/block.tpl.php -share/drupal/themes/garland/color/base.png -share/drupal/themes/garland/color/color.inc -share/drupal/themes/garland/color/preview.css -share/drupal/themes/garland/color/preview.png -share/drupal/themes/garland/comment.tpl.php -share/drupal/themes/garland/fix-ie-rtl.css -share/drupal/themes/garland/fix-ie.css -share/drupal/themes/garland/garland.info -share/drupal/themes/garland/images/bg-bar-white.png -share/drupal/themes/garland/images/bg-bar.png -share/drupal/themes/garland/images/bg-content-left.png -share/drupal/themes/garland/images/bg-content-right.png -share/drupal/themes/garland/images/bg-content.png -share/drupal/themes/garland/images/bg-navigation-item-hover.png -share/drupal/themes/garland/images/bg-navigation-item.png -share/drupal/themes/garland/images/bg-navigation.png -share/drupal/themes/garland/images/bg-tab.png -share/drupal/themes/garland/images/body.png -share/drupal/themes/garland/images/gradient-inner.png -share/drupal/themes/garland/images/menu-collapsed-rtl.gif -share/drupal/themes/garland/images/menu-collapsed.gif -share/drupal/themes/garland/images/menu-expanded.gif -share/drupal/themes/garland/images/menu-leaf.gif -share/drupal/themes/garland/images/task-list.png -share/drupal/themes/garland/logo.png -share/drupal/themes/garland/maintenance-page.tpl.php -share/drupal/themes/garland/minnelli/color/base.png -share/drupal/themes/garland/minnelli/color/color.inc -share/drupal/themes/garland/minnelli/color/preview.png -share/drupal/themes/garland/minnelli/logo.png -share/drupal/themes/garland/minnelli/minnelli.css -share/drupal/themes/garland/minnelli/minnelli.info -share/drupal/themes/garland/minnelli/screenshot.png -share/drupal/themes/garland/node.tpl.php -share/drupal/themes/garland/page.tpl.php -share/drupal/themes/garland/print.css -share/drupal/themes/garland/screenshot.png -share/drupal/themes/garland/style-rtl.css -share/drupal/themes/garland/style.css -share/drupal/themes/garland/template.php -share/drupal/themes/pushbutton/arrow-next-hover-rtl.png -share/drupal/themes/pushbutton/arrow-next-hover.png -share/drupal/themes/pushbutton/arrow-next-rtl.png -share/drupal/themes/pushbutton/arrow-next-visited-rtl.png -share/drupal/themes/pushbutton/arrow-next-visited.png -share/drupal/themes/pushbutton/arrow-next.png -share/drupal/themes/pushbutton/arrow-prev-hover-rtl.png -share/drupal/themes/pushbutton/arrow-prev-hover.png -share/drupal/themes/pushbutton/arrow-prev-rtl.png -share/drupal/themes/pushbutton/arrow-prev-visited-rtl.png -share/drupal/themes/pushbutton/arrow-prev-visited.png -share/drupal/themes/pushbutton/arrow-prev.png -share/drupal/themes/pushbutton/arrow-up-hover.png -share/drupal/themes/pushbutton/arrow-up-visited.png -share/drupal/themes/pushbutton/arrow-up.png -share/drupal/themes/pushbutton/background.png -share/drupal/themes/pushbutton/block.tpl.php -share/drupal/themes/pushbutton/box.tpl.php -share/drupal/themes/pushbutton/comment.tpl.php -share/drupal/themes/pushbutton/forum-container-rtl.jpg -share/drupal/themes/pushbutton/forum-container.jpg -share/drupal/themes/pushbutton/forum-link-rtl.png -share/drupal/themes/pushbutton/forum-link.png -share/drupal/themes/pushbutton/header-a.jpg -share/drupal/themes/pushbutton/header-b-rtl.jpg -share/drupal/themes/pushbutton/header-b.jpg -share/drupal/themes/pushbutton/header-c.png -share/drupal/themes/pushbutton/icon-block-rtl.png -share/drupal/themes/pushbutton/icon-block.png -share/drupal/themes/pushbutton/icon-comment-rtl.png -share/drupal/themes/pushbutton/icon-comment.png -share/drupal/themes/pushbutton/logo-active-rtl.jpg -share/drupal/themes/pushbutton/logo-active.jpg -share/drupal/themes/pushbutton/logo-background-rtl.jpg -share/drupal/themes/pushbutton/logo-background.jpg -share/drupal/themes/pushbutton/logo-hover-rtl.jpg -share/drupal/themes/pushbutton/logo-hover.jpg -share/drupal/themes/pushbutton/logo.png -share/drupal/themes/pushbutton/node.tpl.php -share/drupal/themes/pushbutton/page.tpl.php -share/drupal/themes/pushbutton/pushbutton.info -share/drupal/themes/pushbutton/screenshot.png -share/drupal/themes/pushbutton/style-rtl.css -share/drupal/themes/pushbutton/style.css -share/drupal/themes/pushbutton/tabs-off-rtl.png -share/drupal/themes/pushbutton/tabs-off.png -share/drupal/themes/pushbutton/tabs-on-rtl.png -share/drupal/themes/pushbutton/tabs-on.png -share/drupal/themes/pushbutton/tabs-option-hover-rtl.png -share/drupal/themes/pushbutton/tabs-option-hover.png -share/drupal/themes/pushbutton/tabs-option-off-rtl.png -share/drupal/themes/pushbutton/tabs-option-off.png -share/drupal/themes/pushbutton/tabs-option-on.png -share/drupal/update.php -share/drupal/xmlrpc.php -share/examples/drupal/default.profile -share/examples/drupal/default.settings.php -share/examples/drupal/drupal.conf -@pkgdir share/drupal/files -@pkgdir share/drupal diff --git a/www/drupal6/distinfo b/www/drupal6/distinfo deleted file mode 100644 index e21241c00be8d..0000000000000 --- a/www/drupal6/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.38 2016/02/25 15:13:55 taca Exp $ - -SHA1 (drupal-6.38.tar.gz) = a041690cf79cb7551535e789d5b08b335e3478ba -RMD160 (drupal-6.38.tar.gz) = e43b5f0871d3e4db46eae74f2728307ea3db3e36 -SHA512 (drupal-6.38.tar.gz) = ad8b0e04c15afa6e5b5f7d60478c7ac7f6123cd0735424588a4266a987d13df96d8349a8674bcdbcfc437a63847269477a6c836660b7dd990dbb1b844809ce14 -Size (drupal-6.38.tar.gz) = 1113790 bytes -SHA1 (patch-includes_path.inc) = 84825d47cc6cbe3466cb34adb7e512231293e9a4 diff --git a/www/drupal6/files/drupal.conf b/www/drupal6/files/drupal.conf deleted file mode 100644 index 5b4afa577e2d9..0000000000000 --- a/www/drupal6/files/drupal.conf +++ /dev/null @@ -1,124 +0,0 @@ -# $NetBSD: drupal.conf,v 1.3 2009/12/19 09:29:23 taca Exp $ -# -# Drupal configuration file fragment for Apache - -# -# Apache/PHP/Drupal settings: -# - - - Alias /drupal/ "@PREFIX@/@DRUPAL@/" - - - -AllowOverride Limit Options FileInfo -Order allow,deny -Allow from all - -# Protect files and directories from prying eyes. - - Order allow,deny - - -# Don't show directory listings for URLs which map to a directory. -Options -Indexes - -# Follow symbolic links in this directory. -Options +FollowSymLinks - -# Customized error messages. -ErrorDocument 404 /index.php - -# Force simple error message for requests for non-existent favicon.ico. - - # There is no end quote below, for compatibility with Apache 1.3. - ErrorDocument 404 "The requested file favicon.ico was not found. - - -# Set the default handler. -DirectoryIndex index.php - -# Override PHP settings. More in sites/default/settings.php -# but the following cannot be changed at runtime. -php_value memory_limit 16M - -# PHP 4, Apache 1. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# PHP 4, Apache 2. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# PHP 5, Apache 1 and 2. - - php_value magic_quotes_gpc 0 - php_value register_globals 0 - php_value session.auto_start 0 - php_value mbstring.http_input pass - php_value mbstring.http_output pass - php_value mbstring.encoding_translation 0 - - -# Requires mod_expires to be enabled. - - # Enable expirations. - ExpiresActive On - - # Cache all files for 2 weeks after access (A). - ExpiresDefault A1209600 - - # Do not cache dynamically generated pages. - ExpiresByType text/html A1 - - -# Various rewrite rules. - - RewriteEngine on - - # If your site can be accessed both with and without the 'www.' prefix, you - # can use one of the following settings to redirect users to your preferred - # URL, either WITH or WITHOUT the 'www.' prefix. Choose ONLY one option: - # - # To redirect all users to access the site WITH the 'www.' prefix, - # (http://example.com/... will be redirected to http://www.example.com/...) - # adapt and uncomment the following: - # RewriteCond %{HTTP_HOST} ^example\.com$ [NC] - # RewriteRule ^(.*)$ http://www.example.com/$1 [L,R=301] - # - # To redirect all users to access the site WITHOUT the 'www.' prefix, - # (http://www.example.com/... will be redirected to http://example.com/...) - # uncomment and adapt the following: - # RewriteCond %{HTTP_HOST} ^www\.example\.com$ [NC] - # RewriteRule ^(.*)$ http://example.com/$1 [L,R=301] - - # Modify the RewriteBase if you are using Drupal in a subdirectory or in a - # VirtualDocumentRoot and the rewrite rules are not working properly. - # For example if your site is at http://example.com/drupal uncomment and - # modify the following line: - # RewriteBase /drupal - # - # If your site is running in a VirtualDocumentRoot at http://example.com/, - # uncomment the following line: - # RewriteBase / - - # Rewrite URLs of the form 'index.php?q=x'. - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteCond %{REQUEST_URI} !=/favicon.ico - RewriteRule ^(.*)$ index.php?q=$1 [L,QSA] - - - diff --git a/www/drupal6/options.mk b/www/drupal6/options.mk deleted file mode 100644 index 5056975a74b14..0000000000000 --- a/www/drupal6/options.mk +++ /dev/null @@ -1,52 +0,0 @@ -# $NetBSD: options.mk,v 1.8 2015/12/06 12:13:13 taca Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.drupal - -PKG_OPTIONS_REQUIRED_GROUPS= db -PKG_OPTIONS_GROUP.db= mysql pgsql - -PKG_SUPPORTED_OPTIONS= drupal-xmlservices apache unicode -PKG_SUGGESTED_OPTIONS= mysql drupal-xmlservices apache - -.include "../../mk/bsd.options.mk" - -### -### Use PostgreSQL for storing Drupal data -### -.if !empty(PKG_OPTIONS:Mpgsql) -DEPENDS+= ${PHP_PKG_PREFIX}-pgsql-[0-9]*:../../databases/php-pgsql -.elif !empty(PKG_OPTIONS:Mmysql) -### -### Use MySQL for storing Drupal data -### -DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql -PHP_VERSIONS_ACCEPTED= 55 56 -.endif - -### -### Enable XML-based services such as the Blogger API, Jabber and RSS -### syndication. -### -.if !empty(PKG_OPTIONS:Mdrupal-xmlservices) -DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom -.endif - -### -### Support for unicode -### -.if !empty(PKG_OPTIONS:Municode) -DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../converters/php-mbstring -.endif - -### -### Drupal can run on a number of web servers, we support apache by default -### -.if !empty(PKG_OPTIONS:Mapache) -DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.5:../../www/ap-php -. include "../../mk/apache.mk" -WWW_USER?= ${APACHE_USER} -WWW_GROUP?= ${APACHE_GROUP} -.else -WWW_USER?= ${ROOT_USER} -WWW_GROUP?= ${ROOT_GROUP} -.endif diff --git a/www/drupal6/patches/patch-includes_path.inc b/www/drupal6/patches/patch-includes_path.inc deleted file mode 100644 index 6cf8e98757194..0000000000000 --- a/www/drupal6/patches/patch-includes_path.inc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-includes_path.inc,v 1.1 2012/12/20 12:47:35 taca Exp $ - -Possible fix to SA4931. - ---- includes/path.inc.orig 2012-12-19 18:51:43.000000000 +0000 -+++ includes/path.inc -@@ -13,7 +13,7 @@ - * Initialize the $_GET['q'] variable to the proper normal path. - */ - function drupal_init_path() { -- if (!empty($_GET['q'])) { -+ if (!empty($_GET['q']) && is_string($_GET['q'])) { - $_GET['q'] = drupal_get_normal_path(trim($_GET['q'], '/')); - } - else { From ab0aecb9a57a87310da0fa449bc6adb2191a7a1a Mon Sep 17 00:00:00 2001 From: taca Date: Mon, 14 Mar 2016 15:10:09 +0000 Subject: [PATCH 0087/2457] Note remove www/drupal6 package. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 0d6687c1aa179..dd88b6781e91e 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1167 2016/03/14 14:31:13 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1168 2016/03/14 15:10:09 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1557,3 +1557,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/grep to 2.24 [ryoon 2016-03-14] Updated security/putty to 0.67 [ryoon 2016-03-14] Updated security/tor-browser to 5.5.3 [ryoon 2016-03-14] + Removed www/drupal6 [taca 2016-03-14] From 9beb6adb480c20f9ca3763021919ee2dac1b93ec Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 15:37:47 +0000 Subject: [PATCH 0088/2457] don't use msgfmt --check. It breaks with gettext 0.14.1. --- fonts/fontforge/distinfo | 3 ++- fonts/fontforge/patches/patch-po_Makefile.in | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 fonts/fontforge/patches/patch-po_Makefile.in diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo index 46792316fc65a..2c831baad4482 100644 --- a/fonts/fontforge/distinfo +++ b/fonts/fontforge/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.61 2016/02/07 14:09:08 adam Exp $ +$NetBSD: distinfo,v 1.62 2016/03/14 15:37:47 tnn Exp $ SHA1 (fontforge-20150824.tar.gz) = 2dd442baee9cd16efb5928bf51cc3d6b9c73d9af RMD160 (fontforge-20150824.tar.gz) = e26fca6affc11d1ea6c927751a63dae0bfeab47b @@ -8,3 +8,4 @@ SHA1 (patch-Makefile.in) = 5a7cad2f9516540048008a13a257d6c9720a22c9 SHA1 (patch-configure) = 47cd1d1ff60d40114aa08308d4e73b7c2da4716e SHA1 (patch-fontforge_python.c) = 1c1cb83feada6e8588754a728863ee92d7f9368f SHA1 (patch-fontforge_splinefont.h) = b518e61e3ba88c7fb86ebe53fb62109447791121 +SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b diff --git a/fonts/fontforge/patches/patch-po_Makefile.in b/fonts/fontforge/patches/patch-po_Makefile.in new file mode 100644 index 0000000000000..3e90e21a43533 --- /dev/null +++ b/fonts/fontforge/patches/patch-po_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-po_Makefile.in,v 1.1 2016/03/14 15:37:47 tnn Exp $ + +--check trips up gettext 0.14. + +--- po/Makefile.in.orig 2015-08-25 09:53:09.000000000 +0000 ++++ po/Makefile.in +@@ -1396,7 +1396,7 @@ uninstall-am: uninstall-local + + + .po.mo: +- $(MSGFMT) --check --output-file=$@ $< ++ $(MSGFMT) --output-file=$@ $< + + all-local: $(MO_FILES) + From 6dc03e2179fb3510c86cc12355d656bcbf135024 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Mon, 14 Mar 2016 16:03:36 +0000 Subject: [PATCH 0089/2457] Update mlterm to 3.7.0. Changes noted in doc/en/ReleaseNote: ver 3.7.0 * Support OSC 1337. (See http://www.iterm2.com/images.html) * Support animation gif of OSC 5379 show_picture on MacOSX/cocoa. * Enable to place configuration files in mlterm.app/mlterm/ on MacOSX/Cocoa. * Add 'mlfc' tool which automatically generates ~/.mlterm/aafont and ~/.mlterm/font-fb. * Change the format of ~/.mlterm/*font is changed as follows. [Charset] = [Font name];[Size],[Font name];[Size],[Font name];... -> [Charset] = [Font name] * Drop XT_CBLINK (CSI?12h/CSI?12l) support. * Simplify font configuration of OSC 5379. ('mlcc font USASCII ' is available.) * "CSI 38;2;r;g;b m" and "CSI 48;2;r;g;b m" shows high colors instead of approximate vt 256 colors. "vt_color_mode" / --vtcolor(=256/high/true) option changes the behavior. * Bug fixes: Fix illegal memory access on MacOSX/Cocoa and Android. Fix segfault in spliting window on MacOSX/Cocoa. (Enbugged at 3.6.2) --- x11/mlterm/Makefile | 4 ++-- x11/mlterm/PLIST | 3 ++- x11/mlterm/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 46e1b1d5c8f44..95d5cd94a55e7 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.125 2016/02/14 14:04:16 tsutsui Exp $ +# $NetBSD: Makefile,v 1.126 2016/03/14 16:03:36 tsutsui Exp $ -DISTNAME= mlterm-3.6.3 +DISTNAME= mlterm-3.7.0 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mlterm/} diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST index b524b77f6f4ae..0e072501b1b0e 100644 --- a/x11/mlterm/PLIST +++ b/x11/mlterm/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.35 2016/02/14 14:04:16 tsutsui Exp $ +@comment $NetBSD: PLIST,v 1.36 2016/03/14 16:03:36 tsutsui Exp $ bin/mlcc bin/mlclient bin/mlclientx +bin/mlfc bin/mlterm ${PLIST.fb}bin/mlterm-fb lib/libkik.la diff --git a/x11/mlterm/distinfo b/x11/mlterm/distinfo index 2aba487e757c3..ef324a01c4a7b 100644 --- a/x11/mlterm/distinfo +++ b/x11/mlterm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.63 2016/02/14 14:04:16 tsutsui Exp $ +$NetBSD: distinfo,v 1.64 2016/03/14 16:03:36 tsutsui Exp $ -SHA1 (mlterm-3.6.3.tar.gz) = b069a0bc47a5bcb4256ebb87294c9451ed25c5c6 -RMD160 (mlterm-3.6.3.tar.gz) = f83fcdb91ea8af3b62afd2bfd03b838dee48f77f -SHA512 (mlterm-3.6.3.tar.gz) = bbc6c61422f81a793b64fcbabb972765f7e544c7d4fc3d8874ab78a25fe8e7a97dc96c3d44e582127dde8822e7c254ed58004535524e361a2a0d91410e7ef027 -Size (mlterm-3.6.3.tar.gz) = 3677639 bytes +SHA1 (mlterm-3.7.0.tar.gz) = 10900f0303c39cdc6e5d52da6eab569b4410c777 +RMD160 (mlterm-3.7.0.tar.gz) = ba63031fb844eb79c8f5289aba9a62a7a4d0a3e2 +SHA512 (mlterm-3.7.0.tar.gz) = 93dd7e5e15154f1d8e902069f70fe5b50cb30b948ae444bba76fc3f021a9a5d169837efb8e5bb94855eeaf04cecde9323b30330f74ed7929f4e576aab2c6e98b +Size (mlterm-3.7.0.tar.gz) = 3685301 bytes SHA1 (patch-configure) = 686754205102c2ffeb2456b4fad77f72b1a992a6 SHA1 (patch-etc_font-fb) = 03f0b2ecee20ef3201c8e4ce17f03ac90f657b00 From 73b67b0443baed9e2d53f58743f830d328281d0b Mon Sep 17 00:00:00 2001 From: tsutsui Date: Mon, 14 Mar 2016 16:04:44 +0000 Subject: [PATCH 0090/2457] Updated x11/mlterm to 3.7.0 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index dd88b6781e91e..f2fffa653484e 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1168 2016/03/14 15:10:09 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1169 2016/03/14 16:04:44 tsutsui Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1558,3 +1558,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/putty to 0.67 [ryoon 2016-03-14] Updated security/tor-browser to 5.5.3 [ryoon 2016-03-14] Removed www/drupal6 [taca 2016-03-14] + Updated x11/mlterm to 3.7.0 [tsutsui 2016-03-14] From 922c76748faeb5478f74099f451c0c94b4acd1c5 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 14 Mar 2016 19:04:52 +0000 Subject: [PATCH 0091/2457] Remove precompiled Python files in tests directory --- www/py-django-mptt/Makefile | 6 +++++- www/py-django-mptt/PLIST | 21 +-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/www/py-django-mptt/Makefile b/www/py-django-mptt/Makefile index 115b90d69b555..0c18b9df4fbe3 100644 --- a/www/py-django-mptt/Makefile +++ b/www/py-django-mptt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2016/03/06 14:26:09 adam Exp $ +# $NetBSD: Makefile,v 1.11 2016/03/14 19:04:52 adam Exp $ DISTNAME= django-mptt-0.8.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,5 +14,9 @@ USE_LANGUAGES= # empty DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django +post-extract: + ${RM} -f -r ${WRKSRC}/tests/__pycache__ ${WRKSRC}/tests/*.pyc + ${RM} -f -r ${WRKSRC}/tests/myapp/__pycache__ ${WRKSRC}/tests/myapp/*.pyc + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-django-mptt/PLIST b/www/py-django-mptt/PLIST index face96e4500de..e7d9855fc23e1 100644 --- a/www/py-django-mptt/PLIST +++ b/www/py-django-mptt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2016/03/06 14:26:09 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/03/14 19:04:52 adam Exp $ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt @@ -79,20 +79,12 @@ ${PYSITELIB}/tests/.coveragerc ${PYSITELIB}/tests/.gitignore ${PYSITELIB}/tests/__init__.py ${PYSITELIB}/tests/__init__.pyc -${PYSITELIB}/tests/__init__.pyc -${PYSITELIB}/tests/__init__.pyc -${PYSITELIB}/tests/__init__.pyc ${PYSITELIB}/tests/__init__.pyo ${PYSITELIB}/tests/myapp/__init__.py ${PYSITELIB}/tests/myapp/__init__.pyc -${PYSITELIB}/tests/myapp/__init__.pyc -${PYSITELIB}/tests/myapp/__init__.pyc -${PYSITELIB}/tests/myapp/__init__.pyc ${PYSITELIB}/tests/myapp/__init__.pyo ${PYSITELIB}/tests/myapp/admin.py ${PYSITELIB}/tests/myapp/admin.pyc -${PYSITELIB}/tests/myapp/admin.pyc -${PYSITELIB}/tests/myapp/admin.pyc ${PYSITELIB}/tests/myapp/admin.pyo ${PYSITELIB}/tests/myapp/doctests.txt ${PYSITELIB}/tests/myapp/fixtures/categories.json @@ -101,27 +93,16 @@ ${PYSITELIB}/tests/myapp/fixtures/items.json ${PYSITELIB}/tests/myapp/fixtures/persons.json ${PYSITELIB}/tests/myapp/models.py ${PYSITELIB}/tests/myapp/models.pyc -${PYSITELIB}/tests/myapp/models.pyc -${PYSITELIB}/tests/myapp/models.pyc -${PYSITELIB}/tests/myapp/models.pyc ${PYSITELIB}/tests/myapp/models.pyo ${PYSITELIB}/tests/myapp/tests.py ${PYSITELIB}/tests/myapp/tests.pyc -${PYSITELIB}/tests/myapp/tests.pyc -${PYSITELIB}/tests/myapp/tests.pyc -${PYSITELIB}/tests/myapp/tests.pyc ${PYSITELIB}/tests/myapp/tests.pyo ${PYSITELIB}/tests/myapp/urls.py ${PYSITELIB}/tests/myapp/urls.pyc -${PYSITELIB}/tests/myapp/urls.pyc -${PYSITELIB}/tests/myapp/urls.pyc ${PYSITELIB}/tests/myapp/urls.pyo ${PYSITELIB}/tests/mydatabase ${PYSITELIB}/tests/requirements.txt ${PYSITELIB}/tests/runtests.sh ${PYSITELIB}/tests/settings.py ${PYSITELIB}/tests/settings.pyc -${PYSITELIB}/tests/settings.pyc -${PYSITELIB}/tests/settings.pyc -${PYSITELIB}/tests/settings.pyc ${PYSITELIB}/tests/settings.pyo From c169426aab1e96b713f172d25add282a028d1c0e Mon Sep 17 00:00:00 2001 From: markd Date: Mon, 14 Mar 2016 20:11:56 +0000 Subject: [PATCH 0092/2457] Add support for -isystem to legacy wrappers. rewrite "-isystem dir" as "-isystem,dir" transform "-isystem,dir" in same ways as "-Idir" rewrite "-isystem,dir" back to "-isystem dir" in cmd-sink --- mk/buildlink3/bsd.buildlink3.mk | 3 ++- mk/wrapper/arg-source | 14 +++++++++++++- mk/wrapper/cmd-sink | 10 +++++++++- mk/wrapper/gen-transform.sh | 12 +++++++++++- mk/wrapper/transform-gcc | 3 ++- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 0cbf2facc575d..d4e77781e55db 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.236 2015/05/04 19:23:19 joerg Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.237 2016/03/14 20:11:56 markd Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -968,6 +968,7 @@ _CWRAPPERS_TRANSFORM+= L:/usr/lib/../libx32:/usr/libx32 # .for _dir_ in ${COMPILER_INCLUDE_DIRS} _BLNK_TRANSFORM+= opt-sub:-I${_dir_}:-I${_BLNK_MANGLE_DIR.${_dir_}} +_BLNK_TRANSFORM+= opt-sub:-isystem,${_dir_}:-isystem,${_BLNK_MANGLE_DIR.${_dir_}} _CWRAPPERS_TRANSFORM+= I:${_dir_}:${_dir_} .endfor .for _dir_ in ${COMPILER_LIB_DIRS} diff --git a/mk/wrapper/arg-source b/mk/wrapper/arg-source index 803f5deddcd52..bc78af996a9f3 100644 --- a/mk/wrapper/arg-source +++ b/mk/wrapper/arg-source @@ -1,4 +1,4 @@ -# $NetBSD: arg-source,v 1.18 2016/03/13 15:32:06 khorben Exp $ +# $NetBSD: arg-source,v 1.19 2016/03/14 20:11:56 markd Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -61,6 +61,18 @@ while $test $# -gt 0; do $debug_log $wrapperlog " (arg-source) push: $arg$nextarg" ;; ############################################################## + # Convert "-isystem /dir" into a single "-isystem,/dir". + # cmd-sync will put it back + ############################################################## + -isystem) + nextarg="$1"; shift + case "$nextarg" in + -*) msg_log $wrapperlog "WARNING: [arg-source] An $arg option must not be followed by another option, $nextarg." ;; + esac + append_queue argbuf "$arg,$nextarg" + $debug_log $wrapperlog " (arg-source) push: $arg,$nextarg" + ;; + ############################################################## # Split -Wl,option1,option2 into -Wl,option1 -Wl,option2 and # process them again. # diff --git a/mk/wrapper/cmd-sink b/mk/wrapper/cmd-sink index 94f25d4ac63ee..0ac15e5f713b2 100644 --- a/mk/wrapper/cmd-sink +++ b/mk/wrapper/cmd-sink @@ -1,4 +1,4 @@ -# $NetBSD: cmd-sink,v 1.1 2004/09/21 15:01:41 jlam Exp $ +# $NetBSD: cmd-sink,v 1.2 2016/03/14 20:11:56 markd Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -38,5 +38,13 @@ while ! queue_is_empty cmdbuf; do pop_queue cmdbuf arg $debug_log $wrapperlog " (cmd-sink) pop: $arg" + case $arg in + -isystem,*) + dir="${arg#-isystem,}" + arg="-isystem" + . $buildcmd + arg="$dir" + ;; + esac . $buildcmd done diff --git a/mk/wrapper/gen-transform.sh b/mk/wrapper/gen-transform.sh index 58eabd869af68..8227b9a1869e6 100644 --- a/mk/wrapper/gen-transform.sh +++ b/mk/wrapper/gen-transform.sh @@ -1,6 +1,6 @@ #! @WRAPPER_SHELL@ # -# $NetBSD: gen-transform.sh,v 1.10 2014/12/30 15:13:20 wiz Exp $ +# $NetBSD: gen-transform.sh,v 1.11 2016/03/14 20:11:56 markd Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -81,12 +81,16 @@ gen() transform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" gen $_action "opt:-I$1:-I$2" + gen $_action "opt:-isystem,$1:-isystem,$2" gen $_action "opt-sub:-I$1:-I$2" + gen $_action "opt-sub:-isystem,$1:-isystem,$2" ;; untransform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" gen $_action "opt:-I$2:-I$1" + gen $_action "opt:-isystem,$2:-isystem,$1" gen $_action "opt-sub:-I$2:-I$1" + gen $_action "opt-sub:-isystem,$2:-isystem,$1" ;; esac ;; @@ -161,6 +165,7 @@ gen() $debug_log $wrapperlog " (gen-transform) $_cmd: $@" #gen $_action "opt:$1:$2" gen $_action "opt:-I$1:-I$2" + gen $_action "opt:-isystem,$1:-isystem,$2" gen $_action "opt:-L$1:-L$2" gen $_action "rpath-exact:$1:$2" gen $_action "sub-mangle:$1:$2" @@ -172,6 +177,7 @@ gen() no-abspath) $debug_log $wrapperlog " (gen-transform) $_cmd" gen $_action "rm-optarg:-I/" + gen $_action "rm-optarg:-isystem,/" gen $_action "rm-optarg:-L/" for _R in $rpath_options; do gen $_action "rm-optarg:$_R/" @@ -303,7 +309,9 @@ gen() rmdir) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" gen $_action "opt:-I$1:" + gen $_action "opt:-isystem,$1:" gen $_action "rm-optarg:-I$1/" + gen $_action "rm-optarg:-isystem,$1/" gen $_action "opt:-L$1:" gen $_action "rm-optarg:-L$1/" for _R in $rpath_options; do @@ -340,6 +348,7 @@ gen() $debug_log $wrapperlog " (gen-transform) $_cmd: $@" gen $_action "opt-sub-trailer:$1:/\.:$1:" gen $_action "opt-sub-trailer:-I$1:/\.:-I$1:" + gen $_action "opt-sub-trailer:-isystem,$1:/\.:-isystem,$1:" gen $_action "opt-sub-trailer:-L$1:/\.:-L$1:" for _R in $rpath_options; do gen $_action "opt-sub-trailer:$_R$1:/\.:$_R$1:" @@ -355,6 +364,7 @@ gen() #gen $_action "opt-sub:$1:$2" gen $_action "libpath:$1:$2" gen $_action "opt-sub:-I$1:-I$2" + gen $_action "opt-sub:-isystem,$1:-isystem,$2" gen $_action "opt-sub:-L$1:-L$2" gen $_action "sub-rpath:$1:$2" ;; diff --git a/mk/wrapper/transform-gcc b/mk/wrapper/transform-gcc index 4e29fc84e48b5..231cd9288d430 100644 --- a/mk/wrapper/transform-gcc +++ b/mk/wrapper/transform-gcc @@ -1,4 +1,4 @@ -# $NetBSD: transform-gcc,v 1.31 2016/03/12 21:22:04 khorben Exp $ +# $NetBSD: transform-gcc,v 1.32 2016/03/14 20:11:56 markd Exp $ # # This file handles the transformations needed for gcc that can be done # looking at only one argument at a time. @@ -56,6 +56,7 @@ case $arg in -fweb |\ -fwrapv |\ -ggdb |\ +-isystem,* |\ -M |\ -M[DFMPT] |\ -MMD |\ From 46c52f800014ce973493c583359ed883a9cabc61 Mon Sep 17 00:00:00 2001 From: markd Date: Mon, 14 Mar 2016 20:16:08 +0000 Subject: [PATCH 0093/2457] Add support for "-isystem dir", transform in the same way as "-Idir" --- pkgtools/cwrappers/Makefile | 3 ++- .../cwrappers/files/bin/generic-transform-cc.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgtools/cwrappers/Makefile b/pkgtools/cwrappers/Makefile index 517d482c58bf4..45f24564c8328 100644 --- a/pkgtools/cwrappers/Makefile +++ b/pkgtools/cwrappers/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2016/01/10 19:13:05 bsiegert Exp $ +# $NetBSD: Makefile,v 1.15 2016/03/14 20:16:08 markd Exp $ PKGNAME= cwrappers-20160110 +PKGREVISION= 1 CATEGORIES= pkgtools sysutils MAINTAINER= joerg@NetBSD.org diff --git a/pkgtools/cwrappers/files/bin/generic-transform-cc.c b/pkgtools/cwrappers/files/bin/generic-transform-cc.c index 5897df85fa5c4..abb208b5b34fd 100644 --- a/pkgtools/cwrappers/files/bin/generic-transform-cc.c +++ b/pkgtools/cwrappers/files/bin/generic-transform-cc.c @@ -1,4 +1,4 @@ -/* $NetBSD: generic-transform-cc.c,v 1.3 2015/04/19 14:30:07 jperkin Exp $ */ +/* $NetBSD: generic-transform-cc.c,v 1.4 2016/03/14 20:16:08 markd Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger . @@ -360,6 +360,19 @@ generic_transform_cc(struct arglist *args) ruleset = &include_rules; opt_arg = NULL; } + else if (strcmp(arg->val, "-isystem") == 0) { + opt_arg = arg; + arg = arg2; + if (arg == NULL || arg->val[0] == '-') { + errx(255, "Missing argument for %s", + opt_arg->val); + } + ruleset = &include_rules; + arg2 = TAILQ_NEXT(arg, link); + len = strlen(arg->val); + prefix = ""; + path = arg->val; + } #endif else if (strncmp(arg->val, "-L", 2) == 0) { len -= 2; From 188b436c9ff448af24d0ae5f9ad7052f7f57d0b4 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 14 Mar 2016 20:37:52 +0000 Subject: [PATCH 0094/2457] A Plugin for django CMS to add CSS classes to other plugins --- www/py-djangocms-style/DESCR | 1 + www/py-djangocms-style/Makefile | 18 ++++ www/py-djangocms-style/PLIST | 175 ++++++++++++++++++++++++++++++++ www/py-djangocms-style/distinfo | 6 ++ 4 files changed, 200 insertions(+) create mode 100644 www/py-djangocms-style/DESCR create mode 100644 www/py-djangocms-style/Makefile create mode 100644 www/py-djangocms-style/PLIST create mode 100644 www/py-djangocms-style/distinfo diff --git a/www/py-djangocms-style/DESCR b/www/py-djangocms-style/DESCR new file mode 100644 index 0000000000000..469aefad5bc42 --- /dev/null +++ b/www/py-djangocms-style/DESCR @@ -0,0 +1 @@ +A plugin for django CMS to add CSS classes to other plugins. diff --git a/www/py-djangocms-style/Makefile b/www/py-djangocms-style/Makefile new file mode 100644 index 0000000000000..c3166467ddca7 --- /dev/null +++ b/www/py-djangocms-style/Makefile @@ -0,0 +1,18 @@ +# $NetBSD: Makefile,v 1.1 2016/03/14 20:37:52 adam Exp $ + +DISTNAME= djangocms-style-1.7.0 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= www python +MASTER_SITES= http://pypi.python.org/packages/source/d/djangocms-style/ + +MAINTAINER= adam@NetBSD.org +HOMEPAGE= https://github.com/divio/djangocms-style/ +COMMENT= Plugin for django CMS to add CSS classes to other plugins +LICENSE= modified-bsd + +USE_LANGUAGES= # empty + +DEPENDS+= ${PYPKGPREFIX}-django-cms-[0-9]*:../../www/py-django-cms + +.include "../../lang/python/egg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/www/py-djangocms-style/PLIST b/www/py-djangocms-style/PLIST new file mode 100644 index 0000000000000..933a42456afe4 --- /dev/null +++ b/www/py-djangocms-style/PLIST @@ -0,0 +1,175 @@ +@comment $NetBSD: PLIST,v 1.1 2016/03/14 20:37:52 adam Exp $ +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/not-zip-safe +${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/djangocms_style-1.7.0-py3.5.egg-info/requires.txt +${PYSITELIB}/djangocms_style/__init__.py +${PYSITELIB}/djangocms_style/__init__.pyc +${PYSITELIB}/djangocms_style/__init__.pyo +${PYSITELIB}/djangocms_style/cms_plugins.py +${PYSITELIB}/djangocms_style/cms_plugins.pyc +${PYSITELIB}/djangocms_style/cms_plugins.pyo +${PYSITELIB}/djangocms_style/locale/af/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/af/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ar/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ar/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/be/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/be/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/bg/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/bg/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ca/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ca/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/cmn/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/cmn/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/cs/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/cs/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/da/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/da/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/de/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/de/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/el/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/el/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/en/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/en/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/es/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/es/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/es_AR/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/es_AR/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/es_BO/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/es_BO/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/et/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/et/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/eu/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/eu/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/fa/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/fa/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/fi/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/fi/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/fr/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/fr/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ga/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ga/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/gl/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/gl/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/gu/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/gu/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/he/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/he/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/hi/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/hi/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/hr/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/hr/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/hu/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/hu/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/id/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/id/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/is/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/is/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/is_IS/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/is_IS/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/it/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/it/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ja/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ja/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/kk/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/kk/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/km/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/km/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ko/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ko/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ko_KR/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ko_KR/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ku_IQ/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ku_IQ/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/lt/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/lt/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/mn/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/mn/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/mn_MN/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/mn_MN/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/mt/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/mt/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/nb/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/nb/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/nl/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/nl/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/no/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/no/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/pl/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/pl/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/pt/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/pt/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/pt_BR/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/pt_BR/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ro/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ro/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ru/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ru/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/sk/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/sk/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/sl/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/sl/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/sl_SI/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/sl_SI/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/sq/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/sq/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/sq_AL/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/sq_AL/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/sr/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/sr/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/sr@latin/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/sr@latin/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/sv/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/sv/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ta/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ta/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/th/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/th/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/tlh/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/tlh/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/tr/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/tr/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/uk/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/uk/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/ur/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/ur/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/vi/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/vi/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/vi_VN/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/vi_VN/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/zh/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/zh/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/zh_CN/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/zh_CN/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/locale/zh_TW/LC_MESSAGES/django.mo +${PYSITELIB}/djangocms_style/locale/zh_TW/LC_MESSAGES/django.po +${PYSITELIB}/djangocms_style/migrations/0001_initial.py +${PYSITELIB}/djangocms_style/migrations/0001_initial.pyc +${PYSITELIB}/djangocms_style/migrations/0001_initial.pyo +${PYSITELIB}/djangocms_style/migrations/0002_set_related_name_for_cmsplugin_ptr.py +${PYSITELIB}/djangocms_style/migrations/0002_set_related_name_for_cmsplugin_ptr.pyc +${PYSITELIB}/djangocms_style/migrations/0002_set_related_name_for_cmsplugin_ptr.pyo +${PYSITELIB}/djangocms_style/migrations/__init__.py +${PYSITELIB}/djangocms_style/migrations/__init__.pyc +${PYSITELIB}/djangocms_style/migrations/__init__.pyo +${PYSITELIB}/djangocms_style/models.py +${PYSITELIB}/djangocms_style/models.pyc +${PYSITELIB}/djangocms_style/models.pyo +${PYSITELIB}/djangocms_style/south_migrations/0001_initial.py +${PYSITELIB}/djangocms_style/south_migrations/0001_initial.pyc +${PYSITELIB}/djangocms_style/south_migrations/0001_initial.pyo +${PYSITELIB}/djangocms_style/south_migrations/0002_auto__add_field_style_padding_left__add_field_style_padding_right__add.py +${PYSITELIB}/djangocms_style/south_migrations/0002_auto__add_field_style_padding_left__add_field_style_padding_right__add.pyc +${PYSITELIB}/djangocms_style/south_migrations/0002_auto__add_field_style_padding_left__add_field_style_padding_right__add.pyo +${PYSITELIB}/djangocms_style/south_migrations/0003_auto__add_field_style_tag_type__add_field_style_additional_classes.py +${PYSITELIB}/djangocms_style/south_migrations/0003_auto__add_field_style_tag_type__add_field_style_additional_classes.pyc +${PYSITELIB}/djangocms_style/south_migrations/0003_auto__add_field_style_tag_type__add_field_style_additional_classes.pyo +${PYSITELIB}/djangocms_style/south_migrations/0004_plugin_rename.py +${PYSITELIB}/djangocms_style/south_migrations/0004_plugin_rename.pyc +${PYSITELIB}/djangocms_style/south_migrations/0004_plugin_rename.pyo +${PYSITELIB}/djangocms_style/south_migrations/__init__.py +${PYSITELIB}/djangocms_style/south_migrations/__init__.pyc +${PYSITELIB}/djangocms_style/south_migrations/__init__.pyo +${PYSITELIB}/djangocms_style/templates/cms/plugins/style.html diff --git a/www/py-djangocms-style/distinfo b/www/py-djangocms-style/distinfo new file mode 100644 index 0000000000000..d5e5df9e9ce8c --- /dev/null +++ b/www/py-djangocms-style/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2016/03/14 20:37:52 adam Exp $ + +SHA1 (djangocms-style-1.7.0.tar.gz) = 8ba080fa57de1d3aa0f1177149a10d6f7d7daf22 +RMD160 (djangocms-style-1.7.0.tar.gz) = bca70518d375724a662cd971f492f6fd7c35cabc +SHA512 (djangocms-style-1.7.0.tar.gz) = 9d8a8c8d9ad7e5f87645e7d0d43070c46c3089c8c5d69abb64bd99558a31cd4df8ba154a1c95ccadd4da2eddbe164ad6d4008783b6da06da24f5cc4398e7d85c +Size (djangocms-style-1.7.0.tar.gz) = 22583 bytes From 8e4e7ac3e4fad8c2c1181446f5cae35cec4e1f0c Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 14 Mar 2016 20:38:25 +0000 Subject: [PATCH 0095/2457] Added www/py-djangocms-style version 1.7.0 --- www/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/Makefile b/www/Makefile index 92ba20ef8e436..a2ac60f77b47e 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1159 2016/03/14 15:08:58 taca Exp $ +# $NetBSD: Makefile,v 1.1160 2016/03/14 20:38:25 adam Exp $ # COMMENT= Packages related to the World Wide Web @@ -599,6 +599,7 @@ SUBDIR+= py-djangocms-flash SUBDIR+= py-djangocms-googlemap SUBDIR+= py-djangocms-inherit SUBDIR+= py-djangocms-picture +SUBDIR+= py-djangocms-style SUBDIR+= py-djangocms-teaser SUBDIR+= py-djangocms-text-ckeditor SUBDIR+= py-djangocms-video From 7b85e0c99ead8ea2c9de993ec2df16d3986105eb Mon Sep 17 00:00:00 2001 From: wiedi Date: Mon, 14 Mar 2016 22:47:10 +0000 Subject: [PATCH 0096/2457] Update net/proftpd (and modules) to 1.3.5b 1.3.5b - Released 10-Mar-2016 -------------------------------- - Bug 4187 - mod_geoip does not load all of the GeoIPTables properly. - Bug 4191 - "Incorrect string value" reported by mod_sql_mysql for some UTF8 characters. - Bug 4097 - SSH rekey fails when using RSA hostkey smaller than 2048 bits. - Bug 4198 - MLSD/MLST fact type "cdir" is incorrectly used for the current working directory. - Bug 4201 - HiddenStores temporary files not removed when exceeding quota using SCP. - Bug 4202 - MLSD lines not properly terminated with CRLF. - Bug 4209 - Zero-length memory allocation possible, with undefined results. - Bug 4210 - Avoid unbounded SFTP extended attribute key/values. - Bug 4212 - Ensure that FTP data transfer commands fail appropriately when "RootRevoke on" is in effect. - Bug 4217 - Handle FTP re-authentication attempts better. - Bug 4223 - Permissions on files uploaded via STOU do not honor configured Umask. - Bug 4227 - Support SFTP clients that send multiple INIT requests. - Bug 4230 - TLSDHParamFile directive appears ignored because unexpected DH is chosen. --- net/proftpd-ldap/Makefile | 3 +-- net/proftpd-sqlite/Makefile | 3 +-- net/proftpd/Makefile | 3 +-- net/proftpd/Makefile.common | 4 ++-- net/proftpd/distinfo | 10 +++++----- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/net/proftpd-ldap/Makefile b/net/proftpd-ldap/Makefile index 018252b27fdaa..99b9117bfe27a 100644 --- a/net/proftpd-ldap/Makefile +++ b/net/proftpd-ldap/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.2 2016/03/05 11:29:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/14 22:47:10 wiedi Exp $ -PKGREVISION= 1 .include "../../net/proftpd/Makefile.module" PROFTPD_MOD= ldap diff --git a/net/proftpd-sqlite/Makefile b/net/proftpd-sqlite/Makefile index 7ed63cdd39178..73c0523a9839a 100644 --- a/net/proftpd-sqlite/Makefile +++ b/net/proftpd-sqlite/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.2 2015/10/10 01:58:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/14 22:47:10 wiedi Exp $ -PKGREVISION= 1 .include "../../net/proftpd/Makefile.module" PROFTPD_MOD= sqlite diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile index 89cb6ab0769c3..08c7055fbc790 100644 --- a/net/proftpd/Makefile +++ b/net/proftpd/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2016/03/05 11:29:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.83 2016/03/14 22:47:10 wiedi Exp $ .include "../../net/proftpd/Makefile.common" -PKGREVISION= 3 COMMENT= Highly configurable FTP server software MODULES+= \ diff --git a/net/proftpd/Makefile.common b/net/proftpd/Makefile.common index 17b87d9b92c41..9f458f706d2b2 100644 --- a/net/proftpd/Makefile.common +++ b/net/proftpd/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.2 2015/10/23 08:37:35 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.3 2016/03/14 22:47:10 wiedi Exp $ # used by net/proftpd/Makefile # used by net/proftpd/Makefile.module -DISTNAME= proftpd-1.3.5a +DISTNAME= proftpd-1.3.5b CATEGORIES= net MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.servus.at/ProFTPD/distrib/source/ \ diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo index 22776af779a2a..61e3544e68d45 100644 --- a/net/proftpd/distinfo +++ b/net/proftpd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.44 2015/11/04 00:35:28 agc Exp $ +$NetBSD: distinfo,v 1.45 2016/03/14 22:47:10 wiedi Exp $ -SHA1 (proftpd-1.3.5a.tar.gz) = 7c4027c207bdfe7c88b859810c7fa9b978b0524d -RMD160 (proftpd-1.3.5a.tar.gz) = ff9050ee8c0fb741eb84ef815ad0974bf237193a -SHA512 (proftpd-1.3.5a.tar.gz) = d64de12c100814c5c8a3916b3c9344f5a68c2b85902ffc8e5bb088d8975b5f13a7b9a29f82085b70dc93f4599c0e0f2645977d20998dda11981e66f534ea692c -Size (proftpd-1.3.5a.tar.gz) = 29988477 bytes +SHA1 (proftpd-1.3.5b.tar.gz) = fd11ba8f2d157f4e59162a24b22f82cd7d32d3cd +RMD160 (proftpd-1.3.5b.tar.gz) = 1a682879fbeb7f0ef61d944399650fc7f7da4982 +SHA512 (proftpd-1.3.5b.tar.gz) = 5bdb9718c85c26b92256d7b3791a6a5456bec3826801b7b68f4d493d202ac77179c8378ad06efc1a805efce639db266561d3beb4bc7af61ca1352fb4bdfd4e6a +Size (proftpd-1.3.5b.tar.gz) = 29992107 bytes SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421 SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed From 463f59ae811bd6fa6ad43cdf6800c410c2c024cd Mon Sep 17 00:00:00 2001 From: wiedi Date: Mon, 14 Mar 2016 22:48:20 +0000 Subject: [PATCH 0097/2457] Updated net/proftpd to 1.3.5b --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index f2fffa653484e..b331714043626 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1169 2016/03/14 16:04:44 tsutsui Exp $ +$NetBSD: CHANGES-2016,v 1.1170 2016/03/14 22:48:20 wiedi Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1559,3 +1559,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/tor-browser to 5.5.3 [ryoon 2016-03-14] Removed www/drupal6 [taca 2016-03-14] Updated x11/mlterm to 3.7.0 [tsutsui 2016-03-14] + Updated net/proftpd to 1.3.5b [wiedi 2016-03-14] From 3081e5c1807cb3d62368f213b628a93257496f50 Mon Sep 17 00:00:00 2001 From: tnn Date: Mon, 14 Mar 2016 23:42:47 +0000 Subject: [PATCH 0098/2457] fix struct reg usage according to /usr/include/i386/reg.h --- devel/deforaos-coder/distinfo | 3 +- .../patches/patch-tools_debug_ptrace.c | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 devel/deforaos-coder/patches/patch-tools_debug_ptrace.c diff --git a/devel/deforaos-coder/distinfo b/devel/deforaos-coder/distinfo index 1eadbf2e95cac..2703877f940dd 100644 --- a/devel/deforaos-coder/distinfo +++ b/devel/deforaos-coder/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.7 2016/02/20 03:20:23 khorben Exp $ +$NetBSD: distinfo,v 1.8 2016/03/14 23:42:47 tnn Exp $ SHA1 (Coder-0.2.0.tar.gz) = a72127e0270fe8e1111a0e557cf6ddd8e59bc71a RMD160 (Coder-0.2.0.tar.gz) = 585f330d34550dff955577029fd3f59cc2cdd081 SHA512 (Coder-0.2.0.tar.gz) = 0bf80496c3a5c1376852a69d5a242a84193576d804be76223974368c81b460f1a80406fd8dacf28ca6ad0d374663643ad2c6245d5051e75050f2f89728ad6104 Size (Coder-0.2.0.tar.gz) = 130157 bytes +SHA1 (patch-tools_debug_ptrace.c) = 4e96b4b64373d4d95187d6497241070b065f86b0 diff --git a/devel/deforaos-coder/patches/patch-tools_debug_ptrace.c b/devel/deforaos-coder/patches/patch-tools_debug_ptrace.c new file mode 100644 index 0000000000000..9ae1db25bc75f --- /dev/null +++ b/devel/deforaos-coder/patches/patch-tools_debug_ptrace.c @@ -0,0 +1,31 @@ +$NetBSD: patch-tools_debug_ptrace.c,v 1.1 2016/03/14 23:42:47 tnn Exp $ + +fix struct reg usage according to /usr/include/i386/reg.h + +--- tools/debug/ptrace.c.orig 2016-02-20 01:27:00.000000000 +0000 ++++ tools/debug/ptrace.c +@@ -329,15 +329,15 @@ static void _ptrace_get_registers(Ptrace + helper->set_register(helper->debugger, "rbp", regs.regs[_REG_RBP]); + helper->set_register(helper->debugger, "rip", regs.regs[_REG_RIP]); + # elif defined(__i386__) +- helper->set_register(helper->debugger, "eax", regs.regs[_REG_EAX]); +- helper->set_register(helper->debugger, "ecx", regs.regs[_REG_ECX]); +- helper->set_register(helper->debugger, "edx", regs.regs[_REG_EDX]); +- helper->set_register(helper->debugger, "ebx", regs.regs[_REG_EBX]); +- helper->set_register(helper->debugger, "esi", regs.regs[_REG_ESI]); +- helper->set_register(helper->debugger, "edi", regs.regs[_REG_EDI]); +- helper->set_register(helper->debugger, "esp", regs.regs[_REG_ESP]); +- helper->set_register(helper->debugger, "ebp", regs.regs[_REG_EBP]); +- helper->set_register(helper->debugger, "eip", regs.regs[_REG_EIP]); ++ helper->set_register(helper->debugger, "eax", regs.r_eax); ++ helper->set_register(helper->debugger, "ecx", regs.r_ecx); ++ helper->set_register(helper->debugger, "edx", regs.r_edx); ++ helper->set_register(helper->debugger, "ebx", regs.r_ebx); ++ helper->set_register(helper->debugger, "esi", regs.r_esi); ++ helper->set_register(helper->debugger, "edi", regs.r_edi); ++ helper->set_register(helper->debugger, "esp", regs.r_esp); ++ helper->set_register(helper->debugger, "ebp", regs.r_ebp); ++ helper->set_register(helper->debugger, "eip", regs.r_eip); + # endif + #endif + } From f4305b9e701f63ef748c18857a5217f8d86c6e46 Mon Sep 17 00:00:00 2001 From: tnn Date: Tue, 15 Mar 2016 00:19:00 +0000 Subject: [PATCH 0099/2457] Teach about difference of struct mcontext_t on Linux/i386 vs NetBSD/i386. Fixes build on NetBSD/i386. --- x11/qt5-qtwebkit/distinfo | 4 +-- ...rce_JavaScriptCore_tools_CodeProfiling.cpp | 27 +++++++++++-------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/x11/qt5-qtwebkit/distinfo b/x11/qt5-qtwebkit/distinfo index 03af831a00569..d5dd5771e1c1f 100644 --- a/x11/qt5-qtwebkit/distinfo +++ b/x11/qt5-qtwebkit/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2015/10/26 19:04:01 adam Exp $ +$NetBSD: distinfo,v 1.6 2016/03/15 00:19:00 tnn Exp $ SHA1 (qtwebkit-opensource-src-5.5.1.tar.xz) = e1e16f3eb48c1ce863b9ab33364e4ac178ae51a7 RMD160 (qtwebkit-opensource-src-5.5.1.tar.xz) = 0594ec1150f7899d72f57d8ff2f108f3f75faaf9 @@ -12,7 +12,7 @@ SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = a6cfdbced0bb528f47 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37 -SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 3b73e876e89e920267a6bd19dba696298f00c704 +SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 6dbdaf1aad0fbbe39f8a3e5fb48be38e3ac67aa8 SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288 SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 875cfb3a98b943a78bf87e91d724d067b5bd2523 diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp index 8fd162037a34c..8f3774540d586 100644 --- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.1 2014/12/30 17:23:47 adam Exp $ +$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.2 2016/03/15 00:19:00 tnn Exp $ * Add NetBSD support ---- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig 2013-11-27 01:01:49.000000000 +0000 +--- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig 2015-10-13 04:37:12.000000000 +0000 +++ Source/JavaScriptCore/tools/CodeProfiling.cpp @@ -33,7 +33,7 @@ #include @@ -22,16 +22,21 @@ // Helper function to start & stop the timer. // Presently we're using the wall-clock timer, since this seems to give the best results. static void setProfileTimer(unsigned usec) -@@ -73,7 +73,7 @@ static void profilingTimer(int, siginfo_ - CodeProfiling::sample(reinterpret_cast(context->__ss.__rip), - reinterpret_cast(context->__ss.__rbp)); +@@ -80,6 +80,13 @@ static void profilingTimer(int, siginfo_ + CodeProfiling::sample(reinterpret_cast(context.gregs[REG_EIP]), + reinterpret_cast(context.gregs[REG_EBP])); } --#elif OS(LINUX) && CPU(X86) && !OS(ANDROID) -+#elif (OS(LINUX) || OS(NETBSD)) && CPU(X86) && !OS(ANDROID) - static void profilingTimer(int, siginfo_t*, void* uap) - { - mcontext_t context = static_cast(uap)->uc_mcontext; -@@ -143,7 +143,7 @@ void CodeProfiling::begin(const SourceCo ++#elif OS(NETBSD)) && CPU(X86) ++static void profilingTimer(int, siginfo_t*, void* uap) ++{ ++ mcontext_t context = static_cast(uap)->uc_mcontext; ++ CodeProfiling::sample(reinterpret_cast(context.__gregs[_REG_EIP]), ++ reinterpret_cast(context.__gregs[_REG_EBP])); ++} + #endif + + // Callback triggered when the timer is fired. +@@ -143,7 +150,7 @@ void CodeProfiling::begin(const SourceCo if (alreadyProfiling) return; From d88fcbc30b2ad2cfb49a84b0589a88586632cd89 Mon Sep 17 00:00:00 2001 From: tnn Date: Tue, 15 Mar 2016 00:24:29 +0000 Subject: [PATCH 0100/2457] Disable precompiled headers. Makes GCC segfault on NetBSD-7.0-i386. --- textproc/lucene++/distinfo | 3 ++- .../lucene++/patches/patch-cmake_cotire.cmake | 24 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 textproc/lucene++/patches/patch-cmake_cotire.cmake diff --git a/textproc/lucene++/distinfo b/textproc/lucene++/distinfo index f9c8f390c68da..a30919a84ecf2 100644 --- a/textproc/lucene++/distinfo +++ b/textproc/lucene++/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.2 2015/10/17 08:12:43 ryoon Exp $ +$NetBSD: distinfo,v 1.3 2016/03/15 00:24:29 tnn Exp $ SHA1 (LucenePlusPlus-rel_3.0.7.tar.gz) = b2c38e7ca5056934a5bdb1a69ea251110e3c0377 RMD160 (LucenePlusPlus-rel_3.0.7.tar.gz) = 352f0e204655d9614cff2a843d5132f85bda78a4 SHA512 (LucenePlusPlus-rel_3.0.7.tar.gz) = 92f3bba320980673cc64c983616aa38d25b44ea811237ed226741b892757fb8151e4f833aa58a18dbe7a0c9a899d94e828aa15e6d7b48a69ab730d1d772db220 Size (LucenePlusPlus-rel_3.0.7.tar.gz) = 2013570 bytes SHA1 (patch-CMakeLists.txt) = db25e72a4c4d5dc38b9c805b75bf7c4469f7029d +SHA1 (patch-cmake_cotire.cmake) = 16371f38024a1e629c3efc30dcf8955bc9606be1 SHA1 (patch-include_VariantUtils.h) = 4c71eaee81b18fe7019ca3006804713f3117cac9 SHA1 (patch-liblucene++-contrib.pc.cmake) = 6317251e9d8f569f08b8505edc58d2b628117c5f SHA1 (patch-liblucene++.pc.cmake) = 2d8efacfda33adbe4564402458744dd259f24ac7 diff --git a/textproc/lucene++/patches/patch-cmake_cotire.cmake b/textproc/lucene++/patches/patch-cmake_cotire.cmake new file mode 100644 index 0000000000000..42b3296287656 --- /dev/null +++ b/textproc/lucene++/patches/patch-cmake_cotire.cmake @@ -0,0 +1,24 @@ +$NetBSD: patch-cmake_cotire.cmake,v 1.1 2016/03/15 00:24:29 tnn Exp $ + +Disable precompiled headers. Makes GCC segfault on NetBSD-7.0-i386. + +--- cmake/cotire.cmake.orig 2015-01-30 16:14:22.000000000 +0000 ++++ cmake/cotire.cmake +@@ -2956,6 +2956,9 @@ function (cotire_setup_clean_all_target) + endfunction() + + function (cotire) ++if (true) ++# nothing, disable use of precompiled headers ++else() + set(_options "") + set(_oneValueArgs SOURCE_DIR BINARY_DIR) + set(_multiValueArgs LANGUAGES CONFIGURATIONS) +@@ -2980,6 +2983,7 @@ function (cotire) + cotire_target_link_libraries(${_target}) + endif() + endforeach() ++endif() + endfunction() + + if (CMAKE_SCRIPT_MODE_FILE) From 9ef1340621e022597ce61a9df316bfcfc461d373 Mon Sep 17 00:00:00 2001 From: leot Date: Tue, 15 Mar 2016 00:45:04 +0000 Subject: [PATCH 0101/2457] + webkit-gtk-2.10.8 and webkit24-gtk-2.4.10 (take this one) While here `!}sort' and manually remove some duplicates pointed out by the sort. --- doc/TODO | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/doc/TODO b/doc/TODO index 3b82e3126f534..8d65429243a12 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15594 2016/03/14 14:31:13 ryoon Exp $ +$NetBSD: TODO,v 1.15595 2016/03/15 00:45:04 leot Exp $ Suggested new packages ====================== @@ -415,10 +415,9 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o allegro-5.10 o alpine-2.20 o alsa-plugins-1.1.0 - o amaya-11.4.4 - o ampache-3.8.2 o amavis-perl-0.3.12 [called just amavis] o amaya-11.4.4 [wip] + o ampache-3.8.2 o angband-3.2 o anjuta-3.16.0 o anope-1.8.7 @@ -1576,9 +1575,9 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o php-libawl-0.54 o php-memcache-3.0.8 o php-ming-0.4.7 - o php-mrbs-1.5.0 o php-mongo-1.6.12 o php-mongodb-1.1.2 + o php-mrbs-1.5.0 o php-orangehrm-3.3.1 o php-owncloud-8.1.3 [pkg/50247] o php-owncloud-9.0 @@ -1772,25 +1771,21 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o rtcw-1.41.3 o rtty-4.0 [at ftp://ftp.isc.org/isc/rtty/] o rubber-1.4 - o ruby-jquery-rails-4.1.0 - o ruby-redmine-3.2.0 - o ruby-stomp-1.3.5 - o ruby-twitter-text-1.13.4 - o rump-20131213 - o rubber-1.2 o ruby-actionmailer-4.2.5 o ruby-actionpack-4.2.5 o ruby-activemodel-4.2.5 o ruby-builder-3.2.2 o ruby-chef-12.5.1 o ruby-chef-zero-4.3.2 - o ruby-jquery-rails-4.0.4 + o ruby-jquery-rails-4.1.0 o ruby-ncurses-1.3.1 [where is this package available from?] o ruby-railties-4.2.5 - o ruby-redmine-3.1.3 + o ruby-redmine-3.2.0 o ruby-redmine_work_time-0.3.1 o ruby-review-1.4.0 [wip] o ruby-selenium-webdriver-2.46.2 + o ruby-stomp-1.3.5 + o ruby-twitter-text-1.13.4 o ruby-tzinfo-1.2.2 o rump-20131213 o sabayon-2.30.1 [GNOME 2.30] @@ -2002,6 +1997,8 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o wbm-virtual-server-5.01 o wcalc-2.4 o webalizer-2.23.05 + o webkit-gtk-2.10.8 + o webkit24-gtk-2.4.10 [leot] o webmin-1.780 o websvn-2.3.3 o weewm-0.01 From a24952c13bdf2029b637e4cb764b71db907aca41 Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 15 Mar 2016 03:12:06 +0000 Subject: [PATCH 0102/2457] Update to 3.22.3 Changelog: The NSS Development Team announces the release of NSS 3.22.3, which is a patch release for NSS 3.22. No new functionality is introduced in this release. The following bugs have been resolved in NSS 3.22.3 * Bug 1243641 - Increase compatibility of TLS extended master secret, don't send an empty TLS extension last in the handshake --- devel/nss/Makefile | 5 ++--- devel/nss/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/devel/nss/Makefile b/devel/nss/Makefile index 2a718900bd516..a26c0af747b65 100644 --- a/devel/nss/Makefile +++ b/devel/nss/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.110 2016/03/09 05:39:12 tnn Exp $ +# $NetBSD: Makefile,v 1.111 2016/03/15 03:12:06 ryoon Exp $ DISTNAME= nss-${NSS_RELEASE:S/.0$//} -NSS_RELEASE= 3.22.2 -PKGREVISION= 1 +NSS_RELEASE= 3.22.3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=security/nss/releases/NSS_${NSS_RELEASE:S/.0$//:S/./_/g}_RTM/src/} diff --git a/devel/nss/distinfo b/devel/nss/distinfo index b8aa905909e7b..c6ca8362e2076 100644 --- a/devel/nss/distinfo +++ b/devel/nss/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.57 2016/03/07 12:31:17 ryoon Exp $ +$NetBSD: distinfo,v 1.58 2016/03/15 03:12:06 ryoon Exp $ -SHA1 (nss-3.22.2.tar.gz) = a0feb5b3630769f8f205d50acb0a3ad8c5fc6380 -RMD160 (nss-3.22.2.tar.gz) = 08121fff77254945b26eb61765294efd1bc2078e -SHA512 (nss-3.22.2.tar.gz) = 0c73ba579cb697fe295bca2ee62315bc1830b542f607c1ecfbf591fa881d2ccfb5a6d830b47cd1434bdfbac07e03848b4fe9e6bda9c6d131a2c34973dc3b337c -Size (nss-3.22.2.tar.gz) = 6982164 bytes +SHA1 (nss-3.22.3.tar.gz) = ae1310106a91fa24aa2e5a718ff7be20fcc852d5 +RMD160 (nss-3.22.3.tar.gz) = 469f667d671738cf789bdb6a7a29a300cbe987f9 +SHA512 (nss-3.22.3.tar.gz) = eaffe0061f2d99d8cd69db267acfad443ce2123862d612b26d3b641c982b6e80b18d4e9e6c97d4115f030040390fff7579af35c73f225c278b84c17e3ac1853d +Size (nss-3.22.3.tar.gz) = 6981457 bytes SHA1 (patch-am) = ee4c4beeb120397852fc4b06b7dd54534d0d5ac5 SHA1 (patch-an) = 4ab22f2a575676b5b640bc9a760b83eb05c75e69 SHA1 (patch-md) = 0a09fd2abb8674a2d301f1b6a5331af5db94178f From 988f0f4ddd6663176499771471d0676671f7b93e Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 15 Mar 2016 03:13:17 +0000 Subject: [PATCH 0103/2457] Updated devel/nss to 3.22.3 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index b331714043626..2e191d022db4c 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1170 2016/03/14 22:48:20 wiedi Exp $ +$NetBSD: CHANGES-2016,v 1.1171 2016/03/15 03:13:17 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1560,3 +1560,4 @@ Changes to the packages collection and infrastructure in 2016: Removed www/drupal6 [taca 2016-03-14] Updated x11/mlterm to 3.7.0 [tsutsui 2016-03-14] Updated net/proftpd to 1.3.5b [wiedi 2016-03-14] + Updated devel/nss to 3.22.3 [ryoon 2016-03-15] From fdba54626bf4bbf9e0b8fbb6cedc0759d0ad5399 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 15 Mar 2016 09:14:03 +0000 Subject: [PATCH 0104/2457] Fix usb bulk reads on big endian 64bit platforms. Closes PR pkg/50340. --- graphics/sane-backends/Makefile | 4 +-- graphics/sane-backends/distinfo | 3 +- .../patches/patch-sanei_sanei_usb.c | 35 +++++++++++++++++++ 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 graphics/sane-backends/patches/patch-sanei_sanei_usb.c diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 542e4141130aa..f3beb97d6224a 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.65 2016/03/05 11:28:41 jperkin Exp $ +# $NetBSD: Makefile,v 1.66 2016/03/15 09:14:03 martin Exp $ -PKGREVISION= 2 +PKGREVISION= 3 .include "Makefile.common" COMMENT= API for access to scanners, digital cameras, frame grabbers, etc diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index 34bf85b9043e7..831a072287aa9 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.42 2015/11/11 12:40:03 wiz Exp $ +$NetBSD: distinfo,v 1.43 2016/03/15 09:14:03 martin Exp $ SHA1 (sane-backends-1.0.25.tar.gz) = 05824922d91571e1fc2f5cdd270745783d593754 RMD160 (sane-backends-1.0.25.tar.gz) = 1cfd81eeddf3ef3c2cea98f6ca7640522b249fab @@ -15,3 +15,4 @@ SHA1 (patch-ak) = f00d3773c14f9955565debc0d16231906a2bba76 SHA1 (patch-backend_kodakaio.c) = f96af8b2fb0369f51d2320285253c5e67218e629 SHA1 (patch-backend_pieusb__buffer.c) = 7e7c6dbb0798876532a04a0831be2ab2bd2931ca SHA1 (patch-sanei_sanei__ir.c) = 66e913d7db9d03a42850778aca39da8f0dde02fa +SHA1 (patch-sanei_sanei_usb.c) = b053c94d240580d919c418081fca5c75cf4fb1a7 diff --git a/graphics/sane-backends/patches/patch-sanei_sanei_usb.c b/graphics/sane-backends/patches/patch-sanei_sanei_usb.c new file mode 100644 index 0000000000000..1099d63a4bbd3 --- /dev/null +++ b/graphics/sane-backends/patches/patch-sanei_sanei_usb.c @@ -0,0 +1,35 @@ +$NetBSD: patch-sanei_sanei_usb.c,v 1.1 2016/03/15 09:14:03 martin Exp $ + +Avoid storing an int (the number of bytes transfered) in the wrong +half of a ssize_t on big endian 64bit platforms. + +Reported upstream as: +https://alioth.debian.org/tracker/index.php?func=detail&aid=315337 + + +--- sanei/sanei_usb.c.orig 2014-12-16 14:37:26.000000000 +0100 ++++ sanei/sanei_usb.c 2016-03-15 09:12:34.335049822 +0100 +@@ -2310,10 +2310,10 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_B + { + if (devices[dn].bulk_in_ep) + { +- int ret; ++ int ret, rsize; + ret = libusb_bulk_transfer (devices[dn].lu_handle, + devices[dn].bulk_in_ep, buffer, +- (int) *size, (int *) &read_size, ++ (int) *size, &rsize, + libusb_timeout); + + if (ret < 0) +@@ -2323,6 +2323,10 @@ sanei_usb_read_bulk (SANE_Int dn, SANE_B + + read_size = -1; + } ++ else ++ { ++ read_size = rsize; ++ } + } + else + { From 0b6f5324b55b20ef54147970465b1d5535a23932 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 15 Mar 2016 09:15:02 +0000 Subject: [PATCH 0105/2457] Updated graphics/sane-backends to 1.0.25nb3 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 2e191d022db4c..0434b207acdb6 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1171 2016/03/15 03:13:17 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1172 2016/03/15 09:15:02 martin Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1561,3 +1561,4 @@ Changes to the packages collection and infrastructure in 2016: Updated x11/mlterm to 3.7.0 [tsutsui 2016-03-14] Updated net/proftpd to 1.3.5b [wiedi 2016-03-14] Updated devel/nss to 3.22.3 [ryoon 2016-03-15] + Updated graphics/sane-backends to 1.0.25nb3 [martin 2016-03-15] From 722feac23a745f133e4bc33674bf278bd9cd610d Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 15 Mar 2016 09:51:26 +0000 Subject: [PATCH 0106/2457] Import tarsnap-gui-0.8 as sysutils/tarsnap-gui. The Tarsnap graphical user interface desktop application is an open source cross-platform frontend to the popular Tarsnap backup service. The application uses the tarsnap command line client utilities to communicate with the Tarsnap service. --- sysutils/tarsnap-gui/DESCR | 5 +++++ sysutils/tarsnap-gui/Makefile | 27 +++++++++++++++++++++++++++ sysutils/tarsnap-gui/PLIST | 2 ++ sysutils/tarsnap-gui/distinfo | 6 ++++++ 4 files changed, 40 insertions(+) create mode 100644 sysutils/tarsnap-gui/DESCR create mode 100644 sysutils/tarsnap-gui/Makefile create mode 100644 sysutils/tarsnap-gui/PLIST create mode 100644 sysutils/tarsnap-gui/distinfo diff --git a/sysutils/tarsnap-gui/DESCR b/sysutils/tarsnap-gui/DESCR new file mode 100644 index 0000000000000..f8b402e41b535 --- /dev/null +++ b/sysutils/tarsnap-gui/DESCR @@ -0,0 +1,5 @@ +The Tarsnap graphical user interface desktop application is an open +source cross-platform frontend to the popular Tarsnap backup service. + +The application uses the tarsnap command line client utilities to +communicate with the Tarsnap service. diff --git a/sysutils/tarsnap-gui/Makefile b/sysutils/tarsnap-gui/Makefile new file mode 100644 index 0000000000000..9f32e8f80b305 --- /dev/null +++ b/sysutils/tarsnap-gui/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1 2016/03/15 09:51:26 wiz Exp $ + +DISTNAME= tarsnap-gui-0.8 +CATEGORIES= wip +MASTER_SITES= ${MASTER_SITE_GITHUB:=Tarsnap/} +GITHUB_TAG= v${PKGVERSION_NOREV} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://github.com/Tarsnap/tarsnap-gui +COMMENT= Cross-platform GUI for the Tarsnap backup service +LICENSE= 2-clause-bsd + +DEPENDS+= tarsnap-[0-9]*:../../sysutils/tarsnap + +USE_LIBTOOL= yes +USE_LANGUAGES= c++ +INSTALLATION_DIRS= bin + +do-configure: + cd ${WRKSRC} && ${QTDIR}/bin/qmake + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/tarsnap-gui ${DESTDIR}${PREFIX}/bin + +.include "../../x11/qt5-qtbase/buildlink3.mk" +.include "../../x11/qt5-qttools/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/tarsnap-gui/PLIST b/sysutils/tarsnap-gui/PLIST new file mode 100644 index 0000000000000..f368f79c78f59 --- /dev/null +++ b/sysutils/tarsnap-gui/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2016/03/15 09:51:26 wiz Exp $ +bin/tarsnap-gui diff --git a/sysutils/tarsnap-gui/distinfo b/sysutils/tarsnap-gui/distinfo new file mode 100644 index 0000000000000..359a11eb97369 --- /dev/null +++ b/sysutils/tarsnap-gui/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2016/03/15 09:51:26 wiz Exp $ + +SHA1 (tarsnap-gui-0.8.tar.gz) = 85c4bb94fcbb1821136bb26feea68c582c386d35 +RMD160 (tarsnap-gui-0.8.tar.gz) = 0179694f8feb182793f071e09c2682052c35b9a8 +SHA512 (tarsnap-gui-0.8.tar.gz) = 8fc8afdd8a53efc843c2c82cc4872a7156fff8964793e3a5a80430380598f752a1ae488012c54809e345bda34a2c6a0afaca5504223effe2e332825cbea2b359 +Size (tarsnap-gui-0.8.tar.gz) = 544066 bytes From 44545e65d69dafacc7425b4f9916069428dc9dcd Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 15 Mar 2016 09:51:39 +0000 Subject: [PATCH 0107/2457] + tarsnap-gui. --- sysutils/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sysutils/Makefile b/sysutils/Makefile index bc9ca9ec5ff0f..88ab3a7cbab27 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.661 2016/03/08 16:55:19 imil Exp $ +# $NetBSD: Makefile,v 1.662 2016/03/15 09:51:39 wiz Exp $ # COMMENT= System utilities @@ -515,6 +515,7 @@ SUBDIR+= system-tools-backends SUBDIR+= systester SUBDIR+= sysupgrade SUBDIR+= tarsnap +SUBDIR+= tarsnap-gui SUBDIR+= tcx SUBDIR+= tdir SUBDIR+= tegra-firmware From 44c76ca93791a6833de2ec1efe44025c431debc6 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 15 Mar 2016 09:51:51 +0000 Subject: [PATCH 0108/2457] Added sysutils/tarsnap-gui version 0.8 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 0434b207acdb6..d5ee59685f665 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1172 2016/03/15 09:15:02 martin Exp $ +$NetBSD: CHANGES-2016,v 1.1173 2016/03/15 09:51:51 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1562,3 +1562,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/proftpd to 1.3.5b [wiedi 2016-03-14] Updated devel/nss to 3.22.3 [ryoon 2016-03-15] Updated graphics/sane-backends to 1.0.25nb3 [martin 2016-03-15] + Added sysutils/tarsnap-gui version 0.8 [wiz 2016-03-15] From c744f8bf127f687ab95ee311bf806b03303da402 Mon Sep 17 00:00:00 2001 From: fhajny Date: Tue, 15 Mar 2016 10:55:25 +0000 Subject: [PATCH 0109/2457] Remove stray SunOS project definition from some SMF manifests. These should never have made it in. Bump resp. PKGREVISIONs. --- databases/apache-cassandra/Makefile | 3 ++- databases/postgresql91-server/Makefile | 4 ++-- databases/postgresql91-server/files/smf/manifest.xml | 2 +- databases/postgresql92-server/Makefile | 4 ++-- databases/postgresql92-server/files/smf/manifest.xml | 2 +- databases/postgresql93-server/Makefile | 4 ++-- databases/postgresql93-server/files/smf/manifest.xml | 2 +- databases/postgresql94-server/Makefile | 4 ++-- databases/postgresql94-server/files/smf/manifest.xml | 2 +- databases/postgresql95-server/Makefile | 4 ++-- databases/postgresql95-server/files/smf/manifest.xml | 2 +- www/php-fpm/Makefile | 4 ++-- www/php-fpm/files/smf/manifest.xml | 2 +- 13 files changed, 20 insertions(+), 19 deletions(-) diff --git a/databases/apache-cassandra/Makefile b/databases/apache-cassandra/Makefile index 59207f8918431..da2bb9479c1f6 100644 --- a/databases/apache-cassandra/Makefile +++ b/databases/apache-cassandra/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2015/10/21 12:53:27 fhajny Exp $ +# $NetBSD: Makefile,v 1.20 2016/03/15 10:55:25 fhajny Exp $ # CASSANDRA_VER= 1.2.19 +PKGREVISION= 1 MASTER_SITES= http://archive.apache.org/dist/cassandra/${PKGVERSION_NOREV}/ diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 103e892e503ee..af71526ae4824 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2016/03/05 11:28:14 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2016/03/15 10:55:25 fhajny Exp $ PKGNAME= ${DISTNAME:C/-/91-server-/} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= PostgreSQL database server programs # mips has no TAS implementation diff --git a/databases/postgresql91-server/files/smf/manifest.xml b/databases/postgresql91-server/files/smf/manifest.xml index 76366b9eabcb5..737efb875f45e 100644 --- a/databases/postgresql91-server/files/smf/manifest.xml +++ b/databases/postgresql91-server/files/smf/manifest.xml @@ -10,7 +10,7 @@ - + diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 3cda7a62a8ec3..ae9f255ff1e5f 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2016/03/05 11:28:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.14 2016/03/15 10:55:25 fhajny Exp $ PKGNAME= ${DISTNAME:C/-/92-server-/} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= PostgreSQL database server programs # mips has no TAS implementation diff --git a/databases/postgresql92-server/files/smf/manifest.xml b/databases/postgresql92-server/files/smf/manifest.xml index 76366b9eabcb5..737efb875f45e 100644 --- a/databases/postgresql92-server/files/smf/manifest.xml +++ b/databases/postgresql92-server/files/smf/manifest.xml @@ -10,7 +10,7 @@ - + diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile index f621a7e6d4059..9e55421546a9a 100644 --- a/databases/postgresql93-server/Makefile +++ b/databases/postgresql93-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2016/03/05 11:28:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.9 2016/03/15 10:55:25 fhajny Exp $ PKGNAME= ${DISTNAME:C/-/93-server-/} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= PostgreSQL database server programs # mips has no TAS implementation diff --git a/databases/postgresql93-server/files/smf/manifest.xml b/databases/postgresql93-server/files/smf/manifest.xml index 76366b9eabcb5..737efb875f45e 100644 --- a/databases/postgresql93-server/files/smf/manifest.xml +++ b/databases/postgresql93-server/files/smf/manifest.xml @@ -10,7 +10,7 @@ - + diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile index f1c2ad9099de9..616fa1fd8795b 100644 --- a/databases/postgresql94-server/Makefile +++ b/databases/postgresql94-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2016/03/05 11:28:17 jperkin Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/15 10:55:25 fhajny Exp $ PKGNAME= ${DISTNAME:C/-/94-server-/} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= PostgreSQL database server programs # mips has no TAS implementation diff --git a/databases/postgresql94-server/files/smf/manifest.xml b/databases/postgresql94-server/files/smf/manifest.xml index 76366b9eabcb5..737efb875f45e 100644 --- a/databases/postgresql94-server/files/smf/manifest.xml +++ b/databases/postgresql94-server/files/smf/manifest.xml @@ -10,7 +10,7 @@ - + diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile index 63491146945b1..ae274f7026784 100644 --- a/databases/postgresql95-server/Makefile +++ b/databases/postgresql95-server/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2016/03/05 11:28:18 jperkin Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/15 10:55:26 fhajny Exp $ PKGNAME= ${DISTNAME:C/-/95-server-/} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= PostgreSQL database server programs # mips has no TAS implementation diff --git a/databases/postgresql95-server/files/smf/manifest.xml b/databases/postgresql95-server/files/smf/manifest.xml index 76366b9eabcb5..737efb875f45e 100644 --- a/databases/postgresql95-server/files/smf/manifest.xml +++ b/databases/postgresql95-server/files/smf/manifest.xml @@ -10,7 +10,7 @@ - + diff --git a/www/php-fpm/Makefile b/www/php-fpm/Makefile index 6cb07a48d6cc9..a0dc486645159 100644 --- a/www/php-fpm/Makefile +++ b/www/php-fpm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2016/03/05 11:29:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.18 2016/03/15 10:55:26 fhajny Exp $ PKGNAME= ${PHP_PKG_PREFIX}-fpm-${PHP_VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www HOMEPAGE= http://php-fpm.org/ diff --git a/www/php-fpm/files/smf/manifest.xml b/www/php-fpm/files/smf/manifest.xml index 395e8f0121c44..5bd7d2f28471d 100644 --- a/www/php-fpm/files/smf/manifest.xml +++ b/www/php-fpm/files/smf/manifest.xml @@ -10,7 +10,7 @@ - + From 985fc7695379e720360c04f8dbde745072fd9f5a Mon Sep 17 00:00:00 2001 From: fhajny Date: Tue, 15 Mar 2016 11:29:35 +0000 Subject: [PATCH 0110/2457] Update databases/pgbouncer to 1.7.2. Set up a separate user, previous PGUSER/PGGROUP integration didn't make sense. 2016-02-26 - PgBouncer 1.7.2 - "Finally Airborne" - Fix crash on stale pidfile removal. Problem introduced in 1.7.1. - Disable cleanup - it breaks takeover and is not useful for production loads. Problem introduced in 1.7.1. - After takeover, wait until pidfile is gone before booting. Slow shutdown due to memory cleanup exposed existing race. (#113) - Make build reproducible by dropping DBGVER handling. (#112) - Antimake: Sort file list from $(wildcard), newer gmake does not sort it anymore. (#111) - Show libssl version in log. - deb: Turn on full hardening. 2016-02-18 - PgBouncer 1.7.1 - "Forward To Five Friends Or Else" - WARNING: Since version 1.7, server_reset_query is not executed when database is in transaction-pooling mode. Seems this was not highlighted enough in 1.7 announcement. If your apps depend on that happening, use server_reset_query_always to restore previous behaviour. - TLS: Rename sslmode "disabled" to "disable" as that is what PostgreSQL uses. - TLS: client_tls_sslmode=verify-ca/-full now reject connections without client certificate. (#104) - TLS: client_tls_sslmode=allow/require do validate client certificate if sent. Previously they left cert validation unconfigured so connections with client cert failed. (#105) - Fix memleak when freeing database. - Fix potential memleak in tls_handshake(). - Fix EOF handling in tls_handshake(). - Fix too small memset in asn1_time_parse compat. - Fix non-TLS (--without-openssl) build. (#101) - Fix various issues with Windows build. (#100) - TLS: Use SSL_MODE_RELEASE_BUFFERS to decrease memory usage of inactive connections. - Clean allocated memory on exit. Helps to run memory-leak checkers. - Improve server_reset_query documentation. (#110) - Add TLS options to sample config. 2015-12-18 - PgBouncer 1.7 - "Colors Vary After Resurrection" - Support TLS connections. OpenSSL/LibreSSL is used as backend implementation. - Support authentication via TLS client certificate. - Support "peer" authentication on Unix sockets. - Support Host Based Access control file, like pg_hba.conf in Postgres. This allows to configure TLS for network connections and "peer" authentication for local connections. - Set query_wait_timeout to 120s by default. Current default (0) causes infinite queueing, which is not useful. That means if client has pending query and has not been assigned to server connection, the client connection will be dropped. - Disable server_reset_query_always by default. Now reset query is used only in pools that are in session mode. - Increase pkt_buf to 4096 bytes. Improves performance with TLS. The behaviour is probably load-specific, but it should be safe to do as since v1.2 the packet buffers are split from connections and used lazily from pool. - Support pipelining count expected ReadyForQuery packets. This avoids releasing server too early. Fixes #52. - Improved sbuf_loopcnt logic - socket is guarateed to be reprocessed even if there are no event from socket. Required for TLS as it has it's own buffering. - Adapt system tests to work with modern BSD and MacOS. (Eric Radman) - Remove crypt auth. It's obsolete and not supported by PostgreSQL since 8.4. - Fix plain "--with-cares" configure option - without argument it was broken. --- databases/pgbouncer/Makefile | 31 +++++++++++----------- databases/pgbouncer/PLIST | 6 ++--- databases/pgbouncer/distinfo | 12 ++++----- databases/pgbouncer/files/pgbouncer.sh | 4 +-- databases/pgbouncer/files/smf/manifest.xml | 4 +-- databases/pgbouncer/patches/patch-Makefile | 11 ++++---- 6 files changed, 33 insertions(+), 35 deletions(-) diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile index 886684ea09e9e..d78051c6f7b95 100644 --- a/databases/pgbouncer/Makefile +++ b/databases/pgbouncer/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2016/03/05 11:28:13 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2016/03/15 11:29:35 fhajny Exp $ # -DISTNAME= pgbouncer-1.6.1 -PKGREVISION= 1 +DISTNAME= pgbouncer-1.7.2 CATEGORIES= databases MASTER_SITES= http://pgbouncer.github.io/downloads/files/${PKGVERSION_NOREV}/ @@ -17,22 +16,21 @@ GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" -PGUSER?= pgsql -PGGROUP?= pgsql -PKG_GROUPS= ${PGGROUP} -PKG_USERS= ${PGUSER}:${PGGROUP} -PKG_GECOS.${PGUSER}= PostgreSQL database administrator -PKG_HOME.${PGUSER}= ${PGHOME} - -BUILD_DEFS+= PGUSER PGGROUP PGHOME VARBASE -FILES_SUBST+= PGUSER=${PGUSER} -FILES_SUBST+= PGGROUP=${PGGROUP} -FILES_SUBST+= PGHOME=${PGHOME} - +PGB_USER?= pgbounce +PGB_GROUP?= pgbounce PGB_LOG_DIR?= ${VARBASE}/log/pgbouncer PGB_RUN_DIR?= ${VARBASE}/run -OWN_DIRS_PERMS+= ${PGB_LOG_DIR} ${PGUSER} ${PGGROUP} 0755 +PKG_GROUPS= ${PGB_GROUP} +PKG_USERS= ${PGB_USER}:${PGB_GROUP} +PKG_GECOS.${PGB_USER}= PgBouncer daemon user +PKG_HOME.${PGB_USER}= ${PGB_LOG_DIR} + +BUILD_DEFS+= PGB_USER PGB_GROUP VARBASE +FILES_SUBST+= PGB_USER=${PGB_USER} +FILES_SUBST+= PGB_GROUP=${PGB_GROUP} + +OWN_DIRS_PERMS+= ${PGB_LOG_DIR} ${PGB_USER} ${PGB_GROUP} 0755 EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES= ${EGDIR}/pgbouncer.ini ${PKG_SYSCONFDIR}/pgbouncer.ini \ @@ -65,4 +63,5 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR} BUILDLINK_API_DEPENDS.libevent+= libevent>=2.0 .include "../../devel/libevent/buildlink3.mk" .include "../../net/libcares/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/pgbouncer/PLIST b/databases/pgbouncer/PLIST index 2c171585de475..bf3e77b4f17c0 100644 --- a/databases/pgbouncer/PLIST +++ b/databases/pgbouncer/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 2015/10/23 16:40:38 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/03/15 11:29:35 fhajny Exp $ bin/pgbouncer man/man1/pgbouncer.1 man/man5/pgbouncer.5 -share/doc/pgbouncer/NEWS -share/doc/pgbouncer/README +share/doc/pgbouncer/NEWS.rst +share/doc/pgbouncer/README.rst share/examples/pgbouncer/pgbouncer.ini share/examples/pgbouncer/userlist.txt diff --git a/databases/pgbouncer/distinfo b/databases/pgbouncer/distinfo index ddb2805a06aaa..4ec6a292059b1 100644 --- a/databases/pgbouncer/distinfo +++ b/databases/pgbouncer/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 17:41:15 agc Exp $ +$NetBSD: distinfo,v 1.7 2016/03/15 11:29:35 fhajny Exp $ -SHA1 (pgbouncer-1.6.1.tar.gz) = 4abeee4965a26197e2c193d6bfb01eef46aa72a8 -RMD160 (pgbouncer-1.6.1.tar.gz) = 3eb6d6aae0f634c71bf28eae5f5aa471c4016a9d -SHA512 (pgbouncer-1.6.1.tar.gz) = cf1cd28b04531bce879f3f9f50b54754253e0d9882c7f122c99d1c0c39fb01264c1ba20f5fd7b42ce7f5356f413b05caf48bbb633693d866271e129426923529 -Size (pgbouncer-1.6.1.tar.gz) = 431076 bytes -SHA1 (patch-Makefile) = 9c33efeb8c3c70487cdca056002928fc955a8307 +SHA1 (pgbouncer-1.7.2.tar.gz) = d9bb29da15d90713e2399af3ebf5019da5cbe2d6 +RMD160 (pgbouncer-1.7.2.tar.gz) = 1bed03336e62f64b1afc652e4b2ddc6478de51ab +SHA512 (pgbouncer-1.7.2.tar.gz) = 11c89606599f424b34f39a4b072ec6293fea0b14ee52ae4fbc44775e6d83771a22d194f4e8eabe410e0d6a70657508cf1a3b1012543d91873c36f644afb5675d +Size (pgbouncer-1.7.2.tar.gz) = 462374 bytes +SHA1 (patch-Makefile) = 1c76e84975111d9ce077e73fe888dfe466874e33 diff --git a/databases/pgbouncer/files/pgbouncer.sh b/databases/pgbouncer/files/pgbouncer.sh index 4d519a5b2f765..629f16e71b7c1 100644 --- a/databases/pgbouncer/files/pgbouncer.sh +++ b/databases/pgbouncer/files/pgbouncer.sh @@ -1,6 +1,6 @@ #! @RCD_SCRIPTS_SHELL@ # -# $NetBSD: pgbouncer.sh,v 1.2 2014/05/13 14:18:49 fhajny Exp $ +# $NetBSD: pgbouncer.sh,v 1.3 2016/03/15 11:29:35 fhajny Exp $ # # PROVIDE: pgbouncer # REQUIRE: DAEMON @@ -18,7 +18,7 @@ pgbouncer_conf="@PKG_SYSCONFDIR@/${name}.ini" required_files="${pgbouncer_conf}" command_args="-d ${pgbouncer_conf}" extra_commands="reload" -pgsql_user="@PGUSER@" +pgsql_user="@PGB_USER@" start_cmd="pgbouncer_start" pidfile="@VARBASE@/run/${name}/${name}.pid" diff --git a/databases/pgbouncer/files/smf/manifest.xml b/databases/pgbouncer/files/smf/manifest.xml index 938d3f37b0035..b54484f11d788 100644 --- a/databases/pgbouncer/files/smf/manifest.xml +++ b/databases/pgbouncer/files/smf/manifest.xml @@ -10,8 +10,8 @@ - - + + diff --git a/databases/pgbouncer/patches/patch-Makefile b/databases/pgbouncer/patches/patch-Makefile index a27281b26f232..79ea3a9f66ba4 100644 --- a/databases/pgbouncer/patches/patch-Makefile +++ b/databases/pgbouncer/patches/patch-Makefile @@ -1,15 +1,14 @@ -$NetBSD: patch-Makefile,v 1.1 2015/10/23 16:40:38 fhajny Exp $ +$NetBSD: patch-Makefile,v 1.2 2016/03/15 11:29:35 fhajny Exp $ Install sample config files as... config files. ---- Makefile.orig 2015-09-03 14:46:31.000000000 +0000 +--- Makefile.orig 2016-02-26 08:56:32.000000000 +0000 +++ Makefile -@@ -47,7 +47,8 @@ AM_FEATURES = libusual - pgbouncer_EMBED_LIBUSUAL = 1 +@@ -50,6 +50,8 @@ pgbouncer_EMBED_LIBUSUAL = 1 # docs to install as-is --dist_doc_DATA = README NEWS etc/pgbouncer.ini etc/userlist.txt -+dist_doc_DATA = README NEWS + dist_doc_DATA = README.rst NEWS.rst etc/pgbouncer.ini etc/userlist.txt ++dist_doc_DATA = README.rst NEWS.rst +dist_sysconf_DATA = etc/pgbouncer.ini etc/userlist.txt DISTCLEANFILES = config.mak config.status lib/usual/config.h config.log From 387eb4f061723579c6906a106978d5e92df37de1 Mon Sep 17 00:00:00 2001 From: fhajny Date: Tue, 15 Mar 2016 11:29:47 +0000 Subject: [PATCH 0111/2457] Updated databases/pgbouncer to 1.7.2 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index d5ee59685f665..836d66049d1fb 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1173 2016/03/15 09:51:51 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1174 2016/03/15 11:29:47 fhajny Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1563,3 +1563,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/nss to 3.22.3 [ryoon 2016-03-15] Updated graphics/sane-backends to 1.0.25nb3 [martin 2016-03-15] Added sysutils/tarsnap-gui version 0.8 [wiz 2016-03-15] + Updated databases/pgbouncer to 1.7.2 [fhajny 2016-03-15] From a37d813fd31a197a2a70471b384d3215a7bdb4a6 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 15 Mar 2016 12:15:26 +0000 Subject: [PATCH 0112/2457] Remove two weird patches. Add comments to most others. --- devel/tet3/Makefile | 7 +++---- devel/tet3/distinfo | 14 ++++++-------- devel/tet3/patches/patch-aa | 4 +++- devel/tet3/patches/patch-ab | 4 +++- devel/tet3/patches/patch-ad | 4 +--- devel/tet3/patches/patch-ae | 6 ------ devel/tet3/patches/patch-ah | 6 ------ devel/tet3/patches/patch-ai | 4 +++- devel/tet3/patches/patch-src_scripts_tet_start.sh | 4 +++- 9 files changed, 22 insertions(+), 31 deletions(-) delete mode 100644 devel/tet3/patches/patch-ae delete mode 100644 devel/tet3/patches/patch-ah diff --git a/devel/tet3/Makefile b/devel/tet3/Makefile index 21bc8a5d52146..01058295eae77 100644 --- a/devel/tet3/Makefile +++ b/devel/tet3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2015/06/12 10:50:00 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2016/03/15 12:15:26 wiz Exp $ DISTNAME= tet3.7-unsup.src PKGNAME= tet3-3.7 @@ -28,6 +28,8 @@ REPLACE_PERL+= src/perl/api.pl REPLACE_KSH+= src/scripts/tet_start.sh MAKE_FILE= makefile +INSTALLATION_DIRS= tet3/bin tet3/lib + .include "../../mk/bsd.prefs.mk" PLIST_VARS+= java @@ -36,10 +38,7 @@ PLIST.java= yes .endif post-install: - ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3 - ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3/bin cd ${WRKSRC}/bin && pax -rwpp . ${DESTDIR}${PREFIX}/tet3/bin - ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/tet3/lib cd ${WRKSRC}/lib && pax -rwpp . ${DESTDIR}${PREFIX}/tet3/lib PTHREAD_OPTS+= native # only native threads make sense diff --git a/devel/tet3/distinfo b/devel/tet3/distinfo index b41be0c54e291..19c2c1170d499 100644 --- a/devel/tet3/distinfo +++ b/devel/tet3/distinfo @@ -1,17 +1,15 @@ -$NetBSD: distinfo,v 1.9 2015/11/03 03:29:35 agc Exp $ +$NetBSD: distinfo,v 1.10 2016/03/15 12:15:26 wiz Exp $ SHA1 (tet3.7-unsup.src.tgz) = 43a3720d0472b6d3261b1b1cd7fa5192a2911b73 RMD160 (tet3.7-unsup.src.tgz) = 7e266fc77e2a01ece7cd1b041d3ee28426d1bd3d SHA512 (tet3.7-unsup.src.tgz) = c3f192a907e521d628f47c5d676f8cb3681f1fae2bed2d458b2d65d05525a6302e024bc90e99bc8ae1b5abade71ca07fb24a3b0dd914d2af8487c54041ca822f Size (tet3.7-unsup.src.tgz) = 953406 bytes -SHA1 (patch-aa) = 6b67991e3deed46ef7a3451e3ff94dee286d1d65 -SHA1 (patch-ab) = a18d1928e58ea8e5eef7fd797641f802e99cc02d +SHA1 (patch-aa) = 37c1da834d026be3b6b79afe40b257fd4104d108 +SHA1 (patch-ab) = 8a4046b5fa63ef25995506f22d7e948c33695b73 SHA1 (patch-ac) = 6de35a54caa6df438bb7a9abf59769626a16e9bb -SHA1 (patch-ad) = ba0bb07f74a70691cf62d72502a3d608e522e2c0 -SHA1 (patch-ae) = adb90e2ce7ad8429a701718ec4a79ddb2f93d509 -SHA1 (patch-ah) = aaee593e861966595ef71ab59b535372facc1115 -SHA1 (patch-ai) = 256d4903ec91f4a4ffe147accb5d7e80740e6c46 +SHA1 (patch-ad) = 3541d02db440e29d4c9ea36bd988499be3e2c082 +SHA1 (patch-ai) = 3039a9a1bdaa7f3e00d359cd0d05fd2bbb701f3d SHA1 (patch-aj) = 98738ce53f8746e478475f6ad483db2af16ee6b8 SHA1 (patch-ak) = a907e0492849aec9a23eef2167aecb92e4ca589a SHA1 (patch-al) = 840feab081b56a1f44f3c5094f5962b9700350e5 -SHA1 (patch-src_scripts_tet_start.sh) = 3b3ae5806c88b3f795a51ed1b057df4134f1961c +SHA1 (patch-src_scripts_tet_start.sh) = 7c1c464d69a6ba346ad0c81f452426c44b008e56 diff --git a/devel/tet3/patches/patch-aa b/devel/tet3/patches/patch-aa index 29f44125bca75..bfeb0f89388bb 100644 --- a/devel/tet3/patches/patch-aa +++ b/devel/tet3/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.2 2006/06/08 16:57:59 rillig Exp $ +$NetBSD: patch-aa,v 1.3 2016/03/15 12:15:26 wiz Exp $ + +Add build framework for NetBSD. --- /dev/null 2003-06-16 16:02:04.000000000 +0100 +++ contrib/configtool/defines/netbsd.mk 2003-06-16 16:01:30.000000000 +0100 diff --git a/devel/tet3/patches/patch-ab b/devel/tet3/patches/patch-ab index fd882ad04c7d2..9fdddf7c8b83e 100644 --- a/devel/tet3/patches/patch-ab +++ b/devel/tet3/patches/patch-ab @@ -1,4 +1,6 @@ -$NetBSD: patch-ab,v 1.3 2006/06/08 16:57:59 rillig Exp $ +$NetBSD: patch-ab,v 1.4 2016/03/15 12:15:26 wiz Exp $ + +Support DragonFly and NetBSD. --- configure.orig 2000-03-07 02:12:40.000000000 +0000 +++ configure diff --git a/devel/tet3/patches/patch-ad b/devel/tet3/patches/patch-ad index 11daebf5afb8c..43108b70df8e7 100644 --- a/devel/tet3/patches/patch-ad +++ b/devel/tet3/patches/patch-ad @@ -1,6 +1,4 @@ -$NetBSD: patch-ad,v 1.2 2006/06/08 16:57:59 rillig Exp $ - -Matt Thomas's patch +$NetBSD: patch-ad,v 1.3 2016/03/15 12:15:26 wiz Exp $ --- src/tet3/dtet2lib/notty.c 1999-09-04 15:47:17.000000000 +0100 +++ src/tet3/dtet2lib/notty.c 2003-05-27 23:55:51.000000000 +0100 diff --git a/devel/tet3/patches/patch-ae b/devel/tet3/patches/patch-ae deleted file mode 100644 index 2fc9aec74236f..0000000000000 --- a/devel/tet3/patches/patch-ae +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2006/06/08 16:57:59 rillig Exp $ - ---- src/perl/api.pl 2003/07/22 17:24:43 1.1 -+++ src/perl/api.pl 2003/07/22 17:25:04 -@@ -1,0 +1,1 @@ -+#! /usr/bin/perl diff --git a/devel/tet3/patches/patch-ah b/devel/tet3/patches/patch-ah deleted file mode 100644 index e770941368466..0000000000000 --- a/devel/tet3/patches/patch-ah +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2006/06/08 16:57:59 rillig Exp $ - ---- contrib/tetreport/tetreport.pl 2003/07/22 17:27:03 1.1 -+++ contrib/tetreport/tetreport.pl 2003/07/22 17:27:18 -@@ -1,0 +1,1 @@ -+#! /usr/bin/perl diff --git a/devel/tet3/patches/patch-ai b/devel/tet3/patches/patch-ai index 9da6f7ae5ee87..3b9eb36d79f10 100644 --- a/devel/tet3/patches/patch-ai +++ b/devel/tet3/patches/patch-ai @@ -1,4 +1,6 @@ -$NetBSD: patch-ai,v 1.2 2006/06/08 16:57:59 rillig Exp $ +$NetBSD: patch-ai,v 1.3 2016/03/15 12:15:26 wiz Exp $ + +Add DragonFly support. --- src/helpers/GuessOS.orig 2006-01-09 15:31:00.000000000 +0000 +++ src/helpers/GuessOS diff --git a/devel/tet3/patches/patch-src_scripts_tet_start.sh b/devel/tet3/patches/patch-src_scripts_tet_start.sh index a7bf1c2023fc5..9029db31d0edd 100644 --- a/devel/tet3/patches/patch-src_scripts_tet_start.sh +++ b/devel/tet3/patches/patch-src_scripts_tet_start.sh @@ -1,4 +1,6 @@ -$NetBSD: patch-src_scripts_tet_start.sh,v 1.1 2011/12/11 11:57:09 marino Exp $ +$NetBSD: patch-src_scripts_tet_start.sh,v 1.2 2016/03/15 12:15:26 wiz Exp $ + +Fix shebang. --- src/scripts/tet_start.sh.orig 2011-12-11 11:02:59.580983000 +0000 +++ src/scripts/tet_start.sh From fe78cb8e0d1f6baf224d542628aa2b01582265ab Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 15 Mar 2016 12:31:55 +0000 Subject: [PATCH 0113/2457] Improve dependencies from Jakub Wilk. Bump PKGREVISION * Get rid of dependencies to C compiler, GNU sed, libxslt and pstreams * Remove workaround for older NetBSD and MirBSD --- print/pdf2djvu/Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/print/pdf2djvu/Makefile b/print/pdf2djvu/Makefile index bb2089be29c2e..44c7440dddced 100644 --- a/print/pdf2djvu/Makefile +++ b/print/pdf2djvu/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2016/03/05 11:29:17 jperkin Exp $ +# $NetBSD: Makefile,v 1.39 2016/03/15 12:31:55 ryoon Exp $ # DISTNAME= pdf2djvu-0.9.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= https://bitbucket.org/jwilk/pdf2djvu/downloads/ EXTRACT_SUFX= .tar.xz @@ -17,20 +17,12 @@ DEPENDS+= djvulibre-tools-[0-9]*:../../graphics/djvulibre-tools WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes -USE_LANGUAGES= c++ c -USE_TOOLS+= pkg-config gmake intltool msgfmt xgettext gsed:run -TOOLS_DEPENDS.gsed= gsed>=4.2:../../textproc/gsed +USE_LANGUAGES= c++ +USE_TOOLS+= pkg-config gmake intltool msgfmt xgettext CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale -.include "../../mk/bsd.prefs.mk" -.if !empty(MACHINE_PLATFORM:MNetBSD-5*) || ${OPSYS} == "MirBSD" -BUILDLINK_TRANSFORM+= rm:-Werror=overloaded-virtual -.endif - .include "../../graphics/djvulibre-lib/buildlink3.mk" .include "../../print/poppler/buildlink3.mk" .include "../../print/poppler-includes/buildlink3.mk" -.include "../../textproc/libxslt/buildlink3.mk" .include "../../graphics/GraphicsMagick/buildlink3.mk" -.include "../../devel/pstreams/buildlink3.mk" .include "../../mk/bsd.pkg.mk" From 5705b358d6ddc20da5f32e957cf002155ec3b37e Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 15 Mar 2016 12:33:08 +0000 Subject: [PATCH 0114/2457] Updated print/pdf2djvu to 0.9.3nb2 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 836d66049d1fb..17f579330a4be 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1174 2016/03/15 11:29:47 fhajny Exp $ +$NetBSD: CHANGES-2016,v 1.1175 2016/03/15 12:33:08 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1564,3 +1564,4 @@ Changes to the packages collection and infrastructure in 2016: Updated graphics/sane-backends to 1.0.25nb3 [martin 2016-03-15] Added sysutils/tarsnap-gui version 0.8 [wiz 2016-03-15] Updated databases/pgbouncer to 1.7.2 [fhajny 2016-03-15] + Updated print/pdf2djvu to 0.9.3nb2 [ryoon 2016-03-15] From b2312798c1ade5b4d791562ec5fd255df569df8c Mon Sep 17 00:00:00 2001 From: fhajny Date: Tue, 15 Mar 2016 12:45:07 +0000 Subject: [PATCH 0115/2457] Update sysutils/puppet to 3.8.6. No changelog provided, commits since 3.8.4: - (doc) Clarify auth_membership - (PUP-4516) Exit immediately when sent INT or TERM - (PUP-4516) Add signal name in exit message - (PUP-4386) Windows group invalid user error msgs - (PUP-5308) Bump beaker dependency - (maint) Use beaker's puppet helper - (maint) Remove obsolete test - (PUP-5308) Use puppet config set for future parser - (PUP-5480) Windows dirs should inherit SYSTEM - Remove skipping based on commit msg - (PUP-5308) Ensure future parser setting is in main section - (PUP-5505) Improve performance of reading service plists - (PUP-5522) Ensure consistency of node environment attr and param - (PUP-5547) Prevent unnecessary environment eviction - Revert "(PUP-5547) Prevent unnecessary environment eviction" - (PUP-5547) Prevent unnecessary environment eviction - (PUP-5509) Ensure error context for non-numeric index error - (PUP-5590) Detect duplicate parameter names - (PUP-5212) Pip package honors HTTP proxy - (maint) Use Travis container infrastructure - (maint) Use newer bundler - Bump ruby version to 2.1.8 - (PUP-1293) Don't ignore status when using upstart provider - (PUP-5378) acceptance: port all-functions test to 3.x - (PUP-5378) ensure calling_all_functions works against 4x - (maint) acceptance-fix with() function usage - (maint) Relax fqdn_rand regex - (maint) acceptance: fix calling all functions-split regex - (PUP-5658) Disallow numeric types with ranges where to < from - (maint) Update ruby build for windows - (maint) Change apt_host to apt_signing_server - (RE-6205) updating ruby for CVE-2015-7551 - (PUP-5670) bump facter release tag --- sysutils/puppet/Makefile | 5 ++--- sysutils/puppet/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 2a99e479863ce..f231df436a91a 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.24 2016/03/14 00:59:06 tnn Exp $ +# $NetBSD: Makefile,v 1.25 2016/03/15 12:45:07 fhajny Exp $ -DISTNAME= puppet-3.8.4 -PKGREVISION= 1 +DISTNAME= puppet-3.8.6 CATEGORIES= sysutils #MASTER_SITES= http://puppetlabs.com/downloads/puppet/ diff --git a/sysutils/puppet/distinfo b/sysutils/puppet/distinfo index 76b02aa3ae717..866ac7bc2f3f4 100644 --- a/sysutils/puppet/distinfo +++ b/sysutils/puppet/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.13 2015/11/10 10:24:14 fhajny Exp $ +$NetBSD: distinfo,v 1.14 2016/03/15 12:45:07 fhajny Exp $ -SHA1 (puppet-3.8.4.gem) = 3f4660af66ad782476954b86dfa12c5b9a7cb4f3 -RMD160 (puppet-3.8.4.gem) = 53ef5a283119e647b3d36201543f92f38ec46406 -SHA512 (puppet-3.8.4.gem) = 876b8ff0068455fd3f1c1e6947f30e6c6bd8484228b1d712855389bbeb30ff1a9df2f205adb090654d6ef597bf4d8fbbf9888268e3858705710b0dbabd45c72b -Size (puppet-3.8.4.gem) = 2668032 bytes +SHA1 (puppet-3.8.6.gem) = 2e6818550466c1ffda9dee01881c796e9edf4ec1 +RMD160 (puppet-3.8.6.gem) = 861b945625bba51d03ea6827182732220eddfd5f +SHA512 (puppet-3.8.6.gem) = 22772e5bc2b3c839e74aeb4f650d01ece34e694fc1de16c82cd77ebcc760ea4a56814ad0ce543bd1c525eb6cd9ce932cdac032aaa366daff16fc1126fba9293f +Size (puppet-3.8.6.gem) = 2669568 bytes SHA1 (patch-aa) = 8b25b975647023902f5d84cc2980f777f23e789c SHA1 (patch-ab) = 2e80fc9ca8a9326d69c72149e6fd97738cfd2e1e SHA1 (patch-ac) = eda614eeee25b18ab36335fc7147fbe7ab770249 From 3f1e114779d994b4045d49eab8a5f264aa42b85e Mon Sep 17 00:00:00 2001 From: fhajny Date: Tue, 15 Mar 2016 12:45:20 +0000 Subject: [PATCH 0116/2457] Updated sysutils/puppet to 3.8.6 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 17f579330a4be..2a8414387eec7 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1175 2016/03/15 12:33:08 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1176 2016/03/15 12:45:20 fhajny Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1565,3 +1565,4 @@ Changes to the packages collection and infrastructure in 2016: Added sysutils/tarsnap-gui version 0.8 [wiz 2016-03-15] Updated databases/pgbouncer to 1.7.2 [fhajny 2016-03-15] Updated print/pdf2djvu to 0.9.3nb2 [ryoon 2016-03-15] + Updated sysutils/puppet to 3.8.6 [fhajny 2016-03-15] From c820cfc20436cd5caa8148e23b6c84c8be6af38f Mon Sep 17 00:00:00 2001 From: fhajny Date: Tue, 15 Mar 2016 12:50:19 +0000 Subject: [PATCH 0117/2457] Update to puppet done --- doc/TODO | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/TODO b/doc/TODO index 8d65429243a12..c4df0634739f9 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15595 2016/03/15 00:45:04 leot Exp $ +$NetBSD: TODO,v 1.15596 2016/03/15 12:50:19 fhajny Exp $ Suggested new packages ====================== @@ -1634,7 +1634,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o profit-2.5.3 o psmisc-22.20 o pspp-0.8.5 - o puppet-3.8.5 o pure-ftpd-1.0.40 o pvs-5.0 o pwlib-1.11.1 From 806aeee646f9b49cdd9ed19e7a70cb0a2dbef290 Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 15 Mar 2016 13:15:29 +0000 Subject: [PATCH 0118/2457] Update to 0.9.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: pdf2djvu (0.9.4) unstable; urgency=low [ Jakub Wilk ] * Standardize on American spelling in the manual page. * Document that bugs can be reported to the mailing list. * Fix build failure with GCC 6. Thanks to Martin Michlmayr for the bug report. https://bugs.debian.org/812007 * Improve warning message when a link with an unsupported action type is encountered. Thanks to Janusz S. Bień for the bug report. https://groups.io/g/pdf2djvu/message/26 * Improve error handling in out-of-memory situations. Thanks to Daniel Stender for the bug report. https://bitbucket.org/jwilk/pdf2djvu/issue/107 * Use HTTPS for sourceforge.net and freedesktop.org URLs. * Improve the test suite. * Update the Polish translation. [ Chris Leick ] * Update the German translation. [ Américo Monteiro ] * Update the Portuguese translation. [ Kyrill Detinov ] * Update the Russian translation. [ Jean-Paul Guillonneau ] * Update the French translation of the manual page. -- Jakub Wilk Wed, 24 Feb 2016 18:34:05 +0100 --- print/pdf2djvu/Makefile | 5 ++--- print/pdf2djvu/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/print/pdf2djvu/Makefile b/print/pdf2djvu/Makefile index 44c7440dddced..dd8d3f26c45f1 100644 --- a/print/pdf2djvu/Makefile +++ b/print/pdf2djvu/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2016/03/15 12:31:55 ryoon Exp $ +# $NetBSD: Makefile,v 1.40 2016/03/15 13:15:29 ryoon Exp $ # -DISTNAME= pdf2djvu-0.9.3 -PKGREVISION= 2 +DISTNAME= pdf2djvu-0.9.4 CATEGORIES= print MASTER_SITES= https://bitbucket.org/jwilk/pdf2djvu/downloads/ EXTRACT_SUFX= .tar.xz diff --git a/print/pdf2djvu/distinfo b/print/pdf2djvu/distinfo index 4b3defd167937..53a10e4b4ce6c 100644 --- a/print/pdf2djvu/distinfo +++ b/print/pdf2djvu/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2016/01/31 07:22:54 ryoon Exp $ +$NetBSD: distinfo,v 1.11 2016/03/15 13:15:29 ryoon Exp $ -SHA1 (pdf2djvu-0.9.3.tar.xz) = 776b92a9a0c5f917165c56d00bda27666990d269 -RMD160 (pdf2djvu-0.9.3.tar.xz) = 80b65920fd7ded187395706a4ca6f36e5defd743 -SHA512 (pdf2djvu-0.9.3.tar.xz) = 388b76642c354480674b6eee4961792c4ef483313ffd25a6248d1d6302985ac5adfb558ae9241062893a419463c9626d8dac9d08297d66b68a98cebbcc4dc193 -Size (pdf2djvu-0.9.3.tar.xz) = 239492 bytes +SHA1 (pdf2djvu-0.9.4.tar.xz) = ae4adc1376375f38ef9e79514b5e026855d56bde +RMD160 (pdf2djvu-0.9.4.tar.xz) = a70e6aab9b027978541f2ea37936f55c3a9acd6f +SHA512 (pdf2djvu-0.9.4.tar.xz) = 6b97d0577ee6e623d8c877393f551dd2a5e19508e5cd6dc5bb2d3ae1a2b71c2f0ffc7020d85507bc52a25da09a301dd5ddf45ab2628928477e0846707ea57322 +Size (pdf2djvu-0.9.4.tar.xz) = 250332 bytes From a7eb115261a32cbeab32cb7c0375f7e6cdd36e19 Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 15 Mar 2016 13:16:10 +0000 Subject: [PATCH 0119/2457] Updated print/pdf2djvu to 0.9.4 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 2a8414387eec7..9157c790b0fff 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1176 2016/03/15 12:45:20 fhajny Exp $ +$NetBSD: CHANGES-2016,v 1.1177 2016/03/15 13:16:10 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1566,3 +1566,4 @@ Changes to the packages collection and infrastructure in 2016: Updated databases/pgbouncer to 1.7.2 [fhajny 2016-03-15] Updated print/pdf2djvu to 0.9.3nb2 [ryoon 2016-03-15] Updated sysutils/puppet to 3.8.6 [fhajny 2016-03-15] + Updated print/pdf2djvu to 0.9.4 [ryoon 2016-03-15] diff --git a/doc/TODO b/doc/TODO index c4df0634739f9..dadf53f3e7016 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15596 2016/03/15 12:50:19 fhajny Exp $ +$NetBSD: TODO,v 1.15597 2016/03/15 13:16:10 ryoon Exp $ Suggested new packages ====================== @@ -1554,7 +1554,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o pciutils-3.4.0 o pcmanfm-0.5.2 [pkg/42451] o pcsc-tools-1.4.25 - o pdf2djvu-0.9.4 o pdfgrep-1.4.1 o pdmenu-1.2.87 o pear-Console_Table-1.3.0 From 0775882e1cd5e393475abafb7c7776e05670639b Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 15 Mar 2016 13:21:20 +0000 Subject: [PATCH 0120/2457] Update to 0.600 Status: Unadjusted glyphs (characters; 1st pass): Uninode 8a2b-8b95 Unadjusted glyphs (Bushu; 1st pass): Gonben --- fonts/umefont-ttf/Makefile | 4 ++-- fonts/umefont-ttf/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fonts/umefont-ttf/Makefile b/fonts/umefont-ttf/Makefile index 46da1c0b635dc..9cfc74417929f 100644 --- a/fonts/umefont-ttf/Makefile +++ b/fonts/umefont-ttf/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2016/01/31 08:01:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.58 2016/03/15 13:21:20 ryoon Exp $ # -DISTNAME= umefont_590 +DISTNAME= umefont_600 PKGNAME= ${DISTNAME:S/_/-ttf-0./} CATEGORIES= fonts japanese MASTER_SITES= ${MASTER_SITE_OSDN:=ume-font/22212/} diff --git a/fonts/umefont-ttf/distinfo b/fonts/umefont-ttf/distinfo index ebd33ae3530ac..fd6a4e530ac45 100644 --- a/fonts/umefont-ttf/distinfo +++ b/fonts/umefont-ttf/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.52 2016/01/31 08:01:28 ryoon Exp $ +$NetBSD: distinfo,v 1.53 2016/03/15 13:21:20 ryoon Exp $ -SHA1 (umefont_590.tar.xz) = 686406718c17d8971eff1590a90da4a0c1affa83 -RMD160 (umefont_590.tar.xz) = d409aab56d792325bb581382495d0313bd0fd6ad -SHA512 (umefont_590.tar.xz) = 80abea6bad180da5232e2b0f5d8730bd60655967bd29df09b041583c12ece2547aa4b4fee05565db1c096da9bef83ba5f145df436386805d1c08e03c6ab666c2 -Size (umefont_590.tar.xz) = 6533636 bytes +SHA1 (umefont_600.tar.xz) = f7f3a73fe95ede6af3a0ffda9cce5e4c7f658730 +RMD160 (umefont_600.tar.xz) = 89f305c0891795f4a07a88996210327fa04d4733 +SHA512 (umefont_600.tar.xz) = bab3b3c7fdbf73854642051134840c551b8605d766491edf5365434cc207a86a3ebf4e7da4a20e072e61a22516bd45da0384ded3573a5318c2759a4de7e60bd4 +Size (umefont_600.tar.xz) = 6235808 bytes From dc449896d11f514ddd5481f917af7d578c2b935c Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 15 Mar 2016 13:21:43 +0000 Subject: [PATCH 0121/2457] Updated fonts/umefont-ttf to 0.600 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 9157c790b0fff..055bd844459e0 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1177 2016/03/15 13:16:10 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1178 2016/03/15 13:21:43 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1567,3 +1567,4 @@ Changes to the packages collection and infrastructure in 2016: Updated print/pdf2djvu to 0.9.3nb2 [ryoon 2016-03-15] Updated sysutils/puppet to 3.8.6 [fhajny 2016-03-15] Updated print/pdf2djvu to 0.9.4 [ryoon 2016-03-15] + Updated fonts/umefont-ttf to 0.600 [ryoon 2016-03-15] From c5b38c34da967febd81d5bc552e73669925776c2 Mon Sep 17 00:00:00 2001 From: szptvlfn Date: Tue, 15 Mar 2016 13:45:17 +0000 Subject: [PATCH 0122/2457] Update to 0.13.9 CHANGES.txt: 0.13.9 #50, fix a space leak #36, fix the demo examples #35, make IsString a superclass of StringLike #33, make flattenTree O(n) instead of O(n^2) 0.13.8 #30, add parse/render functions directly to the Tree module 0.13.7 #32, make sure upper case &#X works in lookupEntity 0.13.6 #28, some named entities require a trailing semicolon (e.g. mid) 0.13.5 #26, rename the test program to test-tagsoup 0.13.4 #24, add isTagComment function Update the copyright year 0.13.3 Work on GHC 7.9 0.13.2 Remove all package upper bounds Allow QuickCheck-2.6 --- textproc/hs-tagsoup/Makefile | 5 ++--- textproc/hs-tagsoup/buildlink3.mk | 6 +++--- textproc/hs-tagsoup/distinfo | 10 +++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile index b80d4c25dabb8..6d6128a0025df 100644 --- a/textproc/hs-tagsoup/Makefile +++ b/textproc/hs-tagsoup/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2016/01/10 11:49:11 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.9 2016/03/15 13:45:17 szptvlfn Exp $ -DISTNAME= tagsoup-0.13.1 -PKGREVISION= 7 +DISTNAME= tagsoup-0.13.9 CATEGORIES= textproc MAINTAINER= pho@cielonegro.org diff --git a/textproc/hs-tagsoup/buildlink3.mk b/textproc/hs-tagsoup/buildlink3.mk index 61aba66d2492f..5e2f498369c2d 100644 --- a/textproc/hs-tagsoup/buildlink3.mk +++ b/textproc/hs-tagsoup/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.8 2016/01/10 11:49:11 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2016/03/15 13:45:17 szptvlfn Exp $ BUILDLINK_TREE+= hs-tagsoup .if !defined(HS_TAGSOUP_BUILDLINK3_MK) HS_TAGSOUP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hs-tagsoup+= hs-tagsoup>=0.13.1 -BUILDLINK_ABI_DEPENDS.hs-tagsoup+= hs-tagsoup>=0.13.1nb7 +BUILDLINK_API_DEPENDS.hs-tagsoup+= hs-tagsoup>=0.13.9 +BUILDLINK_ABI_DEPENDS.hs-tagsoup+= hs-tagsoup>=0.13.9 BUILDLINK_PKGSRCDIR.hs-tagsoup?= ../../textproc/hs-tagsoup .include "../../devel/hs-text/buildlink3.mk" diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo index 0a2107382488a..946efc1a5c2de 100644 --- a/textproc/hs-tagsoup/distinfo +++ b/textproc/hs-tagsoup/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 01:59:31 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/03/15 13:45:17 szptvlfn Exp $ -SHA1 (tagsoup-0.13.1.tar.gz) = 4066f9e949dacf8111fb187bf01b1f214f5ee7d8 -RMD160 (tagsoup-0.13.1.tar.gz) = 612408151a172be0a461c0d773355073896b9dfd -SHA512 (tagsoup-0.13.1.tar.gz) = 01873e5580356d4ff1f473bb992544b5a3c36348029c2e8e1ebcc11ce335040bfddd5c8cf5cebc47c68ab446acda777ee48d457be7a5898423d7bef0c92b87e6 -Size (tagsoup-0.13.1.tar.gz) = 42756 bytes +SHA1 (tagsoup-0.13.9.tar.gz) = 1c0f6f9a61fb31a968aaf96685b0d8fd495c77fe +RMD160 (tagsoup-0.13.9.tar.gz) = 9c8101fc47e2e9e046387d4ba54d505599afcf77 +SHA512 (tagsoup-0.13.9.tar.gz) = 0714f2749399a479b753a9829c05901612bf297d71807d068946adc8e9a1fe8e3844f0a3ac61cc8fd8b9c90712dac57a866810f2e59d94eaccc08e0de0397190 +Size (tagsoup-0.13.9.tar.gz) = 43921 bytes From db1fd7e13f55d723ca851a88ec3fc10a8b4180bf Mon Sep 17 00:00:00 2001 From: szptvlfn Date: Tue, 15 Mar 2016 13:45:29 +0000 Subject: [PATCH 0123/2457] Updated textproc/hs-tagsoup to 0.13.9 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 055bd844459e0..9738eec3fd4f8 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1178 2016/03/15 13:21:43 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1179 2016/03/15 13:45:29 szptvlfn Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1568,3 +1568,4 @@ Changes to the packages collection and infrastructure in 2016: Updated sysutils/puppet to 3.8.6 [fhajny 2016-03-15] Updated print/pdf2djvu to 0.9.4 [ryoon 2016-03-15] Updated fonts/umefont-ttf to 0.600 [ryoon 2016-03-15] + Updated textproc/hs-tagsoup to 0.13.9 [szptvlfn 2016-03-15] diff --git a/doc/TODO b/doc/TODO index dadf53f3e7016..60fce2355b292 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15597 2016/03/15 13:16:10 ryoon Exp $ +$NetBSD: TODO,v 1.15598 2016/03/15 13:45:29 szptvlfn Exp $ Suggested new packages ====================== @@ -926,7 +926,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o hs-stringsearch-0.3.6.6 o hs-syb-0.6 o hs-tagged-0.8.3 - o hs-tagsoup-0.13.8 o hs-temporary-1.2.0.4 o hs-texmath-0.8.4.2 o hs-transformers-0.5.2.0 From 0ca6689ff29c89620a019b986364ce7498e547ef Mon Sep 17 00:00:00 2001 From: pettai Date: Tue, 15 Mar 2016 13:48:35 +0000 Subject: [PATCH 0124/2457] NSD 4.1.9 ========= BUG FIXES: - Change the nsd.db file version because of nanosecond precision fix. --- net/nsd/Makefile | 4 ++-- net/nsd/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/nsd/Makefile b/net/nsd/Makefile index a3816a222fe1b..98069f585d323 100644 --- a/net/nsd/Makefile +++ b/net/nsd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.83 2016/03/11 21:53:07 pettai Exp $ +# $NetBSD: Makefile,v 1.84 2016/03/15 13:48:35 pettai Exp $ -DISTNAME= nsd-4.1.8 +DISTNAME= nsd-4.1.9 CATEGORIES= net MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ diff --git a/net/nsd/distinfo b/net/nsd/distinfo index f2424d23834eb..a76c9104fe987 100644 --- a/net/nsd/distinfo +++ b/net/nsd/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.51 2016/03/11 21:53:07 pettai Exp $ +$NetBSD: distinfo,v 1.52 2016/03/15 13:48:35 pettai Exp $ -SHA1 (nsd-4.1.8.tar.gz) = b9d192d985c3edfdf6bbce0b6de1ebd90de5f4f0 -RMD160 (nsd-4.1.8.tar.gz) = bb5e43695371794f4f78fa3bca7a5d92b588a97b -SHA512 (nsd-4.1.8.tar.gz) = 34f3ee7218fb8606674d9b58538ec7d2b713c2575969e0c6bc7de9c0c4da7e06d2ec1f2b84a5222b3ad8fe104d6358dd4131de9dfb07a56a01186fab52286063 -Size (nsd-4.1.8.tar.gz) = 1073103 bytes +SHA1 (nsd-4.1.9.tar.gz) = 6ff4b2998aedf3a8ae18a071f1d121f3586aaf70 +RMD160 (nsd-4.1.9.tar.gz) = fe78b2d6e7228cca10ebb79ac57174d7ddc711fb +SHA512 (nsd-4.1.9.tar.gz) = 4602dfd07f41dca80fb3b2af471305ad2baba45f7aa294bd3e50d673ec6cc3b1170b410a425796cef52b3af6eea6282dcb00c1f21d5642b0962b3d111dade940 +Size (nsd-4.1.9.tar.gz) = 1073120 bytes SHA1 (patch-aa) = d9a423d5faa8da9a213b21fd2712225ac9645091 SHA1 (patch-util.c) = acaf676e675fc07ef51b4c1cc056214731bc193f From a6cbe7b5a82d45492d160c16eb0666a84da2d90c Mon Sep 17 00:00:00 2001 From: pettai Date: Tue, 15 Mar 2016 13:49:10 +0000 Subject: [PATCH 0125/2457] Updated net/nsd to 4.1.9 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 9738eec3fd4f8..d71fa7c84dfb5 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1179 2016/03/15 13:45:29 szptvlfn Exp $ +$NetBSD: CHANGES-2016,v 1.1180 2016/03/15 13:49:10 pettai Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1569,3 +1569,4 @@ Changes to the packages collection and infrastructure in 2016: Updated print/pdf2djvu to 0.9.4 [ryoon 2016-03-15] Updated fonts/umefont-ttf to 0.600 [ryoon 2016-03-15] Updated textproc/hs-tagsoup to 0.13.9 [szptvlfn 2016-03-15] + Updated net/nsd to 4.1.9 [pettai 2016-03-15] From 2db65904c64ce4eb4c051df28ace1b45d6abb51a Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:24:46 +0000 Subject: [PATCH 0126/2457] Update ruby-tins to 1.9.0. Add Tins::Duration class to display time durations. --- devel/ruby-tins/Makefile | 4 ++-- devel/ruby-tins/PLIST | 4 +++- devel/ruby-tins/distinfo | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/devel/ruby-tins/Makefile b/devel/ruby-tins/Makefile index 90e19b685b9a8..e52b2b3a97432 100644 --- a/devel/ruby-tins/Makefile +++ b/devel/ruby-tins/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2016/02/16 16:17:24 taca Exp $ +# $NetBSD: Makefile,v 1.11 2016/03/15 14:24:46 taca Exp $ -DISTNAME= tins-1.8.2 +DISTNAME= tins-1.9.0 CATEGORIES= time MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/ruby-tins/PLIST b/devel/ruby-tins/PLIST index 9beb406b1a968..f8e2178d8e732 100644 --- a/devel/ruby-tins/PLIST +++ b/devel/ruby-tins/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2015/12/12 14:38:26 taca Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/03/15 14:24:46 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.gitignore ${GEM_LIBDIR}/.travis.yml @@ -52,6 +52,7 @@ ${GEM_LIBDIR}/lib/tins/date_time_dummy.rb ${GEM_LIBDIR}/lib/tins/deep_const_get.rb ${GEM_LIBDIR}/lib/tins/deep_dup.rb ${GEM_LIBDIR}/lib/tins/dslkit.rb +${GEM_LIBDIR}/lib/tins/duration.rb ${GEM_LIBDIR}/lib/tins/extract_last_argument_options.rb ${GEM_LIBDIR}/lib/tins/file_binary.rb ${GEM_LIBDIR}/lib/tins/find.rb @@ -152,6 +153,7 @@ ${GEM_LIBDIR}/tests/deep_const_get_test.rb ${GEM_LIBDIR}/tests/deep_dup_test.rb ${GEM_LIBDIR}/tests/delegate_test.rb ${GEM_LIBDIR}/tests/dslkit_test.rb +${GEM_LIBDIR}/tests/duaration_test.rb ${GEM_LIBDIR}/tests/dynamic_scope_test.rb ${GEM_LIBDIR}/tests/extract_last_argument_options_test.rb ${GEM_LIBDIR}/tests/file_binary_test.rb diff --git a/devel/ruby-tins/distinfo b/devel/ruby-tins/distinfo index 34bbd3798189a..7aac997cae46a 100644 --- a/devel/ruby-tins/distinfo +++ b/devel/ruby-tins/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.11 2016/02/16 16:17:24 taca Exp $ +$NetBSD: distinfo,v 1.12 2016/03/15 14:24:46 taca Exp $ -SHA1 (tins-1.8.2.gem) = cb6e0df278f1c2b1267b604e851c499ca2fc07ec -RMD160 (tins-1.8.2.gem) = 21d74ee65de28203b842295a7b1426ace1cd41eb -SHA512 (tins-1.8.2.gem) = 9ade583904002473ebc0a193be5733f60be0192594e419e7123f9653841b44738936c794bc78ace024fb4fde3117a3446cc29461f0b5e2bb8c0e38416adbf7d1 -Size (tins-1.8.2.gem) = 300032 bytes +SHA1 (tins-1.9.0.gem) = 3b6f5c64493b61e7df7eda88be30ae1def2059ea +RMD160 (tins-1.9.0.gem) = f12560473f172700d521690d5fdd817d9fa6f502 +SHA512 (tins-1.9.0.gem) = 6ef081d492030dc42a548e849699f0b8650d50644dc2c0aacf9b9a1694ff02c1da19bca8926d42d042537c2ea672b1e49dcd88a3fc41d9daf675029db1bc06b2 +Size (tins-1.9.0.gem) = 301056 bytes From 068718bf94ca93570a3a97866318bd37e3974f68 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:25:39 +0000 Subject: [PATCH 0127/2457] Update devel/ruby-tins package to 1.9.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index d71fa7c84dfb5..86cdb41566f82 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1180 2016/03/15 13:49:10 pettai Exp $ +$NetBSD: CHANGES-2016,v 1.1181 2016/03/15 14:25:39 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1570,3 +1570,4 @@ Changes to the packages collection and infrastructure in 2016: Updated fonts/umefont-ttf to 0.600 [ryoon 2016-03-15] Updated textproc/hs-tagsoup to 0.13.9 [szptvlfn 2016-03-15] Updated net/nsd to 4.1.9 [pettai 2016-03-15] + Updated devel/ruby-tins to 1.9.0 [taca 2016-03-15] From 926febf45a0ce4568974427ada7ced88e94628bf Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:26:24 +0000 Subject: [PATCH 0128/2457] Update ruby-commander to 4.4.0. === 4.4.0 / 2016-02-19 * Add modular style template initialization. (@lebogan) * Allow option names that start with a global option name. * Fix handling of negatable global flags. (@mfurtak) === 4.3.8 / 2016-02-09 * Fix regression for deprecation warnings. === 4.3.7 / 2016-01-26 * Fix regression in help formatter introduced in 4.3.6. === 4.3.6 / 2016-01-26 [YANKED] * Fix deprecation warnings on Ruby 2.3.0. * Indent option descriptions the same way as program and command descriptions. (@badeball) --- misc/ruby-commander/Makefile | 4 ++-- misc/ruby-commander/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/misc/ruby-commander/Makefile b/misc/ruby-commander/Makefile index e90788c2af28a..8c773191d84dd 100644 --- a/misc/ruby-commander/Makefile +++ b/misc/ruby-commander/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2015/09/13 14:42:34 taca Exp $ +# $NetBSD: Makefile,v 1.14 2016/03/15 14:26:24 taca Exp $ -DISTNAME= commander-4.3.5 +DISTNAME= commander-4.4.0 CATEGORIES= misc MAINTAINER= tonnerre@NetBSD.org diff --git a/misc/ruby-commander/distinfo b/misc/ruby-commander/distinfo index ce0d83418cc36..f2c57ca4a9e5a 100644 --- a/misc/ruby-commander/distinfo +++ b/misc/ruby-commander/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.14 2015/11/03 23:49:49 agc Exp $ +$NetBSD: distinfo,v 1.15 2016/03/15 14:26:24 taca Exp $ -SHA1 (commander-4.3.5.gem) = 07da0b566ec38ec03a715fa175c9e040b32d1727 -RMD160 (commander-4.3.5.gem) = 95f497c971718ada9261dc3ac6ffc7f9b3b06447 -SHA512 (commander-4.3.5.gem) = a6bdf476c60636883bde58f5915cc08cd858093ad19143617d7cd72a523adb6bf2c72539ce2de469520624bc1d387c5ba44de4577d174f00b03eaf684ffa3966 -Size (commander-4.3.5.gem) = 35328 bytes +SHA1 (commander-4.4.0.gem) = b36286dff459c1f5602eafc74a7863603cc451ba +RMD160 (commander-4.4.0.gem) = 70ede67cc32ac665003268936fda2a51ce62dca8 +SHA512 (commander-4.4.0.gem) = e417c68c83041a088ec8d7e5202ac733b2a80699d1e15ca1612a904327833dce9ad788a9523ebe2c83f4e509001e93283745378ab5ca5aee15072690ca51d530 +Size (commander-4.4.0.gem) = 35840 bytes From 02a7c5027482d3d6229822495d41ecd959e826ee Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:26:53 +0000 Subject: [PATCH 0129/2457] Note update of misc/ruby-commander package to 4.4.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 86cdb41566f82..123386c88d3f5 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1181 2016/03/15 14:25:39 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1182 2016/03/15 14:26:53 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1571,3 +1571,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/hs-tagsoup to 0.13.9 [szptvlfn 2016-03-15] Updated net/nsd to 4.1.9 [pettai 2016-03-15] Updated devel/ruby-tins to 1.9.0 [taca 2016-03-15] + Updated misc/ruby-commander to 4.4.0 [taca 2016-03-15] From 2236f8dc42079486fcb3525711fc37cb07766671 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:33:26 +0000 Subject: [PATCH 0130/2457] Update ruby-ohai to 8.12.0. 8.12.0 (2016-03-09) Full Changelog Implemented enhancements: * add plugin to detect user sessions using loginctl #766 (davide125) * Improve virtualization detection on Solaris #760 (tas50) * Improve FreeBSD guest virtualization detection #756 (tas50) * Detect Openstack hosts #751 (tas50) * Improve KVM host and guest detection #750 (tas50) * Update GCE metadata API version and fail better #736 (tas50) Fixed bugs: * Make ohai work with Chef 12.7 and below #768 (jkeiser) * Remove XML output in VirtualizationInfo and need for hpricot gem #755 (tas50) v8.11.1 (2016-03-08) Full Changelog Implemented enhancements: * Detect Azure on non-bootstrapped hosts #657 * Deprecate run_command and popen4 in the command mixin #730 (tas50) * OHAI-726 Regex to support openjdk 1.8 #727 (davidnewman) * Add support for the 2 latest EC2 metadata versions #725 (tas50) * Improved debug logging for cloud plugins #724 (tas50) * Detect paravirt amazon instances without hint files #722 (tas50) * Detect Azure using the Azure agent and DHCP options #714 (tas50) Fixed bugs: * Use escape_glob_dir instead of escape_glob #747 (jaym) * have a proper dependency on plist #737 (thommay) * Fix digital ocean ip address detection #735 (ctso) * Log sigar gem load failures #731 (tas50) * ipaddress on Linux - default route pointing to unaddressed interface, with route src #682 (glennmatthews) Release 8.10.0 * pr#720 Make Windows driver plugin opt-in via config * pr#717 Don't enable packages plugin by default * pr#711 Improve EC2 detection for HVM instances when a hint isn't present Release 8.9.0 * phreakocious: - Collect layer 1 Ethernet information per NIC on Linux hosts * Mark Gibbons: - Add kernel[:processor] with output of uname -p output * Shahul Khajamohideen - Add packages plugin * electrolinux - Add "alpine" platform and platform_family * Julien Berard - Add instance_id to rackspace plugin * Matt Whiteley - Allow route table override * JM Howard Brown - Add tests and queue_depth to block_device * pr#672 CPU plugin for Darwin (OS X) now properly reports the number of real CPUs adds "cores" to match the CPU output on Linux pr#674 CPU plugin for FreeBSD now reports "real" and "core" values to match the CPU output on Linux * pr#654 Improvements to filesystem and wpar detection on AIX * pr#683 Properly detect the init package on older Linux kernels * pr#684 Remove non-functional cucumber tests * pr#695 Fix detection of mac address on IPv6 only systems * pr#703 Enable ChefStyle per RFC 64 --- misc/ruby-ohai/Makefile | 8 ++++---- misc/ruby-ohai/PLIST | 14 +++++++++++++- misc/ruby-ohai/distinfo | 10 +++++----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/misc/ruby-ohai/Makefile b/misc/ruby-ohai/Makefile index e37c2d7bdb492..e18dc0bc24898 100644 --- a/misc/ruby-ohai/Makefile +++ b/misc/ruby-ohai/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2015/12/30 04:22:59 taca Exp $ +# $NetBSD: Makefile,v 1.13 2016/03/15 14:33:26 taca Exp $ -DISTNAME= ohai-8.8.1 +DISTNAME= ohai-8.12.0 CATEGORIES= misc MAINTAINER= pkgsrc-users@NetBSD.org @@ -8,7 +8,6 @@ HOMEPAGE= https://github.com/opscode/ohai COMMENT= Ohai profiles your system and emits JSON LICENSE= apache-2.0 -DEPENDS+= ${RUBY_PKGPREFIX}-mime-types>=3.0<4:../../mail/ruby-mime-types DEPENDS+= ${RUBY_PKGPREFIX}-systemu>=2.6.4<2.7:../../misc/ruby-systemu DEPENDS+= ${RUBY_PKGPREFIX}-ffi>=1.9<2:../../devel/ruby-ffi DEPENDS+= ${RUBY_PKGPREFIX}-ffi-yajl>=2.2<3:../../devel/ruby-ffi-yajl @@ -16,8 +15,9 @@ DEPENDS+= ${RUBY_PKGPREFIX}-mixlib-cli>=1.5.0:../../devel/ruby-mixlib-cli DEPENDS+= ${RUBY_PKGPREFIX}-mixlib-config>=2.1.0:../../devel/ruby-mixlib-config DEPENDS+= ${RUBY_PKGPREFIX}-mixlib-log>=1.6.0:../../devel/ruby-mixlib-log DEPENDS+= ${RUBY_PKGPREFIX}-mixlib-shellout>=2.0<3:../../devel/ruby-mixlib-shellout -DEPENDS+= ${RUBY_PKGPREFIX}-wmi-lite>=1.0:../../devel/ruby-wmi-lite +DEPENDS+= ${RUBY_PKGPREFIX}-plist>=0:../../textproc/ruby-plist DEPENDS+= ${RUBY_PKGPREFIX}-ipaddress>=0.8.0:../../net/ruby-ipaddress +DEPENDS+= ${RUBY_PKGPREFIX}-wmi-lite>=1.0:../../devel/ruby-wmi-lite DEPENDS+= ${RUBY_PKGPREFIX}-chef-config<13:../../sysutils/ruby-chef-config RUBYGEM_OPTIONS+= --format-executable diff --git a/misc/ruby-ohai/PLIST b/misc/ruby-ohai/PLIST index 9e2ecdf18d82d..f402c18375d77 100644 --- a/misc/ruby-ohai/PLIST +++ b/misc/ruby-ohai/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2015/12/13 16:36:11 taca Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/03/15 14:33:26 taca Exp $ bin/ohai${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/Gemfile @@ -36,6 +36,7 @@ ${GEM_LIBDIR}/lib/ohai/plugins/aix/filesystem.rb ${GEM_LIBDIR}/lib/ohai/plugins/aix/kernel.rb ${GEM_LIBDIR}/lib/ohai/plugins/aix/memory.rb ${GEM_LIBDIR}/lib/ohai/plugins/aix/network.rb +${GEM_LIBDIR}/lib/ohai/plugins/aix/os.rb ${GEM_LIBDIR}/lib/ohai/plugins/aix/platform.rb ${GEM_LIBDIR}/lib/ohai/plugins/aix/uptime.rb ${GEM_LIBDIR}/lib/ohai/plugins/aix/virtualization.rb @@ -92,6 +93,7 @@ ${GEM_LIBDIR}/lib/ohai/plugins/linux/mdadm.rb ${GEM_LIBDIR}/lib/ohai/plugins/linux/memory.rb ${GEM_LIBDIR}/lib/ohai/plugins/linux/network.rb ${GEM_LIBDIR}/lib/ohai/plugins/linux/platform.rb +${GEM_LIBDIR}/lib/ohai/plugins/linux/sessions.rb ${GEM_LIBDIR}/lib/ohai/plugins/linux/virtualization.rb ${GEM_LIBDIR}/lib/ohai/plugins/lua.rb ${GEM_LIBDIR}/lib/ohai/plugins/mono.rb @@ -110,6 +112,7 @@ ${GEM_LIBDIR}/lib/ohai/plugins/openbsd/network.rb ${GEM_LIBDIR}/lib/ohai/plugins/openbsd/platform.rb ${GEM_LIBDIR}/lib/ohai/plugins/openstack.rb ${GEM_LIBDIR}/lib/ohai/plugins/os.rb +${GEM_LIBDIR}/lib/ohai/plugins/packages.rb ${GEM_LIBDIR}/lib/ohai/plugins/passwd.rb ${GEM_LIBDIR}/lib/ohai/plugins/perl.rb ${GEM_LIBDIR}/lib/ohai/plugins/php.rb @@ -162,17 +165,22 @@ ${GEM_LIBDIR}/spec/data/plugins/___lib___libc.so.6.output ${GEM_LIBDIR}/spec/data/plugins/cc.output ${GEM_LIBDIR}/spec/data/plugins/cl.output ${GEM_LIBDIR}/spec/data/plugins/devenv.com.output +${GEM_LIBDIR}/spec/data/plugins/dpkg-query.output ${GEM_LIBDIR}/spec/data/plugins/env.output ${GEM_LIBDIR}/spec/data/plugins/erl.output ${GEM_LIBDIR}/spec/data/plugins/gcc.output ${GEM_LIBDIR}/spec/data/plugins/groovy.output ${GEM_LIBDIR}/spec/data/plugins/java.output +${GEM_LIBDIR}/spec/data/plugins/lslpp.output ${GEM_LIBDIR}/spec/data/plugins/lua.output ${GEM_LIBDIR}/spec/data/plugins/messages.rb ${GEM_LIBDIR}/spec/data/plugins/node.output ${GEM_LIBDIR}/spec/data/plugins/perl.output ${GEM_LIBDIR}/spec/data/plugins/php.output +${GEM_LIBDIR}/spec/data/plugins/pkginfo.output +${GEM_LIBDIR}/spec/data/plugins/pkglist.output ${GEM_LIBDIR}/spec/data/plugins/python.output +${GEM_LIBDIR}/spec/data/plugins/rpmquery.output ${GEM_LIBDIR}/spec/data/plugins/uname.output ${GEM_LIBDIR}/spec/data/plugins/v6message.rb ${GEM_LIBDIR}/spec/data/plugins/v7message.rb @@ -204,6 +212,7 @@ ${GEM_LIBDIR}/spec/unit/plugins/aix/hostname_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/aix/kernel_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/aix/memory_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/aix/network_spec.rb +${GEM_LIBDIR}/spec/unit/plugins/aix/os_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/aix/platform_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/aix/uptime_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/aix/virtualization_spec.rb @@ -247,6 +256,7 @@ ${GEM_LIBDIR}/spec/unit/plugins/java_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/joyent_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/kernel_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linode_spec.rb +${GEM_LIBDIR}/spec/unit/plugins/linux/block_device_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linux/cpu_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linux/filesystem2_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linux/filesystem_spec.rb @@ -257,6 +267,7 @@ ${GEM_LIBDIR}/spec/unit/plugins/linux/mdadm_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linux/memory_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linux/network_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linux/platform_spec.rb +${GEM_LIBDIR}/spec/unit/plugins/linux/sessions_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linux/uptime_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/linux/virtualization_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/lua_spec.rb @@ -273,6 +284,7 @@ ${GEM_LIBDIR}/spec/unit/plugins/openbsd/kernel_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/openbsd/platform_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/openstack_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/os_spec.rb +${GEM_LIBDIR}/spec/unit/plugins/packages_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/passwd_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/perl_spec.rb ${GEM_LIBDIR}/spec/unit/plugins/php_spec.rb diff --git a/misc/ruby-ohai/distinfo b/misc/ruby-ohai/distinfo index d8b93a6369945..f3d3e65bc373b 100644 --- a/misc/ruby-ohai/distinfo +++ b/misc/ruby-ohai/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/12/13 16:36:11 taca Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 14:33:26 taca Exp $ -SHA1 (ohai-8.8.1.gem) = 953f83419e42c43778f01e8104d91437999f21e5 -RMD160 (ohai-8.8.1.gem) = 5facbeab166c8e17920ff058fbdb0a00feb4da58 -SHA512 (ohai-8.8.1.gem) = b76ac537369f9339801998427ec33d399786b160de0fc83588842bd296674acc48268ab1b437b3e162fbbaef738447259e6d1ac2981ec99fd8af7326bab97788 -Size (ohai-8.8.1.gem) = 475648 bytes +SHA1 (ohai-8.12.0.gem) = 5a857a820a1cbd0f63e2d08b7eecd59b91f989db +RMD160 (ohai-8.12.0.gem) = d4ca09f42391011eb6b8d6ec019d0b92548b0c7b +SHA512 (ohai-8.12.0.gem) = 85245edef21aa04cf60c79f7df557401c136da5155a92fa264af732a9bf79ba67c7569077637d07a55d85143566a2c62332690d43a450bb9fc071eefa5aff441 +Size (ohai-8.12.0.gem) = 507904 bytes From fab94b54e14082a94f1dedd5a99de8e912fafa0c Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:34:03 +0000 Subject: [PATCH 0131/2457] Note update of misc/ruby-ohai package to 8.12.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 123386c88d3f5..ad1f8d923790c 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1182 2016/03/15 14:26:53 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1183 2016/03/15 14:34:03 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1572,3 +1572,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/nsd to 4.1.9 [pettai 2016-03-15] Updated devel/ruby-tins to 1.9.0 [taca 2016-03-15] Updated misc/ruby-commander to 4.4.0 [taca 2016-03-15] + Updated misc/ruby-ohai to 8.12.0 [taca 2016-03-15] From 420376ece50f989bb70715bb12d494466351fc6f Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:36:48 +0000 Subject: [PATCH 0132/2457] Update ruby-parallel to 1.6.2. * Clean up test cases for not calling finish * Don't call :finish hook if there was an exception * add test for queue error I just ran into * Update redirects --- misc/ruby-parallel/Makefile | 4 ++-- misc/ruby-parallel/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/misc/ruby-parallel/Makefile b/misc/ruby-parallel/Makefile index 12c5f1d00be68..3b7d18b4fa750 100644 --- a/misc/ruby-parallel/Makefile +++ b/misc/ruby-parallel/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2015/09/13 14:49:30 taca Exp $ +# $NetBSD: Makefile,v 1.8 2016/03/15 14:36:48 taca Exp $ # -DISTNAME= parallel-1.6.1 +DISTNAME= parallel-1.6.2 CATEGORIES= misc MAINTAINER= tsutsui@NetBSD.org diff --git a/misc/ruby-parallel/distinfo b/misc/ruby-parallel/distinfo index 7dcf874b8803b..09d4afcd0a69e 100644 --- a/misc/ruby-parallel/distinfo +++ b/misc/ruby-parallel/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 23:49:50 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 14:36:48 taca Exp $ -SHA1 (parallel-1.6.1.gem) = a0bfbedeaa0050ba23553d97bf90f3c62dd446bf -RMD160 (parallel-1.6.1.gem) = 68b7f3c1fa67b25a8679ad5ef96896570d360c0b -SHA512 (parallel-1.6.1.gem) = 4bbad1af4c7e0ded78d6a46aaeed7732631ead757ea91e468a95b7c74576c403a1acd0a888b1293853dbba0e9823d085247ce957c202ca0ad079dec4d1778229 -Size (parallel-1.6.1.gem) = 8704 bytes +SHA1 (parallel-1.6.2.gem) = 61a731bdc32d6f7680ece8b63d3edb612e6a4d8a +RMD160 (parallel-1.6.2.gem) = b91b1eca9fb773bba2ff6e1a171cc7420da7c6ff +SHA512 (parallel-1.6.2.gem) = 9e704183076f090116804440084a96848a766f53abe27e3870f42fb99f6b10f2a9bf96446aa2bc382e3ba7e1ab562b35beb51f9df423ccc139ad8ce069a512cd +Size (parallel-1.6.2.gem) = 8704 bytes From 24879141c65f4d673bcf2347e39ffd25379b1a60 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:37:25 +0000 Subject: [PATCH 0133/2457] Note update of misc/ruby-parallel package to 1.6.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index ad1f8d923790c..9c7357594be2d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1183 2016/03/15 14:34:03 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1184 2016/03/15 14:37:25 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1573,3 +1573,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/ruby-tins to 1.9.0 [taca 2016-03-15] Updated misc/ruby-commander to 4.4.0 [taca 2016-03-15] Updated misc/ruby-ohai to 8.12.0 [taca 2016-03-15] + Updated misc/ruby-parallel to 1.6.2 [taca 2016-03-15] From 93d777887607f33cbf253c5f3c27d69fbe4f862b Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:38:07 +0000 Subject: [PATCH 0134/2457] Update ruby-rainbow to 2.1.0. ## 2.1.0 (2016-01-24) * added X11 color support * fixed `require` issue when rainbow is used as a dependency in another gem * improved Windows support --- misc/ruby-rainbow/Makefile | 4 ++-- misc/ruby-rainbow/PLIST | 3 ++- misc/ruby-rainbow/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/misc/ruby-rainbow/Makefile b/misc/ruby-rainbow/Makefile index 89f0fdca6dc29..66caa3bf12795 100644 --- a/misc/ruby-rainbow/Makefile +++ b/misc/ruby-rainbow/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2015/06/07 16:25:56 taca Exp $ +# $NetBSD: Makefile,v 1.7 2016/03/15 14:38:07 taca Exp $ # -DISTNAME= rainbow-2.0.0 +DISTNAME= rainbow-2.1.0 CATEGORIES= misc MAINTAINER= tsutsui@NetBSD.org diff --git a/misc/ruby-rainbow/PLIST b/misc/ruby-rainbow/PLIST index fc8b9f6738959..f1872cc59f51c 100644 --- a/misc/ruby-rainbow/PLIST +++ b/misc/ruby-rainbow/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2014/01/17 18:16:27 tsutsui Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/15 14:38:07 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.gitignore ${GEM_LIBDIR}/.rubocop.yml @@ -19,6 +19,7 @@ ${GEM_LIBDIR}/lib/rainbow/presenter.rb ${GEM_LIBDIR}/lib/rainbow/string_utils.rb ${GEM_LIBDIR}/lib/rainbow/version.rb ${GEM_LIBDIR}/lib/rainbow/wrapper.rb +${GEM_LIBDIR}/lib/rainbow/x11_color_names.rb ${GEM_LIBDIR}/rainbow.gemspec ${GEM_LIBDIR}/spec/integration/instance_spec.rb ${GEM_LIBDIR}/spec/integration/rainbow_spec.rb diff --git a/misc/ruby-rainbow/distinfo b/misc/ruby-rainbow/distinfo index aa386af8d6629..cdad45c4db595 100644 --- a/misc/ruby-rainbow/distinfo +++ b/misc/ruby-rainbow/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 23:49:51 agc Exp $ +$NetBSD: distinfo,v 1.5 2016/03/15 14:38:07 taca Exp $ -SHA1 (rainbow-2.0.0.gem) = 284351276893c8b7158dd9f77e575eb254050f4e -RMD160 (rainbow-2.0.0.gem) = 7611712c2ce34d72c6f7fe69210c953f669b3074 -SHA512 (rainbow-2.0.0.gem) = be2c96af48b3e423fd036762f0b496e977727140174e469afd672af0f47c0047a93618b1f792960250b4597da679d31161e29aa412d4ef2f94d8e96102de08ef -Size (rainbow-2.0.0.gem) = 14336 bytes +SHA1 (rainbow-2.1.0.gem) = 29c4e5e2e13d7d542c5f403e2dc36d2f6d183ee7 +RMD160 (rainbow-2.1.0.gem) = b7b73f568899a2485f574cf448bc494fdeb4e7b4 +SHA512 (rainbow-2.1.0.gem) = 22912b0204fa0bc907eb3d58770ff5841e1649b6da23b09652cbc62c570668fdb579e5e3291038c7dee4ffde9ae35bdd274b5727ee32f8567deff8a6572e41d6 +Size (rainbow-2.1.0.gem) = 17408 bytes From f8b7033a0d48db5b3b877b90124237a42559cf9a Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:39:04 +0000 Subject: [PATCH 0135/2457] Note update of misc/ruby-rainbow package to 2.1.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 9c7357594be2d..e7893f8a7eb56 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1184 2016/03/15 14:37:25 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1185 2016/03/15 14:39:04 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1574,3 +1574,4 @@ Changes to the packages collection and infrastructure in 2016: Updated misc/ruby-commander to 4.4.0 [taca 2016-03-15] Updated misc/ruby-ohai to 8.12.0 [taca 2016-03-15] Updated misc/ruby-parallel to 1.6.2 [taca 2016-03-15] + Updated misc/ruby-rainbow to 2.1.0 [taca 2016-03-15] From ba32621ffd34f804e6b17b45539b678a706756b0 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:39:36 +0000 Subject: [PATCH 0136/2457] Update ruby-dnsruby to 1.59.2. ## v1.59.2 * Timeout error fix ## v1.59.1 * Support for HMAC SHA512 TSIG keys * Fix TCP pipelining tests * IDN encoding error returned as Dnsruby::OtherResolvError --- net/ruby-dnsruby/Makefile | 4 ++-- net/ruby-dnsruby/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/ruby-dnsruby/Makefile b/net/ruby-dnsruby/Makefile index 45e21b5b9168a..bdf5a80716581 100644 --- a/net/ruby-dnsruby/Makefile +++ b/net/ruby-dnsruby/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2015/12/12 15:00:03 taca Exp $ +# $NetBSD: Makefile,v 1.17 2016/03/15 14:39:36 taca Exp $ -DISTNAME= dnsruby-1.59.0 +DISTNAME= dnsruby-1.59.2 CATEGORIES= net MAINTAINER= pettai@NetBSD.org diff --git a/net/ruby-dnsruby/distinfo b/net/ruby-dnsruby/distinfo index 25b2a7f3acb7a..e06ecaf9ae392 100644 --- a/net/ruby-dnsruby/distinfo +++ b/net/ruby-dnsruby/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.13 2015/12/12 15:00:03 taca Exp $ +$NetBSD: distinfo,v 1.14 2016/03/15 14:39:36 taca Exp $ -SHA1 (dnsruby-1.59.0.gem) = 9b0e1aded7b7359810e7e96876fdac491d72dccd -RMD160 (dnsruby-1.59.0.gem) = 42ed23dcb342720c11a88890f85c0efac76ea9ba -SHA512 (dnsruby-1.59.0.gem) = 769111d24fd745288b41e083630e7ea7cd078ff6297afe8eff7eb0a95f57a74c9b1dbfd09db122eb45c340243e1eaee86faa3175e750c2b243ac6b92f7c3a804 -Size (dnsruby-1.59.0.gem) = 232960 bytes +SHA1 (dnsruby-1.59.2.gem) = 5291951b3fcc0cb1e8f66a075e55b571596de7a3 +RMD160 (dnsruby-1.59.2.gem) = 508dc27a3704a8a02092b2f8ec3567c9bfafdcf9 +SHA512 (dnsruby-1.59.2.gem) = f8b75d98860c6b5e2753b79b59d0b30db47af1b8739564fdaeac93b702ae0a39fdf547422426c2a4cabe3fc9b5b4e1c9b09d687f976d06aa0b0c31cc7a474fdd +Size (dnsruby-1.59.2.gem) = 233984 bytes From 00e1abfb0a5e57ec78d8cffa4dee979b6548a3b3 Mon Sep 17 00:00:00 2001 From: mef Date: Tue, 15 Mar 2016 14:40:03 +0000 Subject: [PATCH 0137/2457] (pkgsrc) - Drop two patches, they are now included (but not exactly the same as our patches). (upstream) - Update 3.23.07 to 3.23.08 ------------------------- =Version 3.23.08= 2016-02-21 Rik van Riel bbbeed4: NAVTEX update 2016-02-16 David Freese 5b2edad: Save Logbook 1c8e0e9: Analysis mode 0f650e9: flrig PTT 106e3e2: flrig waiting 71fa224: COM port close dd1165a: fsq repeat last fb0fd4c: Mac Logger 2016-02-04 Jonathan Wakely 813b58a: GCC 6 build 2016-02-01 David Freese d808977: CALL capture bea9cfe: Scope View 8bcc9e8: RigCAT modifications --- ham/fldigi/Makefile | 5 +- ham/fldigi/distinfo | 12 ++--- ham/fldigi/patches/patch-src_fsq_fsq.cxx | 54 ---------------------- ham/fldigi/patches/patch-src_ifkp_ifkp.cxx | 21 --------- 4 files changed, 7 insertions(+), 85 deletions(-) delete mode 100644 ham/fldigi/patches/patch-src_fsq_fsq.cxx delete mode 100644 ham/fldigi/patches/patch-src_ifkp_ifkp.cxx diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile index 1b80b07c09ac8..cc380271c3b61 100644 --- a/ham/fldigi/Makefile +++ b/ham/fldigi/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.69 2016/03/05 11:28:41 jperkin Exp $ +# $NetBSD: Makefile,v 1.70 2016/03/15 14:40:03 mef Exp $ -DISTNAME= fldigi-3.23.07 -PKGREVISION= 1 +DISTNAME= fldigi-3.23.08 CATEGORIES= ham MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fldigi/} diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo index 2e82f32475a85..8718c3ceea71b 100644 --- a/ham/fldigi/distinfo +++ b/ham/fldigi/distinfo @@ -1,12 +1,10 @@ -$NetBSD: distinfo,v 1.42 2016/01/23 14:19:08 mef Exp $ +$NetBSD: distinfo,v 1.43 2016/03/15 14:40:03 mef Exp $ -SHA1 (fldigi-3.23.07.tar.gz) = 7ab69ec0c92912fd7dbb127f6d48e0bac4d9ee11 -RMD160 (fldigi-3.23.07.tar.gz) = 8dd57ead8c514025c940c58b2005a7115b134348 -SHA512 (fldigi-3.23.07.tar.gz) = e307dca63d2900087f355b342cd02fda62c80b03a2f3e4a20561174b3fc39b423181305d15b30d3445b3cd3613894402ce6b8727b8c0220268566612c1296441 -Size (fldigi-3.23.07.tar.gz) = 2976157 bytes +SHA1 (fldigi-3.23.08.tar.gz) = 1c179b520c45497e13ea483f56fba2d8d92a9062 +RMD160 (fldigi-3.23.08.tar.gz) = e1fa34ab16323072869d0973aa58c254fae90300 +SHA512 (fldigi-3.23.08.tar.gz) = 31e38f7f8b80dc348bb2e81b499fb800a2289153b2d2987755c49f933b939b0a0c9c68c68636d73f3595f83a12529d5a1bdbb24935e92482f424607c8c95d68f +Size (fldigi-3.23.08.tar.gz) = 2990508 bytes SHA1 (patch-src_dominoex_dominoex.cxx) = 4c9a36896ee18562c2dee044f61301abde4f9a30 -SHA1 (patch-src_fsq_fsq.cxx) = 6c9aa1b7c28bbc8218b471794e5a670005cfc795 -SHA1 (patch-src_ifkp_ifkp.cxx) = 22ce623ca24491a6ea9efb063851b1f04b7a7317 SHA1 (patch-src_include_qrunner.h) = c395684f676bcd06e0d0f8a95a9c22dc92667879 SHA1 (patch-src_misc_configuration.cxx) = 4ebf0c46913f73047ad5b858f6d4ae9def82ec60 SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c diff --git a/ham/fldigi/patches/patch-src_fsq_fsq.cxx b/ham/fldigi/patches/patch-src_fsq_fsq.cxx deleted file mode 100644 index 148dc0185f247..0000000000000 --- a/ham/fldigi/patches/patch-src_fsq_fsq.cxx +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-src_fsq_fsq.cxx,v 1.4 2015/11/20 14:29:17 joerg Exp $ - -Resolve conflict between std::next and the local variable of the same name. -std::complex::imag() and std::complex::real() are not lvalues. - ---- src/fsq/fsq.cxx.orig 2015-09-28 18:24:41.000000000 +0000 -+++ src/fsq/fsq.cxx -@@ -1195,9 +1195,12 @@ int fsq::rx_process(const double *buf, i - &rx_stream[SHIFT_SIZE], // from - BLOCK_SIZE*sizeof(*rx_stream)); // # bytes - memset(fft_data, 0, sizeof(fft_data)); -- for (int i = 0; i < BLOCK_SIZE; i++) -- fft_data[i].real() = fft_data[i].imag() = -- rx_stream[i] * a_blackman[i]; -+ for (int i = 0; i < BLOCK_SIZE; i++) { -+ double r = rx_stream[i] * a_blackman[i]; -+ fft_data[i].real(r); -+ fft_data[i].imag(r); -+ } -+ - fft->ComplexFFT(fft_data); - process_tones(); - } -@@ -1426,7 +1429,7 @@ static string tx_text_queue = ""; - - static vector commands; - #define NUMCOMMANDS 10 --static size_t next = 0; -+static size_t nextidx = 0; - - void clear_xmt_arrays() - { -@@ -1450,9 +1453,9 @@ double fsq_xmtdelay() // in seconds - void fsq_repeat_last_command() - { - fsq_tx_text->clear(); -- fsq_tx_text->addstr(sz2utf8(commands[next].c_str())); -- next++; -- if (next == commands.size()) next = 0; -+ fsq_tx_text->addstr(sz2utf8(commands[nextidx].c_str())); -+ nextidx++; -+ if (nextidx == commands.size()) nextidx = 0; - } - - int get_fsq_tx_char(void) -@@ -1494,7 +1497,7 @@ void try_transmit(void *) - if (active_modem != fsq_modem) return; - - if (!active_modem->fsq_squelch_open() && trx_state == STATE_RX) { -- next = 0; -+ nextidx = 0; - fsq_que_clear(); - //LOG_WARN("%s", "start_tx()"); - start_tx(); diff --git a/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx b/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx deleted file mode 100644 index 87693bd8f1f96..0000000000000 --- a/ham/fldigi/patches/patch-src_ifkp_ifkp.cxx +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-src_ifkp_ifkp.cxx,v 1.1 2015/11/03 19:03:27 joerg Exp $ - -std::complex::imag() and std::complex::real() are not lvalues. - ---- src/ifkp/ifkp.cxx.orig 2015-10-25 14:22:27.000000000 +0000 -+++ src/ifkp/ifkp.cxx -@@ -580,9 +580,11 @@ int ifkp::rx_process(const double *buf, - &rx_stream[IFKP_SHIFT_SIZE], // from - IFKP_BLOCK_SIZE*sizeof(*rx_stream)); // # bytes - memset(fft_data, 0, sizeof(fft_data)); -- for (int i = 0; i < IFKP_BLOCK_SIZE; i++) -- fft_data[i].real() = fft_data[i].imag() = -- rx_stream[i] * a_blackman[i]; -+ for (int i = 0; i < IFKP_BLOCK_SIZE; i++) { -+ double r = rx_stream[i] * a_blackman[i]; -+ fft_data[i].real(r); -+ fft_data[i].imag(r); -+ } - fft->ComplexFFT(fft_data); - process_tones(); - } From d8f7daa11f601149d096d64e44a33534e65a1a8f Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:40:07 +0000 Subject: [PATCH 0138/2457] Note update of net/ruby-dnsruby package to 1.59.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index e7893f8a7eb56..5a9051d9ebb91 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1185 2016/03/15 14:39:04 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1186 2016/03/15 14:40:07 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1575,3 +1575,4 @@ Changes to the packages collection and infrastructure in 2016: Updated misc/ruby-ohai to 8.12.0 [taca 2016-03-15] Updated misc/ruby-parallel to 1.6.2 [taca 2016-03-15] Updated misc/ruby-rainbow to 2.1.0 [taca 2016-03-15] + Updated net/ruby-dnsruby to 1.59.2 [taca 2016-03-15] From acb4e4a16ba4a6c560c36e8db4dd0f31b155ea74 Mon Sep 17 00:00:00 2001 From: mef Date: Tue, 15 Mar 2016 14:40:46 +0000 Subject: [PATCH 0139/2457] Updated ham/fldigi to 3.23.08 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 5a9051d9ebb91..da3b36d627488 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1186 2016/03/15 14:40:07 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1187 2016/03/15 14:40:46 mef Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1576,3 +1576,4 @@ Changes to the packages collection and infrastructure in 2016: Updated misc/ruby-parallel to 1.6.2 [taca 2016-03-15] Updated misc/ruby-rainbow to 2.1.0 [taca 2016-03-15] Updated net/ruby-dnsruby to 1.59.2 [taca 2016-03-15] + Updated ham/fldigi to 3.23.08 [mef 2016-03-15] From 230355dec18123f16064f85071c0fa04ee20a4fb Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:42:33 +0000 Subject: [PATCH 0140/2457] Update ruby-domain_name to 0.5.20160309. * Use the date as part of version. * Update the eTLD database to 2016-03-09T09:52:02Z. --- net/ruby-domain_name/Makefile | 4 ++-- net/ruby-domain_name/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/ruby-domain_name/Makefile b/net/ruby-domain_name/Makefile index 7c65c9b0de3eb..0bc7ec180d882 100644 --- a/net/ruby-domain_name/Makefile +++ b/net/ruby-domain_name/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2015/12/12 15:06:17 taca Exp $ +# $NetBSD: Makefile,v 1.13 2016/03/15 14:42:33 taca Exp $ -DISTNAME= domain_name-0.5.25 +DISTNAME= domain_name-0.5.20160309 CATEGORIES= net MAINTAINER= minskim@NetBSD.org diff --git a/net/ruby-domain_name/distinfo b/net/ruby-domain_name/distinfo index 73567d96eb1af..a5a87f095bbea 100644 --- a/net/ruby-domain_name/distinfo +++ b/net/ruby-domain_name/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2015/12/12 15:06:17 taca Exp $ +$NetBSD: distinfo,v 1.13 2016/03/15 14:42:33 taca Exp $ -SHA1 (domain_name-0.5.25.gem) = 56472cfb1401b44c685c7d21247d5bfc0e05ed57 -RMD160 (domain_name-0.5.25.gem) = ead49303a5cdb50f1116600d66dedadbb9d1528b -SHA512 (domain_name-0.5.25.gem) = cdc89ef2cc93d014727e203ffaa3921f3548077bcf4dfacc83a03f887a88393cea01efcf072ca785b375a6b24cdbd69f201f2fbd81a7341595e6ed2a5d2b362c -Size (domain_name-0.5.25.gem) = 112128 bytes +SHA1 (domain_name-0.5.20160309.gem) = 1100b6907e42f07229bb2f6477d2df97dfdc60b2 +RMD160 (domain_name-0.5.20160309.gem) = 5f361b2edefeb18e5906f6fa0bf7cd56e68ceec0 +SHA512 (domain_name-0.5.20160309.gem) = e9a9e87fbe8f1e1ee6b14122683593737d7f8efb99f0acd38f3324adecda5a4e8ef72f9c449939fce59ca093ce33daaaea531b9916f151047f393b7d03d56fdb +Size (domain_name-0.5.20160309.gem) = 113664 bytes From 559d3383e8fa59c02feee62261cb06ff0e52dc27 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:43:10 +0000 Subject: [PATCH 0141/2457] Note update of net/ruby-domain_name package to 0.5.20160309. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index da3b36d627488..133d5af92c996 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1187 2016/03/15 14:40:46 mef Exp $ +$NetBSD: CHANGES-2016,v 1.1188 2016/03/15 14:43:10 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1577,3 +1577,4 @@ Changes to the packages collection and infrastructure in 2016: Updated misc/ruby-rainbow to 2.1.0 [taca 2016-03-15] Updated net/ruby-dnsruby to 1.59.2 [taca 2016-03-15] Updated ham/fldigi to 3.23.08 [mef 2016-03-15] + Updated net/ruby-domain_name to 0.5.20160309 [taca 2016-03-15] From e18f85f14070f34a0ac03c4809ad210170f63237 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:45:40 +0000 Subject: [PATCH 0142/2457] Update ruby-ipaddress to 0.8.3. ipaddress 0.8.2 CHANGED merged bundler branch to cleanup gemspec and Rakefiles FIXED IPAddress::IPv4.split handling (Issue #40) NEW Added #[]= method to IPv4/6 classes to add octet writing support. (Issue #24) NEW IPV4#multicast? NEW IPV4#loopback? NEW IPV4#to() --- net/ruby-ipaddress/Makefile | 4 ++-- net/ruby-ipaddress/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/ruby-ipaddress/Makefile b/net/ruby-ipaddress/Makefile index 07f84255d3317..120fc03226e46 100644 --- a/net/ruby-ipaddress/Makefile +++ b/net/ruby-ipaddress/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2016/01/06 15:32:08 taca Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/15 14:45:40 taca Exp $ -DISTNAME= ipaddress-0.8.2 +DISTNAME= ipaddress-0.8.3 CATEGORIES= net MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/net/ruby-ipaddress/distinfo b/net/ruby-ipaddress/distinfo index 5090aa8fe25dc..14c8f3b00479a 100644 --- a/net/ruby-ipaddress/distinfo +++ b/net/ruby-ipaddress/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2016/01/06 15:32:08 taca Exp $ +$NetBSD: distinfo,v 1.4 2016/03/15 14:45:40 taca Exp $ -SHA1 (ipaddress-0.8.2.gem) = 5f824ef31c651453b7d6606df58b8aefcade7941 -RMD160 (ipaddress-0.8.2.gem) = 94c80d9c436002410a3800ca86afc324e3ac4b84 -SHA512 (ipaddress-0.8.2.gem) = 52ec206764f54f977f2e44c4d2c22e3616973f64570f3f8f9f215ffe3a05512722c9c9eb074101891ba061ac3762ffeb2887db653519ae16d8a1cd6fb1914304 -Size (ipaddress-0.8.2.gem) = 38400 bytes +SHA1 (ipaddress-0.8.3.gem) = 4451c0877d08c012546c4dde9d7603b5bc326ae2 +RMD160 (ipaddress-0.8.3.gem) = f5d76e3419d395463752ca40a1d19a72b95d93a0 +SHA512 (ipaddress-0.8.3.gem) = 898f20bd2883b64a678570a79891231857559ad402bdb5c987b1f117749f9f063a41d1482c58eeb10fe2285475201e6f14f48b8a2fa6ee0b46dcd4de9af57695 +Size (ipaddress-0.8.3.gem) = 38400 bytes From 7a54565f482ae4ac9fcf11331e47863464432e65 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:46:10 +0000 Subject: [PATCH 0143/2457] Note update of net/ruby-ipaddress package to 0.8.3. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 133d5af92c996..776fcd71f2b12 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1188 2016/03/15 14:43:10 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1189 2016/03/15 14:46:10 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1578,3 +1578,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/ruby-dnsruby to 1.59.2 [taca 2016-03-15] Updated ham/fldigi to 3.23.08 [mef 2016-03-15] Updated net/ruby-domain_name to 0.5.20160309 [taca 2016-03-15] + Updated net/ruby-ipaddress to 0.8.3 [taca 2016-03-15] From 509b0b6091f9b68f9a2ac50f5a8dda420036dbf8 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:46:51 +0000 Subject: [PATCH 0144/2457] Update ruby-net-ldap to 0.14.0. === Net::LDAP 0.14.0 * Normalize the encryption parameter passed to the LDAP constructor {#264}[https://github.com/ruby-ldap/ruby-net-ldap/pull/264] * Update Docs: Net::LDAP now requires ruby >= 2 {#261}[https://github.com/ruby-ldap/ruby-net-ldap/pull/261] * fix symbol proc {#255}[https://github.com/ruby-ldap/ruby-net-ldap/pull/255] * fix trailing commas {#256}[https://github.com/ruby-ldap/ruby-net-ldap/pull/256] * fix deprecated hash methods {#254}[https://github.com/ruby-ldap/ruby-net-ldap/pull/254] * fix space after comma {#253}[https://github.com/ruby-ldap/ruby-net-ldap/pull/253] * fix space inside brackets {#252}[https://github.com/ruby-ldap/ruby-net-ldap/pull/252] * Rubocop style fixes {#249}[https://github.com/ruby-ldap/ruby-net-ldap/pull/249] * Lazy initialize Net::LDAP::Connection's internal socket {#235}[https://github.com/ruby-ldap/ruby-net-ldap/pull/235] * Support for rfc3062 Password Modify, closes #163 {#178}[https://github.com/ruby-ldap/ruby-net-ldap/pull/178] --- net/ruby-net-ldap/Makefile | 4 ++-- net/ruby-net-ldap/PLIST | 3 ++- net/ruby-net-ldap/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/net/ruby-net-ldap/Makefile b/net/ruby-net-ldap/Makefile index a9db4cedd7dc0..af0cd8810c422 100644 --- a/net/ruby-net-ldap/Makefile +++ b/net/ruby-net-ldap/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2016/01/11 16:08:51 taca Exp $ +# $NetBSD: Makefile,v 1.7 2016/03/15 14:46:51 taca Exp $ -DISTNAME= net-ldap-0.13.0 +DISTNAME= net-ldap-0.14.0 CATEGORIES= net MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/net/ruby-net-ldap/PLIST b/net/ruby-net-ldap/PLIST index 9f0b56f402496..72cbb6ac71dda 100644 --- a/net/ruby-net-ldap/PLIST +++ b/net/ruby-net-ldap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2015/12/12 15:09:39 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/03/15 14:46:51 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.gitignore ${GEM_LIBDIR}/.rubocop.yml @@ -55,6 +55,7 @@ ${GEM_LIBDIR}/test/integration/test_ber.rb ${GEM_LIBDIR}/test/integration/test_bind.rb ${GEM_LIBDIR}/test/integration/test_delete.rb ${GEM_LIBDIR}/test/integration/test_open.rb +${GEM_LIBDIR}/test/integration/test_password_modify.rb ${GEM_LIBDIR}/test/integration/test_return_codes.rb ${GEM_LIBDIR}/test/integration/test_search.rb ${GEM_LIBDIR}/test/support/vm/openldap/.gitignore diff --git a/net/ruby-net-ldap/distinfo b/net/ruby-net-ldap/distinfo index 74b2fff7abe57..0fca277c38538 100644 --- a/net/ruby-net-ldap/distinfo +++ b/net/ruby-net-ldap/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2016/01/11 16:08:51 taca Exp $ +$NetBSD: distinfo,v 1.7 2016/03/15 14:46:51 taca Exp $ -SHA1 (net-ldap-0.13.0.gem) = 55cc359b44df71d0e279ad6ac0e5b766b3ec12c4 -RMD160 (net-ldap-0.13.0.gem) = 865230eb714d34266a3d4457ff52793171ac1e6e -SHA512 (net-ldap-0.13.0.gem) = 1033bfd6b072d7448e35f85ba295c6c1eabd38c53f12a23b870c7f99cbed4580499d3b77913b7a9571645b501b73ff728c1e8df2ee7cc341cdbf3e143a1a8059 -Size (net-ldap-0.13.0.gem) = 91136 bytes +SHA1 (net-ldap-0.14.0.gem) = 453a90f209363ee56d86f2cfc386b1406119e920 +RMD160 (net-ldap-0.14.0.gem) = e790ad35a7a1eb86be7bd8b1ea6f262b2a54faf3 +SHA512 (net-ldap-0.14.0.gem) = 313040d6dd7d450377b246ac134416a3c21bfed95c3d900fe542d3a92fd3c2e5801d7bf2e4cfcde4ba15c3195a36168ce6b6bdc68282c19fde13dbae03c019a0 +Size (net-ldap-0.14.0.gem) = 94208 bytes From a1b400ccdd2c220c061dcb1062534002477221bb Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:47:21 +0000 Subject: [PATCH 0145/2457] Note update of net/ruby-net-ldap package to 0.14.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 776fcd71f2b12..fe2ef8b506ba9 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1189 2016/03/15 14:46:10 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1190 2016/03/15 14:47:21 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1579,3 +1579,4 @@ Changes to the packages collection and infrastructure in 2016: Updated ham/fldigi to 3.23.08 [mef 2016-03-15] Updated net/ruby-domain_name to 0.5.20160309 [taca 2016-03-15] Updated net/ruby-ipaddress to 0.8.3 [taca 2016-03-15] + Updated net/ruby-net-ldap to 0.14.0 [taca 2016-03-15] From 9d426302c8ab75c692f77b25280f8724cda2d497 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:48:09 +0000 Subject: [PATCH 0146/2457] Update ruby-netaddr to 1.5.1. ====1.5.1 ===Changes * fixed bug with NetAddr#merge (credit to Daniel Boughton) --- net/ruby-netaddr/Makefile | 5 ++--- net/ruby-netaddr/PLIST | 15 ++++++++------- net/ruby-netaddr/distinfo | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/net/ruby-netaddr/Makefile b/net/ruby-netaddr/Makefile index b135a5bbb7c99..e226822ad3d9f 100644 --- a/net/ruby-netaddr/Makefile +++ b/net/ruby-netaddr/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2010/09/10 07:37:47 taca Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/15 14:48:09 taca Exp $ -DISTNAME= netaddr-1.5.0 -#PKGREVISION= 1 +DISTNAME= netaddr-1.5.1 CATEGORIES= net MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/net/ruby-netaddr/PLIST b/net/ruby-netaddr/PLIST index 5c10ca751c6ca..c7728af2e3ce0 100644 --- a/net/ruby-netaddr/PLIST +++ b/net/ruby-netaddr/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:09:42 joerg Exp $ -${GEM_HOME}/cache/netaddr-${PKGVERSION}.gem +@comment $NetBSD: PLIST,v 1.3 2016/03/15 14:48:09 taca Exp $ +${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/Errors ${GEM_LIBDIR}/README ${GEM_LIBDIR}/changelog @@ -11,8 +11,9 @@ ${GEM_LIBDIR}/lib/methods.rb ${GEM_LIBDIR}/lib/netaddr.rb ${GEM_LIBDIR}/lib/tree.rb ${GEM_LIBDIR}/lib/validation_shortcuts.rb -${GEM_LIBDIR}/tests/cidr_test.rb -${GEM_LIBDIR}/tests/eui_test.rb -${GEM_LIBDIR}/tests/methods_test.rb -${GEM_LIBDIR}/tests/tree_test.rb -${GEM_HOME}/specifications/netaddr-${PKGVERSION}.gemspec +${GEM_LIBDIR}/license +${GEM_LIBDIR}/test/cidr_test.rb +${GEM_LIBDIR}/test/eui_test.rb +${GEM_LIBDIR}/test/methods_test.rb +${GEM_LIBDIR}/test/tree_test.rb +${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/net/ruby-netaddr/distinfo b/net/ruby-netaddr/distinfo index 2a0994711e89c..316345eb01c89 100644 --- a/net/ruby-netaddr/distinfo +++ b/net/ruby-netaddr/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 00:35:35 agc Exp $ +$NetBSD: distinfo,v 1.4 2016/03/15 14:48:09 taca Exp $ -SHA1 (netaddr-1.5.0.gem) = d8c11f3509273ed62e497e84099fd6069b64fccb -RMD160 (netaddr-1.5.0.gem) = 0edc1cb72b82e627633fbcd3f91f6ee90be8a04e -SHA512 (netaddr-1.5.0.gem) = 220b6784cce69f41cf3e76afa4e3226281af20df01d2be4f83c45b53c7ec52c56e2b78a901bbcbef0f631deabf52c2062bec561bd25401bb4bdec951995a03e9 -Size (netaddr-1.5.0.gem) = 40448 bytes +SHA1 (netaddr-1.5.1.gem) = abd1b92e3f7743496633583e643ce227836d0ae0 +RMD160 (netaddr-1.5.1.gem) = 3372fa3fbcf92befc2051516192746a68e85b151 +SHA512 (netaddr-1.5.1.gem) = 2ecf712c21d1a8d42a350e4328a20736a81211bf4c068e740074fa0e06193add1d6097fa8dd4080727157af76f264a5c33eb32309f33ee086067f3c587c90ffd +Size (netaddr-1.5.1.gem) = 41472 bytes From 6ef96925aa4eb0756bd4f29c629216cd44b94da4 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:48:33 +0000 Subject: [PATCH 0147/2457] Note update of net/ruby-netaddr package to 1.5.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index fe2ef8b506ba9..85518b47d5009 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1190 2016/03/15 14:47:21 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1191 2016/03/15 14:48:33 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1580,3 +1580,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/ruby-domain_name to 0.5.20160309 [taca 2016-03-15] Updated net/ruby-ipaddress to 0.8.3 [taca 2016-03-15] Updated net/ruby-net-ldap to 0.14.0 [taca 2016-03-15] + Updated net/ruby-netaddr to 1.5.1 [taca 2016-03-15] From 8846cdc4b5e47e9fcd7b09a30c0539e5a5000c3c Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:55:21 +0000 Subject: [PATCH 0148/2457] Update ruby-twitter-text to 1.13.4. * Use RegEx literal instead of String literal * Use regex literals instead of string literals for char class ranges that might get minized and decomposed * added FULLWIDTH TILDE U+FF5E as a valid hashtag special character * added WAVE DASH U+301C as a valid hashtag special character * Ignore Emojified # or keycap # when scanning for hashtags * Support Cyrillic characters in URLs path section * Version in bower file is deprecated, rely solely on git tag * also add a bower badge and removed old repo list * Update bower.json * update tlds and forward exit code from rake tests * add desc, license and fix source_files for podfile --- net/ruby-twitter-text/Makefile | 4 ++-- net/ruby-twitter-text/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/ruby-twitter-text/Makefile b/net/ruby-twitter-text/Makefile index f854fa2d9dbc3..b7739a5a63cfa 100644 --- a/net/ruby-twitter-text/Makefile +++ b/net/ruby-twitter-text/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2016/01/09 18:55:29 tsutsui Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/15 14:55:21 taca Exp $ -DISTNAME= twitter-text-1.13.0 +DISTNAME= twitter-text-1.13.4 CATEGORIES= net MAINTAINER= tsutsui@NetBSD.org diff --git a/net/ruby-twitter-text/distinfo b/net/ruby-twitter-text/distinfo index fd2cba24fadae..e06aa1e88562e 100644 --- a/net/ruby-twitter-text/distinfo +++ b/net/ruby-twitter-text/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2016/01/09 18:55:29 tsutsui Exp $ +$NetBSD: distinfo,v 1.2 2016/03/15 14:55:21 taca Exp $ -SHA1 (twitter-text-1.13.0.gem) = d7ad699b8eccf71a2761cda200fe93ca9439cdb4 -RMD160 (twitter-text-1.13.0.gem) = 273e7e1682ab6144f6e28b2c2a566a456e2ded56 -SHA512 (twitter-text-1.13.0.gem) = bfd4315e827149a6a7c34ad26fe6026fd17ebca39557edbab0dfe59380f14528f927c7b9332f28e24cf6a12e00b703b9edb94122fae60757f179f1a71a0e2ea7 -Size (twitter-text-1.13.0.gem) = 44544 bytes +SHA1 (twitter-text-1.13.4.gem) = c6f2c56b8a13de443c7cbabbf34c2f92b9f293df +RMD160 (twitter-text-1.13.4.gem) = 0e64305d6147ae16bd6666c746cdf6b1b44cdeef +SHA512 (twitter-text-1.13.4.gem) = e865246c41659a9479958e715c971cacb83e0787dc541b57154084dfd853b1fc72705bb71d50d58afe1d6ea62ff684b356d22d20065d4595f7c6f5fe65dca997 +Size (twitter-text-1.13.4.gem) = 44544 bytes From 8b0b9e454016b8c910db7a96580711d0681a91c9 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:56:08 +0000 Subject: [PATCH 0149/2457] Note update of net/ruby-twitter-text package to 1.13.4. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 85518b47d5009..bec57c49ad1ef 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1191 2016/03/15 14:48:33 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1192 2016/03/15 14:56:08 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1581,3 +1581,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/ruby-ipaddress to 0.8.3 [taca 2016-03-15] Updated net/ruby-net-ldap to 0.14.0 [taca 2016-03-15] Updated net/ruby-netaddr to 1.5.1 [taca 2016-03-15] + Updated net/ruby-twitter-text to 1.13.4 [taca 2016-03-15] From a3f9d407c1937ef448e91690d4d7b7bda339acc5 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 14:59:59 +0000 Subject: [PATCH 0150/2457] Update ruby-pdf-core to 0.6.1. Changes are not available. --- print/ruby-pdf-core/Makefile | 4 ++-- print/ruby-pdf-core/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/print/ruby-pdf-core/Makefile b/print/ruby-pdf-core/Makefile index e6752136fe84c..dc4c996de644d 100644 --- a/print/ruby-pdf-core/Makefile +++ b/print/ruby-pdf-core/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2015/09/13 15:09:50 taca Exp $ +# $NetBSD: Makefile,v 1.7 2016/03/15 14:59:59 taca Exp $ -DISTNAME= pdf-core-0.6.0 +DISTNAME= pdf-core-0.6.1 CATEGORIES= print MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/print/ruby-pdf-core/distinfo b/print/ruby-pdf-core/distinfo index 56e4c89c1cea1..efe1e3e8854b7 100644 --- a/print/ruby-pdf-core/distinfo +++ b/print/ruby-pdf-core/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 01:01:39 agc Exp $ +$NetBSD: distinfo,v 1.6 2016/03/15 14:59:59 taca Exp $ -SHA1 (pdf-core-0.6.0.gem) = 3d13f388dcfdc2ab20c32ce8d95b455775c3d7e4 -RMD160 (pdf-core-0.6.0.gem) = 18f76bd9aa0e85b01e212d00658c46d456e38529 -SHA512 (pdf-core-0.6.0.gem) = a6090a17aa570d12b18e501cc6b9f2cfbec30cd497ba7bbf63cc2d13136635c67db906fe1c04caa3a52b5d31008708e9c433872d95bed5742c517028670252c2 -Size (pdf-core-0.6.0.gem) = 43008 bytes +SHA1 (pdf-core-0.6.1.gem) = 1e2868d0969f308e5d0c02c6320f68e8ebe53baa +RMD160 (pdf-core-0.6.1.gem) = d51cda1bfaff6c452971a4489ac802f7382291a4 +SHA512 (pdf-core-0.6.1.gem) = dc9074658cb4037fc1ab4f51a19bd67396c31ef18ac5c89e94563711eced8a7a6ec642e907564c92453cac08cd7a09f6da6f6da87536475cce8238cef087467a +Size (pdf-core-0.6.1.gem) = 43008 bytes From d869c2e157d31807402f35adb4a7d2fd872c0402 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:00:29 +0000 Subject: [PATCH 0151/2457] Note update of print/ruby-pdf-core package to 0.6.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index bec57c49ad1ef..04de5ae67d7d8 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1192 2016/03/15 14:56:08 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1193 2016/03/15 15:00:29 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1582,3 +1582,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/ruby-net-ldap to 0.14.0 [taca 2016-03-15] Updated net/ruby-netaddr to 1.5.1 [taca 2016-03-15] Updated net/ruby-twitter-text to 1.13.4 [taca 2016-03-15] + Updated print/ruby-pdf-core to 0.6.1 [taca 2016-03-15] From 3c9aabb10e3977f1f84d4bf717453418df9fcedc Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:01:16 +0000 Subject: [PATCH 0152/2457] Upadte ruby-pdf-reader to 1.4.0. v1.4.0 (22nd February 2016) - raise minimum ruby version to 1.9.3 - print warnings to stderr when deprecated methods are used. These methods have been deprecated for 4 years, so hopefully few people are depending on them - Fix exception when a npn-breakng space (character 160) is used with a built-in fint (helvetica, etc) - various bug fixes --- print/ruby-pdf-reader/Makefile | 7 +++---- print/ruby-pdf-reader/PLIST | 3 ++- print/ruby-pdf-reader/distinfo | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/print/ruby-pdf-reader/Makefile b/print/ruby-pdf-reader/Makefile index f43d6ceaebc57..e15146ce37967 100644 --- a/print/ruby-pdf-reader/Makefile +++ b/print/ruby-pdf-reader/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2015/06/08 16:02:54 taca Exp $ +# $NetBSD: Makefile,v 1.14 2016/03/15 15:01:16 taca Exp $ -DISTNAME= pdf-reader-1.3.3 -PKGREVISION= 1 +DISTNAME= pdf-reader-1.4.0 CATEGORIES= print MAINTAINER= pkgsrc-users@NetBSD.org @@ -12,7 +11,7 @@ LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-Ascii85>=1.0.0<1.1:../../converters/ruby-Ascii85 DEPENDS+= ${RUBY_PKGPREFIX}-rc4>=0:../../security/ruby-rc4 DEPENDS+= ${RUBY_PKGPREFIX}-hashery>=2.0<3:../../devel/ruby-hashery -DEPENDS+= ${RUBY_PKGPREFIX}-afm>=0.2.0<0.3:../../fonts/ruby-afm +DEPENDS+= ${RUBY_PKGPREFIX}-afm>=0.2.1<0.3:../../fonts/ruby-afm DEPENDS+= ${RUBY_PKGPREFIX}-ttfunk>=0:../../fonts/ruby-ttfunk USE_LANGUAGES= # none diff --git a/print/ruby-pdf-reader/PLIST b/print/ruby-pdf-reader/PLIST index afcf02812bebf..0f2a7a0c5a468 100644 --- a/print/ruby-pdf-reader/PLIST +++ b/print/ruby-pdf-reader/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2015/06/08 16:02:54 taca Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/03/15 15:01:16 taca Exp $ bin/pdf_callbacks${RUBY_SUFFIX} bin/pdf_list_callbacks${RUBY_SUFFIX} bin/pdf_object${RUBY_SUFFIX} @@ -71,6 +71,7 @@ ${GEM_LIBDIR}/lib/pdf/reader/metadata_strategy.rb ${GEM_LIBDIR}/lib/pdf/reader/object_cache.rb ${GEM_LIBDIR}/lib/pdf/reader/object_hash.rb ${GEM_LIBDIR}/lib/pdf/reader/object_stream.rb +${GEM_LIBDIR}/lib/pdf/reader/orientation_detector.rb ${GEM_LIBDIR}/lib/pdf/reader/page.rb ${GEM_LIBDIR}/lib/pdf/reader/page_layout.rb ${GEM_LIBDIR}/lib/pdf/reader/page_state.rb diff --git a/print/ruby-pdf-reader/distinfo b/print/ruby-pdf-reader/distinfo index b84b064d0a58b..cc70577b95cc3 100644 --- a/print/ruby-pdf-reader/distinfo +++ b/print/ruby-pdf-reader/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2015/11/04 01:01:39 agc Exp $ +$NetBSD: distinfo,v 1.13 2016/03/15 15:01:16 taca Exp $ -SHA1 (pdf-reader-1.3.3.gem) = b46fb786926615d47a331015210a0745e8a1d5df -RMD160 (pdf-reader-1.3.3.gem) = d27d147959b5125e8fa975761aec0b290cbfdcc7 -SHA512 (pdf-reader-1.3.3.gem) = 79c1c1a809dc8162b85f628eac19a07776f58d47813a84255b026bc1ea881b78461beb8f5bb15d6bce4fc1a68d790742f1ae02c48861a04347267f4138f7b572 -Size (pdf-reader-1.3.3.gem) = 219648 bytes +SHA1 (pdf-reader-1.4.0.gem) = 5d3917dbaee63b5436aa3da83c5f2590466fc7f1 +RMD160 (pdf-reader-1.4.0.gem) = c26cead376e9e748728979b0c0e6ce32906e92d4 +SHA512 (pdf-reader-1.4.0.gem) = 893bd78e1f98b97e229fbf2c4cf1d93a50f43b3a6b92d293e8b6a4a24d3c1c9f1f20c9dfa8a02b558227b614032766b22b04e2105ab998734fb787e3ed950fa9 +Size (pdf-reader-1.4.0.gem) = 215040 bytes From b29c8077f2486f07350d5b3d62f987408022c22b Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:01:46 +0000 Subject: [PATCH 0153/2457] Note update of print/ruby-pdf-reader package to 1.4.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 04de5ae67d7d8..89d0ca5d47b06 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1193 2016/03/15 15:00:29 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1194 2016/03/15 15:01:46 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1583,3 +1583,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/ruby-netaddr to 1.5.1 [taca 2016-03-15] Updated net/ruby-twitter-text to 1.13.4 [taca 2016-03-15] Updated print/ruby-pdf-core to 0.6.1 [taca 2016-03-15] + Updated print/ruby-pdf-reader to 1.4.0 [taca 2016-03-15] From f7f3a51cd10ce8d1626b46ffd58ab4e4e9a89b88 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:05:36 +0000 Subject: [PATCH 0154/2457] Update ruby-prawn to 2.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PrawnPDF 2.1.0 – 2016-02-29 Added support for PNG images with indexed transparency Prawn now properly hadles transparency in PNG images with indexed color. (Maciej Mucha, #783; Alexander Mankuta, #920) Prawn no longer generates IRB warnings Fix a few issues with code style that were triggering warnings in IRB when run in verbose mode (irb -w). (Jesse Doyle, #914) Gradients applied inside transformations are now correctly positioned PDF gradients/patterns take coordinates in the coordinate space of the document, not the “user space”, so if you performed a scale/rotate/translate and then painted a gradient inside, it wasn't correctly positioned. This change tracks transformations applied to the document, and multiplies the gradient matrix with this tracked transformation matrix so that the gradient appears in the correct place in the document. Because this changes how the x and y coordinates are interpreted, you must manually add apply_transformations: true to your stroke_gradient and fill_gradient calls to use the fixed behaviour in Prawn 2. It is expected that this will be the default in Prawn 3. Please refer to the wiki page on this change for more information. (Roger Nesbitt, #891, #894) Prawn::Graphics::BlendMode#blend_mode added Blend modes can be used to change the way two layers are blended together. The BM key is added to the External Graphics State based on the v1.4 PDF spec. blend_mode accepts a single blend mode or array of blend modes. If an array is passed, the PDF viewer blends layers based on the first valid blend mode. --- print/ruby-prawn/Makefile | 4 ++-- print/ruby-prawn/PLIST | 16 ++++++++++++---- print/ruby-prawn/distinfo | 10 +++++----- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/print/ruby-prawn/Makefile b/print/ruby-prawn/Makefile index 205c49dd37da2..7369a0bcd8f20 100644 --- a/print/ruby-prawn/Makefile +++ b/print/ruby-prawn/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2015/12/30 04:23:00 taca Exp $ +# $NetBSD: Makefile,v 1.13 2016/03/15 15:05:36 taca Exp $ -DISTNAME= prawn-2.0.2 +DISTNAME= prawn-2.1.0 CATEGORIES= print MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/print/ruby-prawn/PLIST b/print/ruby-prawn/PLIST index 34f717e0a68f1..012b4938372d3 100644 --- a/print/ruby-prawn/PLIST +++ b/print/ruby-prawn/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2015/03/13 15:27:09 taca Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/03/15 15:05:36 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.yardopts ${GEM_LIBDIR}/COPYING @@ -27,6 +27,8 @@ ${GEM_LIBDIR}/data/images/16bit.color ${GEM_LIBDIR}/data/images/16bit.png ${GEM_LIBDIR}/data/images/arrow.png ${GEM_LIBDIR}/data/images/arrow2.png +${GEM_LIBDIR}/data/images/blend_modes_bottom_layer.jpg +${GEM_LIBDIR}/data/images/blend_modes_top_layer.jpg ${GEM_LIBDIR}/data/images/dice.alpha ${GEM_LIBDIR}/data/images/dice.color ${GEM_LIBDIR}/data/images/dice.png @@ -34,12 +36,14 @@ ${GEM_LIBDIR}/data/images/dice_interlaced.png ${GEM_LIBDIR}/data/images/fractal.jpg ${GEM_LIBDIR}/data/images/indexed_color.dat ${GEM_LIBDIR}/data/images/indexed_color.png +${GEM_LIBDIR}/data/images/indexed_transparency.png +${GEM_LIBDIR}/data/images/indexed_transparency_alpha.dat +${GEM_LIBDIR}/data/images/indexed_transparency_color.dat ${GEM_LIBDIR}/data/images/letterhead.jpg ${GEM_LIBDIR}/data/images/license.md ${GEM_LIBDIR}/data/images/page_white_text.alpha ${GEM_LIBDIR}/data/images/page_white_text.color ${GEM_LIBDIR}/data/images/page_white_text.png -${GEM_LIBDIR}/data/images/pal_bk.png ${GEM_LIBDIR}/data/images/pigs.jpg ${GEM_LIBDIR}/data/images/prawn.png ${GEM_LIBDIR}/data/images/ruport.png @@ -77,6 +81,7 @@ ${GEM_LIBDIR}/lib/prawn/font/dfont.rb ${GEM_LIBDIR}/lib/prawn/font/ttf.rb ${GEM_LIBDIR}/lib/prawn/font_metric_cache.rb ${GEM_LIBDIR}/lib/prawn/graphics.rb +${GEM_LIBDIR}/lib/prawn/graphics/blend_mode.rb ${GEM_LIBDIR}/lib/prawn/graphics/cap_style.rb ${GEM_LIBDIR}/lib/prawn/graphics/color.rb ${GEM_LIBDIR}/lib/prawn/graphics/dash.rb @@ -107,6 +112,7 @@ ${GEM_LIBDIR}/lib/prawn/text/formatted/fragment.rb ${GEM_LIBDIR}/lib/prawn/text/formatted/line_wrap.rb ${GEM_LIBDIR}/lib/prawn/text/formatted/parser.rb ${GEM_LIBDIR}/lib/prawn/text/formatted/wrap.rb +${GEM_LIBDIR}/lib/prawn/transformation_stack.rb ${GEM_LIBDIR}/lib/prawn/utilities.rb ${GEM_LIBDIR}/lib/prawn/version.rb ${GEM_LIBDIR}/lib/prawn/view.rb @@ -136,6 +142,7 @@ ${GEM_LIBDIR}/manual/document_and_page_options/page_margins.rb ${GEM_LIBDIR}/manual/document_and_page_options/page_size.rb ${GEM_LIBDIR}/manual/document_and_page_options/print_scaling.rb ${GEM_LIBDIR}/manual/example_helper.rb +${GEM_LIBDIR}/manual/graphics/blend_mode.rb ${GEM_LIBDIR}/manual/graphics/circle_and_ellipse.rb ${GEM_LIBDIR}/manual/graphics/color.rb ${GEM_LIBDIR}/manual/graphics/common_lines.rb @@ -210,15 +217,15 @@ ${GEM_LIBDIR}/manual/text/text_box_overflow.rb ${GEM_LIBDIR}/manual/text/utf8.rb ${GEM_LIBDIR}/manual/text/win_ansi_charset.rb ${GEM_LIBDIR}/prawn.gemspec -${GEM_LIBDIR}/spec/acceptance/png.rb +${GEM_LIBDIR}/spec/acceptance/png_spec.rb ${GEM_LIBDIR}/spec/annotations_spec.rb +${GEM_LIBDIR}/spec/blend_mode_spec.rb ${GEM_LIBDIR}/spec/bounding_box_spec.rb ${GEM_LIBDIR}/spec/column_box_spec.rb ${GEM_LIBDIR}/spec/data/curves.pdf ${GEM_LIBDIR}/spec/destinations_spec.rb ${GEM_LIBDIR}/spec/document_spec.rb ${GEM_LIBDIR}/spec/extensions/encoding_helpers.rb -${GEM_LIBDIR}/spec/extensions/mocha.rb ${GEM_LIBDIR}/spec/font_metric_cache_spec.rb ${GEM_LIBDIR}/spec/font_spec.rb ${GEM_LIBDIR}/spec/formatted_text_arranger_spec.rb @@ -248,6 +255,7 @@ ${GEM_LIBDIR}/spec/text_rendering_mode_spec.rb ${GEM_LIBDIR}/spec/text_spacing_spec.rb ${GEM_LIBDIR}/spec/text_spec.rb ${GEM_LIBDIR}/spec/text_with_inline_formatting_spec.rb +${GEM_LIBDIR}/spec/transformation_stack_spec.rb ${GEM_LIBDIR}/spec/transparency_spec.rb ${GEM_LIBDIR}/spec/view_spec.rb ${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/print/ruby-prawn/distinfo b/print/ruby-prawn/distinfo index fc81177655986..00718b160a5bd 100644 --- a/print/ruby-prawn/distinfo +++ b/print/ruby-prawn/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 01:01:39 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 15:05:36 taca Exp $ -SHA1 (prawn-2.0.2.gem) = e499815278e6ed758433de8b46d2d3d25955b651 -RMD160 (prawn-2.0.2.gem) = eb309133a625f89b6161072b60e9f76b13c3b61b -SHA512 (prawn-2.0.2.gem) = 4d79118545c87cf5fc1d44b43946e7ae686eeb91870542e72b388c0828831f53b020f9ae04aedf43c895d851e663c3d99ca84c115f129310a6defb242087eb3a -Size (prawn-2.0.2.gem) = 912896 bytes +SHA1 (prawn-2.1.0.gem) = 1789e502c8a92b053022d7a43ceef697df8bf79a +RMD160 (prawn-2.1.0.gem) = f1e7a262884ea9932e5e566a87aac3ab9b007fb8 +SHA512 (prawn-2.1.0.gem) = 9341e164ec66fe6cddd90c6c0bbabb680003eb57c005e44b08d47763d2568af2cfb47fd2e0bb302a7663d7108b1ca733cb6f1b18cbaea558a9fec7b97dba737a +Size (prawn-2.1.0.gem) = 1075712 bytes From 0425ee3ea1f1ef7c94c1c0c59bf098d6e13af0af Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:06:14 +0000 Subject: [PATCH 0155/2457] Note update of print/ruby-prawn package to 2.1.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 89d0ca5d47b06..d40a09f64235d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1194 2016/03/15 15:01:46 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1195 2016/03/15 15:06:14 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1584,3 +1584,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/ruby-twitter-text to 1.13.4 [taca 2016-03-15] Updated print/ruby-pdf-core to 0.6.1 [taca 2016-03-15] Updated print/ruby-pdf-reader to 1.4.0 [taca 2016-03-15] + Updated print/ruby-prawn to 2.1.0 [taca 2016-03-15] From 537463b164a23c6954db16751007a162e19d778e Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:07:02 +0000 Subject: [PATCH 0156/2457] Update ruby-bcrypt to 3.1.11. 3.1.11 Mar 06 2016 - Add support for Ruby 2.2 in compiled Windows binaries --- security/ruby-bcrypt/Makefile | 4 ++-- security/ruby-bcrypt/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/security/ruby-bcrypt/Makefile b/security/ruby-bcrypt/Makefile index 0b7bdbe669466..405280c6bd8d3 100644 --- a/security/ruby-bcrypt/Makefile +++ b/security/ruby-bcrypt/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2015/02/04 16:07:29 taca Exp $ +# $NetBSD: Makefile,v 1.8 2016/03/15 15:07:02 taca Exp $ -DISTNAME= bcrypt-3.1.10 +DISTNAME= bcrypt-3.1.11 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} CATEGORIES= security diff --git a/security/ruby-bcrypt/distinfo b/security/ruby-bcrypt/distinfo index c81dbafb523a5..c55a32e7a5df5 100644 --- a/security/ruby-bcrypt/distinfo +++ b/security/ruby-bcrypt/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 01:18:07 agc Exp $ +$NetBSD: distinfo,v 1.8 2016/03/15 15:07:02 taca Exp $ -SHA1 (bcrypt-3.1.10.gem) = 73a43c013aecb0992ed31f893c4d4680f3b29ed9 -RMD160 (bcrypt-3.1.10.gem) = 7b93b3b744ed5ed2f5a95536dff14f098d519db5 -SHA512 (bcrypt-3.1.10.gem) = 11e7a1ea28c53d22354abd3891b88c5f58bd8c18611a2964db69e56e5f9b819e5af184423fbd7fb2ebd1fb84b1618fbd043f0bfd62902515a07427846bef607a -Size (bcrypt-3.1.10.gem) = 44032 bytes +SHA1 (bcrypt-3.1.11.gem) = 91df9b316423f743ced80dd56fb570201701ab7d +RMD160 (bcrypt-3.1.11.gem) = 851556aeada8419af8f960075bb0424836d0c37a +SHA512 (bcrypt-3.1.11.gem) = bf9ff0d3cdd7044b4ee5796cd04869f21bb3384143b0f336bc2cd9a8f0db3f9562aa23a39601c1d86f153b62f07469ef066616f8a52cfcd840377e331cb22454 +Size (bcrypt-3.1.11.gem) = 44032 bytes From 1ed33397bb5ba7a435cd15b7c8d765eb03c833f6 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:07:40 +0000 Subject: [PATCH 0157/2457] Note update of security/ruby-bcrypt package to 3.1.11. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index d40a09f64235d..83b4d96457885 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1195 2016/03/15 15:06:14 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1196 2016/03/15 15:07:40 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1585,3 +1585,4 @@ Changes to the packages collection and infrastructure in 2016: Updated print/ruby-pdf-core to 0.6.1 [taca 2016-03-15] Updated print/ruby-pdf-reader to 1.4.0 [taca 2016-03-15] Updated print/ruby-prawn to 2.1.0 [taca 2016-03-15] + Updated security/ruby-bcrypt to 3.1.11 [taca 2016-03-15] From 68e72d33b314e1045b9484a537f4f5390c6c70d7 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:15:49 +0000 Subject: [PATCH 0158/2457] Update HOMEPAGE. Changes from 0.4.7 are too many to write here, please refer commit log: . --- security/ruby-oauth/Makefile | 6 +++--- security/ruby-oauth/PLIST | 25 +++++-------------------- security/ruby-oauth/distinfo | 10 +++++----- 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/security/ruby-oauth/Makefile b/security/ruby-oauth/Makefile index 4506545d780fa..71cbfaf7b385b 100644 --- a/security/ruby-oauth/Makefile +++ b/security/ruby-oauth/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2015/09/26 23:39:07 taca Exp $ +# $NetBSD: Makefile,v 1.13 2016/03/15 15:15:49 taca Exp $ -DISTNAME= oauth-0.4.7 +DISTNAME= oauth-0.5.1 CATEGORIES= security MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://oauth.rubyforge.org/ +HOMEPAGE= https://github.com/oauth-xx/oauth-ruby COMMENT= OAuth Core Ruby implementation LICENSE= mit diff --git a/security/ruby-oauth/PLIST b/security/ruby-oauth/PLIST index d539eca824c24..2a475a0a90538 100644 --- a/security/ruby-oauth/PLIST +++ b/security/ruby-oauth/PLIST @@ -1,17 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2014/03/17 14:29:28 taca Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/03/15 15:15:49 taca Exp $ bin/oauth${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem -${GEM_LIBDIR}/.gemtest -${GEM_LIBDIR}/Gemfile -${GEM_LIBDIR}/Gemfile.lock -${GEM_LIBDIR}/HISTORY ${GEM_LIBDIR}/LICENSE ${GEM_LIBDIR}/README.rdoc -${GEM_LIBDIR}/Rakefile ${GEM_LIBDIR}/TODO ${GEM_LIBDIR}/bin/oauth -${GEM_LIBDIR}/examples/yql.rb -${GEM_LIBDIR}/lib/digest/hmac.rb ${GEM_LIBDIR}/lib/oauth.rb ${GEM_LIBDIR}/lib/oauth/cli.rb ${GEM_LIBDIR}/lib/oauth/client.rb @@ -37,37 +30,27 @@ ${GEM_LIBDIR}/lib/oauth/request_proxy/jabber_request.rb ${GEM_LIBDIR}/lib/oauth/request_proxy/mock_request.rb ${GEM_LIBDIR}/lib/oauth/request_proxy/net_http.rb ${GEM_LIBDIR}/lib/oauth/request_proxy/rack_request.rb +${GEM_LIBDIR}/lib/oauth/request_proxy/rest_client_request.rb ${GEM_LIBDIR}/lib/oauth/request_proxy/typhoeus_request.rb ${GEM_LIBDIR}/lib/oauth/server.rb ${GEM_LIBDIR}/lib/oauth/signature.rb ${GEM_LIBDIR}/lib/oauth/signature/base.rb -${GEM_LIBDIR}/lib/oauth/signature/hmac/base.rb -${GEM_LIBDIR}/lib/oauth/signature/hmac/md5.rb -${GEM_LIBDIR}/lib/oauth/signature/hmac/rmd160.rb ${GEM_LIBDIR}/lib/oauth/signature/hmac/sha1.rb -${GEM_LIBDIR}/lib/oauth/signature/hmac/sha2.rb -${GEM_LIBDIR}/lib/oauth/signature/md5.rb ${GEM_LIBDIR}/lib/oauth/signature/plaintext.rb ${GEM_LIBDIR}/lib/oauth/signature/rsa/sha1.rb -${GEM_LIBDIR}/lib/oauth/signature/sha1.rb ${GEM_LIBDIR}/lib/oauth/token.rb ${GEM_LIBDIR}/lib/oauth/tokens/access_token.rb ${GEM_LIBDIR}/lib/oauth/tokens/consumer_token.rb ${GEM_LIBDIR}/lib/oauth/tokens/request_token.rb ${GEM_LIBDIR}/lib/oauth/tokens/server_token.rb ${GEM_LIBDIR}/lib/oauth/tokens/token.rb -${GEM_LIBDIR}/oauth.gemspec -${GEM_LIBDIR}/tasks/deployment.rake -${GEM_LIBDIR}/tasks/environment.rake -${GEM_LIBDIR}/tasks/website.rake +${GEM_LIBDIR}/lib/oauth/version.rb ${GEM_LIBDIR}/test/cases/oauth_case.rb ${GEM_LIBDIR}/test/cases/spec/1_0-final/test_construct_request_url.rb ${GEM_LIBDIR}/test/cases/spec/1_0-final/test_normalize_request_parameters.rb ${GEM_LIBDIR}/test/cases/spec/1_0-final/test_parameter_encodings.rb ${GEM_LIBDIR}/test/cases/spec/1_0-final/test_signature_base_strings.rb ${GEM_LIBDIR}/test/integration/consumer_test.rb -${GEM_LIBDIR}/test/keys/rsa.cert -${GEM_LIBDIR}/test/keys/rsa.pem ${GEM_LIBDIR}/test/test_access_token.rb ${GEM_LIBDIR}/test/test_action_controller_request_proxy.rb ${GEM_LIBDIR}/test/test_consumer.rb @@ -81,10 +64,12 @@ ${GEM_LIBDIR}/test/test_net_http_request_proxy.rb ${GEM_LIBDIR}/test/test_oauth_helper.rb ${GEM_LIBDIR}/test/test_rack_request_proxy.rb ${GEM_LIBDIR}/test/test_request_token.rb +${GEM_LIBDIR}/test/test_rest_client_request_proxy.rb ${GEM_LIBDIR}/test/test_rsa_sha1.rb ${GEM_LIBDIR}/test/test_server.rb ${GEM_LIBDIR}/test/test_signature.rb ${GEM_LIBDIR}/test/test_signature_base.rb +${GEM_LIBDIR}/test/test_signature_hmac_sha1.rb ${GEM_LIBDIR}/test/test_signature_plain_text.rb ${GEM_LIBDIR}/test/test_token.rb ${GEM_LIBDIR}/test/test_typhoeus_request_proxy.rb diff --git a/security/ruby-oauth/distinfo b/security/ruby-oauth/distinfo index d82e9bb09fadc..75d4323a12105 100644 --- a/security/ruby-oauth/distinfo +++ b/security/ruby-oauth/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2015/11/04 01:18:08 agc Exp $ +$NetBSD: distinfo,v 1.10 2016/03/15 15:15:49 taca Exp $ -SHA1 (oauth-0.4.7.gem) = 229c954590b3074fa13550a0ca56924579b262bc -RMD160 (oauth-0.4.7.gem) = 5859f629caa5b969ecee0e604f8d0f6a2203a0b4 -SHA512 (oauth-0.4.7.gem) = 7d8df61574aaf53ffcb206c6a210546c36b67b2c545d6b31afef2961ee135050923f427dc4720379b7689eef9d921015c26fedd8b11bbd13761dd498155fc550 -Size (oauth-0.4.7.gem) = 50688 bytes +SHA1 (oauth-0.5.1.gem) = 7f46a6840f84f6622e71895386c8b7a74f65ed9a +RMD160 (oauth-0.5.1.gem) = 1ad850b8133b2ec8793de579c9ea0484e2eeb242 +SHA512 (oauth-0.5.1.gem) = 8afa43c4cb8c606c37dd63c6a687f2aea54875fa67b8bcef04e529af9013625c86194e52aa53b54ff0bd2e4a0d64f00a044715c6672bc0529287586015702144 +Size (oauth-0.5.1.gem) = 43520 bytes From 9307b6dac4e3a4328d53abb8838815f497f51c29 Mon Sep 17 00:00:00 2001 From: mef Date: Tue, 15 Mar 2016 15:15:59 +0000 Subject: [PATCH 0159/2457] Import klayout-0.24.5 as cad/klayout. Although a comparatively simple piece of software, a layout viewer is not only just a tool for the chip design engineer. Today design's complexity require not only a simple "viewer". Rather, a viewer is the microscope through which the engineer looks at the design. There are numerous viewers available, but sadly there are not many which satisfy a few basic requirements. Most of them are commercial and expensive. If there is need for a simple, yet powerful viewer - here it is. --- cad/klayout/DESCR | 8 +++ cad/klayout/Makefile | 61 +++++++++++++++++++ cad/klayout/PLIST | 12 ++++ cad/klayout/distinfo | 10 +++ cad/klayout/patches/patch-build.sh | 19 ++++++ ...onfig_Makefile_conf_freebsd-32-gcc-release | 56 +++++++++++++++++ ...config_Makefile_conf_netbsd-32-gcc-release | 56 +++++++++++++++++ .../patches/patch-src_layApplication.cc | 16 +++++ 8 files changed, 238 insertions(+) create mode 100644 cad/klayout/DESCR create mode 100644 cad/klayout/Makefile create mode 100644 cad/klayout/PLIST create mode 100644 cad/klayout/distinfo create mode 100644 cad/klayout/patches/patch-build.sh create mode 100644 cad/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release create mode 100644 cad/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release create mode 100644 cad/klayout/patches/patch-src_layApplication.cc diff --git a/cad/klayout/DESCR b/cad/klayout/DESCR new file mode 100644 index 0000000000000..11f7fc09ce040 --- /dev/null +++ b/cad/klayout/DESCR @@ -0,0 +1,8 @@ + Although a comparatively simple piece of software, a layout viewer is not +only just a tool for the chip design engineer. Today design's complexity +require not only a simple "viewer". Rather, a viewer is the microscope +through which the engineer looks at the design. + +There are numerous viewers available, but sadly there are not many which +satisfy a few basic requirements. Most of them are commercial and +expensive. If there is need for a simple, yet powerful viewer - here it is. diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile new file mode 100644 index 0000000000000..79aa4bcf5a53a --- /dev/null +++ b/cad/klayout/Makefile @@ -0,0 +1,61 @@ +# $NetBSD: Makefile,v 1.1 2016/03/15 15:15:59 mef Exp $ + +DISTNAME= klayout-0.24.5 +CATEGORIES= cad +MASTER_SITES= http://www.klayout.org/downloads/ + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.klayout.org/downloads/ +COMMENT= Simple GDS and OASIS file viewer and Editor +LICENSE= gnu-gpl-v2 + +USE_LANGUAGES= c c++ +USE_TOOLS+= gmake + +CFLAGS+= -I${PREFIX}/include/python${PYVERSUFFIX} +NO_CONFIGURE= yes + +SUBST_CLASSES+= rpath +SUBST_MESSAGE.rpath= Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific config file +SUBST_FILES.rpath+= config/Makefile.conf.netbsd-32-gcc-release +SUBST_STAGE.rpath= post-patch +SUBST_VARS.rpath= COMPILER_RPATH_FLAG PREFIX +SUBST_SED.rpath= -e 's|@@LDFLAGS@@|${LDFLAGS}|' + +AUTO_MKDIRS= yes +INSTALL_BINDIR= ${DESTDIR}${PREFIX}/bin +INSTALL_LIBDIR= ${DESTDIR}${PREFIX}/lib +REL_DIR= build.netbsd-32-gcc-release + +OTHER_BIN= \ + strm2cif \ + strm2dxf \ + strm2gds \ + strm2gdstxt \ + strm2oas \ + strm2txt \ + strmclip \ + strmcmp \ + strmxor + +do-build: + (cd ${WRKSRC}; sh build.sh -python python${PYVERSSUFFIX} -qt ${PREFIX}/qt4) + +do-install: + (cd ${WRKSRC}; \ + pwd; \ + ${INSTALL_PROGRAM} ${REL_DIR}/main/klayout ${INSTALL_BINDIR}; \ + ${INSTALL_LIB} ${REL_DIR}/main/libklayout.so ${INSTALL_LIBDIR} ;\ + for bin in ${OTHER_BIN}; do \ + ${INSTALL_PROGRAM} ${REL_DIR}/main/$$bin ${INSTALL_BINDIR} ;\ + done ;\ + ${CHMOD} 755 ${INSTALL_BINDIR}/* ;\ + ) + +.include "../../lang/python/pyversion.mk" +.include "../../lang/ruby/buildlink3.mk" +.include "../../x11/qt4-libs/buildlink3.mk" +# libQtDesigner +.include "../../x11/qt4-tools/buildlink3.mk" +BUILDLINK_DEPMETHOD.qt4-tools= full +.include "../../mk/bsd.pkg.mk" diff --git a/cad/klayout/PLIST b/cad/klayout/PLIST new file mode 100644 index 0000000000000..1bcbb316b9417 --- /dev/null +++ b/cad/klayout/PLIST @@ -0,0 +1,12 @@ +@comment $NetBSD: PLIST,v 1.1 2016/03/15 15:15:59 mef Exp $ +bin/klayout +bin/strm2cif +bin/strm2dxf +bin/strm2gds +bin/strm2gdstxt +bin/strm2oas +bin/strm2txt +bin/strmclip +bin/strmcmp +bin/strmxor +lib/libklayout.so diff --git a/cad/klayout/distinfo b/cad/klayout/distinfo new file mode 100644 index 0000000000000..045c039d1300b --- /dev/null +++ b/cad/klayout/distinfo @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1 2016/03/15 15:15:59 mef Exp $ + +SHA1 (klayout-0.24.5.tar.gz) = 171d153b56f7f1bea3c0fb943a003558465efb9c +RMD160 (klayout-0.24.5.tar.gz) = b0e4ce93092e84b2cb193886ab6a8b682e48521d +SHA512 (klayout-0.24.5.tar.gz) = b1b8e80060adf089b9059802656421629bd4ddb781fe924e234ece075021fc4fe3cb3dbc2ebdc8b7d14183927223c6132aa62a88b8667b5eb8103dbd4f02dd56 +Size (klayout-0.24.5.tar.gz) = 11251829 bytes +SHA1 (patch-build.sh) = 3a1e61100de101cbe82b0c4abfa10a0ab2f7ead7 +SHA1 (patch-config_Makefile_conf_freebsd-32-gcc-release) = 8ee1a6f42465ef650fbd26ec6dcdea4db249d018 +SHA1 (patch-config_Makefile_conf_netbsd-32-gcc-release) = 1fd264f8a25d4410cd48fcfbbbfbf149e65e3b22 +SHA1 (patch-src_layApplication.cc) = d3f115836e75a76ab2322048d8698c0dcd6c7492 diff --git a/cad/klayout/patches/patch-build.sh b/cad/klayout/patches/patch-build.sh new file mode 100644 index 0000000000000..d467b2ff34a46 --- /dev/null +++ b/cad/klayout/patches/patch-build.sh @@ -0,0 +1,19 @@ +$NetBSD: patch-build.sh,v 1.1 2016/03/15 15:15:59 mef Exp $ + +Add NetBSD and FreeBSD + +--- build.sh.orig 2016-02-27 07:20:29.000000000 +0900 ++++ build.sh 2016-03-08 23:14:50.000000000 +0900 +@@ -39,6 +39,12 @@ Darwin*) + PLATFORM="mac-yosemite-gcc-release" + EXEC_HOLDER="klayout.app/Contents/MacOS" + ;; ++FreeBSD) ++ PLATFORM="freebsd-32-gcc-release" ++ ;; ++NetBSD) ++ PLATFORM="netbsd-32-gcc-release" ++ ;; + *) + # Assume Linux for the remaining variants + case `arch` in diff --git a/cad/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release b/cad/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release new file mode 100644 index 0000000000000..86f2629ab41ff --- /dev/null +++ b/cad/klayout/patches/patch-config_Makefile_conf_freebsd-32-gcc-release @@ -0,0 +1,56 @@ +$NetBSD: patch-config_Makefile_conf_freebsd-32-gcc-release,v 1.1 2016/03/15 15:15:59 mef Exp $ + +Add FreeBSD, but not checked yet + +--- /dev/null 2013-04-27 17:36:48.000000000 +0900 ++++ config/Makefile.conf.freebsd-32-gcc-release 2013-04-27 17:37:10.000000000 +0900 +@@ -0,0 +1,49 @@ ++ ++# Configuration file for ++# gcc, FreeBSD ++# release build ++ ++# Compiler options ++ ++AR=ar -r ++ ++# Compiler general ++INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) ++DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII ++ ++# C++ ++CXX?=gcc ++CXXOPT_DEP=-MM -MG ++CXXWARN=-Wall -Wno-deprecated -Woverloaded-virtual \ ++ -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing ++CXXOPT=${CXXFLAGS} -c -o ++CXXOPT_SO=-fPIC $(CXXOPT) ++ ++# C ++CC?=gcc ++CCOPT_DEP=-MM -MG ++CCWARN= ++CCOPT=${CFLAGS} -c -o ++CCOPT_SO=-fPIC $(CCOPT) ++ ++# Linker ++LINK?=${CXX} ++LOPT=${LDFLAGS} -g -Wl,-E -o ++LOPT_SO=${LDFLAGS} -g -shared -o ++ ++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz ++ ++.PHONY: install ++install: ++ mkdir -p $(INSTALL_BINDIR) ++ cp main/$(EXEC_NAME) $(INSTALL_BINDIR) ++ for bin in $(OTHER_BIN) ; \ ++ do \ ++ cp main/$$bin $(INSTALL_BINDIR) ; \ ++ done ++ for plugin in $(PLUGINS) ; \ ++ do \ ++ cp $$plugin/*.so $(INSTALL_BINDIR) ; \ ++ done ++ chmod 755 $(INSTALL_BINDIR) $(INSTALL_BINDIR)/* ++ diff --git a/cad/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release b/cad/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release new file mode 100644 index 0000000000000..7e31f4b9d0286 --- /dev/null +++ b/cad/klayout/patches/patch-config_Makefile_conf_netbsd-32-gcc-release @@ -0,0 +1,56 @@ +$NetBSD: patch-config_Makefile_conf_netbsd-32-gcc-release,v 1.1 2016/03/15 15:15:59 mef Exp $ + +Add NetBSD + +--- /dev/null 2013-04-27 17:36:48.000000000 +0900 ++++ config/Makefile.conf.netbsd-32-gcc-release 2013-04-27 17:37:10.000000000 +0900 +@@ -0,0 +1,49 @@ ++ ++# # Configuration file for ++# # gcc, NetBSD ++# # release build ++# ++# # Compiler options ++# ++AR=ar -r ++# ++# # Compiler general ++INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) ++DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII ++# ++# # C++ ++CXX=gcc ++CXXOPT_DEP=-MM -MG ++CXXWARN=-Wall -Wno-deprecated -Woverloaded-virtual \ ++ -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing ++CXXOPT=${CXXFLAGS} -c -o ++CXXOPT_SO=-fPIC $(CXXOPT) ++# ++# # C ++CC=gcc ++CCOPT_DEP=-MM -MG ++CCWARN= ++CCOPT=${CFLAGS} -c -o ++CCOPT_SO=-fPIC $(CCOPT) ++# ++# # Linker ++LINK=gcc ++LOPT=@@LDFLAGS@@ -g -Wl,-E -o ++LOPT_SO= @COMPILER_RPATH_FLAG@@PREFIX@/lib:@PREFIX@/qt-4/lib:/usr/lib @@LDFLAGS@@ -g -shared -o ++# ++LIBS=${PTHREAD_LIBS} -L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lm -lcrypt -lz ++ ++#.PHONY: install ++#install: ++# mkdir -p $(INSTALL_BINDIR) ++# cp main/$(EXEC_NAME) $(INSTALL_BINDIR) ++# for bin in $(OTHER_BIN) ; \ ++# do \ ++# cp main/$$bin $(INSTALL_BINDIR) ; \ ++# done ++# for plugin in $(PLUGINS) ; \ ++# do \ ++# cp $$plugin/*.so $(INSTALL_BINDIR) ; \ ++# done ++# chmod 755 $(INSTALL_BINDIR) $(INSTALL_BINDIR)/* ++ diff --git a/cad/klayout/patches/patch-src_layApplication.cc b/cad/klayout/patches/patch-src_layApplication.cc new file mode 100644 index 0000000000000..9296289cadc44 --- /dev/null +++ b/cad/klayout/patches/patch-src_layApplication.cc @@ -0,0 +1,16 @@ +$NetBSD: patch-src_layApplication.cc,v 1.1 2016/03/15 15:15:59 mef Exp $ + +To avoid following message +error: 'struct sigaction' has no member named 'sa_restorer' + +--- src/layApplication.cc.orig 2016-02-27 07:20:30.000000000 +0900 ++++ src/layApplication.cc 2016-03-08 23:52:13.000000000 +0900 +@@ -349,7 +349,7 @@ static void install_signal_handlers () + act.sa_sigaction = signal_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = SA_SIGINFO; +-#if !defined(__APPLE__) ++#if !defined(__APPLE__) && !defined(__NetBSD__) + act.sa_restorer = 0; + #endif + From d617119798e4bbcace1e59169c68cb2b6b4d5b18 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:16:21 +0000 Subject: [PATCH 0160/2457] Note update of security/ruby-oauth package to 0.5.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 83b4d96457885..db36e09ff9eb4 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1196 2016/03/15 15:07:40 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1197 2016/03/15 15:16:21 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1586,3 +1586,4 @@ Changes to the packages collection and infrastructure in 2016: Updated print/ruby-pdf-reader to 1.4.0 [taca 2016-03-15] Updated print/ruby-prawn to 2.1.0 [taca 2016-03-15] Updated security/ruby-bcrypt to 3.1.11 [taca 2016-03-15] + Updated security/ruby-oauth to 0.5.1 [taca 2016-03-15] From 7dcd5fc114039c042eaaca53b8c562b696b1dde6 Mon Sep 17 00:00:00 2001 From: tez Date: Tue, 15 Mar 2016 15:16:39 +0000 Subject: [PATCH 0161/2457] Update to 1.14.1 resolving all reported vulnerabilities including: CVE-2015-2695 CVE-2015-2696 CVE-2015-2697 CVE-2015-2698 CVE-2015-8629 CVE-2015-8630 CVE-2015-8631 --- security/mit-krb5/Makefile | 26 +- security/mit-krb5/PLIST | 29 +- security/mit-krb5/distinfo | 51 ++- .../patches/patch-2015-001-patch-r110 | 312 ------------------ security/mit-krb5/patches/patch-CVE-2014-4341 | 116 ------- security/mit-krb5/patches/patch-CVE-2014-4343 | 16 - security/mit-krb5/patches/patch-CVE-2014-4344 | 16 - security/mit-krb5/patches/patch-CVE-2014-5351 | 51 --- security/mit-krb5/patches/patch-CVE-2014-5353 | 29 -- security/mit-krb5/patches/patch-CVE-2014-5355 | 53 --- .../patches/{patch-ak => patch-Makefile.in} | 27 +- security/mit-krb5/patches/patch-aa | 2 +- security/mit-krb5/patches/patch-ae | 2 +- security/mit-krb5/patches/patch-aj | 6 +- security/mit-krb5/patches/patch-al | 2 +- security/mit-krb5/patches/patch-cf | 2 +- security/mit-krb5/patches/patch-cg | 2 +- security/mit-krb5/patches/patch-cj | 2 +- .../patches/{patch-ad => patch-config_lib.in} | 19 +- .../{patch-ci => patch-config_libnover.in} | 31 +- .../patches/{patch-af => patch-config_pre.in} | 24 +- .../{patch-ag => patch-config_shlib.conf} | 54 +-- security/mit-krb5/patches/patch-configure.in | 10 +- .../{patch-ah => patch-include_osconf.hin} | 21 +- .../patches/patch-kadmin_dbutil_dump.c | 20 -- ...atch-ck => patch-lib_apputils_Makefile.in} | 9 +- .../patches/patch-lib_apputils_net-server.c | 2 +- .../patches/patch-lib_krb5_asn.1_asn1buf.h | 10 +- ...h-ch => patch-plugins_kdb_db2_Makefile.in} | 15 +- .../patch-plugins_kdb_db2_libdb2_Makefile.in | 22 ++ .../patch-plugins_preauth_otp_Makefile.in | 13 + .../patch-plugins_preauth_pkinit_Makefile.in | 15 + .../patches/patch-util_k5ev_verto-k5ev.c | 12 +- .../patches/patch-util_ss_Makefile.in | 10 +- 34 files changed, 241 insertions(+), 790 deletions(-) delete mode 100644 security/mit-krb5/patches/patch-2015-001-patch-r110 delete mode 100644 security/mit-krb5/patches/patch-CVE-2014-4341 delete mode 100644 security/mit-krb5/patches/patch-CVE-2014-4343 delete mode 100644 security/mit-krb5/patches/patch-CVE-2014-4344 delete mode 100644 security/mit-krb5/patches/patch-CVE-2014-5351 delete mode 100644 security/mit-krb5/patches/patch-CVE-2014-5353 delete mode 100644 security/mit-krb5/patches/patch-CVE-2014-5355 rename security/mit-krb5/patches/{patch-ak => patch-Makefile.in} (50%) rename security/mit-krb5/patches/{patch-ad => patch-config_lib.in} (84%) rename security/mit-krb5/patches/{patch-ci => patch-config_libnover.in} (72%) rename security/mit-krb5/patches/{patch-af => patch-config_pre.in} (86%) rename security/mit-krb5/patches/{patch-ag => patch-config_shlib.conf} (89%) rename security/mit-krb5/patches/{patch-ah => patch-include_osconf.hin} (59%) delete mode 100644 security/mit-krb5/patches/patch-kadmin_dbutil_dump.c rename security/mit-krb5/patches/{patch-ck => patch-lib_apputils_Makefile.in} (63%) rename security/mit-krb5/patches/{patch-ch => patch-plugins_kdb_db2_Makefile.in} (70%) create mode 100644 security/mit-krb5/patches/patch-plugins_kdb_db2_libdb2_Makefile.in create mode 100644 security/mit-krb5/patches/patch-plugins_preauth_otp_Makefile.in create mode 100644 security/mit-krb5/patches/patch-plugins_preauth_pkinit_Makefile.in diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index f07709fe38734..cdf1969c0f43e 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.87 2016/03/10 18:21:58 jperkin Exp $ +# $NetBSD: Makefile,v 1.88 2016/03/15 15:16:39 tez Exp $ -DISTNAME= krb5-1.10.7 +DISTNAME= krb5-1.14.1 PKGNAME= mit-${DISTNAME} -PKGREVISION= 9 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/ -EXTRACT_SUFX= .tar -DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX} +EXTRACT_SUFX= .tar.gz +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -PATCH_SITES= http://web.mit.edu/kerberos/advisories/ -PATCHFILES= 2014-001-patch.txt +#PATCH_SITES= http://web.mit.edu/kerberos/advisories/ +#PATCHFILES= 2014-001-patch.txt MAINTAINER= tez@NetBSD.org HOMEPAGE= http://web.mit.edu/kerberos/ @@ -47,6 +46,7 @@ CONFIGURE_ARGS+= --without-tcl CONFIGURE_ARGS+= --enable-pkgsrc-libtool CONFIGURE_ARGS+= --without-system-verto CONFIGURE_ENV+= BUILDLINK_PREFIX_OPENSSL=${BUILDLINK_PREFIX.openssl:Q} +CONFIGURE_ENV+= DEFKTNAME=FILE:${PKG_SYSCONFDIR}/krb5.keytab MAKE_ENV+= ROOT_USER=${ROOT_USER} LIBS.SunOS= -lrt @@ -63,14 +63,8 @@ INSTALLATION_DIRS= bin include/gssapi include/gssrpc ${PKGINFODIR} \ ${PKGMANDIR}/man8 sbin share/examples/krb5 \ share/et share/examples/rc.d share/gnats \ lib/krb5/plugins/kdb lib/krb5/plugins/preauth \ - include/krb5 include/kadm5 - -# The MIT krb5 distribution is actually a tar file that contains the -# real .tar.gz distfile and a PGP signature. -post-extract: - @${ECHO} "=> Extracting internal tarball"; \ - extract_file="${WRKDIR}/${DISTNAME}.tar.gz"; \ - cd ${WRKDIR} && ${EXTRACT_CMD} + lib/krb5/plugins/tls include/krb5 include/kadm5 \ + lib/pkgconfig pre-configure: @${ECHO} "=> Generating configure"; \ @@ -84,6 +78,6 @@ post-install: ${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \ done -BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8 +BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.1 .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/mit-krb5/PLIST b/security/mit-krb5/PLIST index bea08093d042c..c813099c40d37 100644 --- a/security/mit-krb5/PLIST +++ b/security/mit-krb5/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2014/03/11 14:05:13 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.18 2016/03/15 15:16:39 tez Exp $ bin/compile_et bin/gss-client bin/k5srvutil @@ -42,9 +42,15 @@ include/kadm5/admin.h include/kadm5/chpass_util_strings.h include/kadm5/kadm_err.h include/kdb.h +include/krad.h include/krb5.h +include/krb5/ccselect_plugin.h +include/krb5/clpreauth_plugin.h +include/krb5/hostrealm_plugin.h include/krb5/kadm5_hook_plugin.h +include/krb5/kdcpreauth_plugin.h include/krb5/krb5.h +include/krb5/localauth_plugin.h include/krb5/locate_plugin.h include/krb5/plugin.h include/krb5/preauth_plugin.h @@ -52,11 +58,10 @@ include/krb5/pwqual_plugin.h include/profile.h include/verto-module.h include/verto.h -info/krb5-admin.info -info/krb5-install.info -info/krb5-user.info lib/krb5/plugins/kdb/libdb2.la lib/krb5/plugins/preauth/libpkinit.la +lib/krb5/plugins/preauth/libotp.la +lib/krb5/plugins/tls/libk5tls.la lib/libcom_err.la lib/libgssapi_krb5.la lib/libgssrpc.la @@ -66,20 +71,27 @@ lib/libkadm5clnt_mit.la lib/libkadm5srv.la lib/libkadm5srv_mit.la lib/libkdb5.la +lib/libkrad.la lib/libkrb5.la lib/libkrb5support.la -lib/libverto-k5ev.la +@comment lib/libverto-k5ev.la lib/libverto.la +lib/pkgconfig/gssrpc.pc +lib/pkgconfig/kadm-client.pc +lib/pkgconfig/kadm-server.pc +lib/pkgconfig/kdb.pc +lib/pkgconfig/krb5-gssapi.pc +lib/pkgconfig/krb5.pc +lib/pkgconfig/mit-krb5-gssapi.pc +lib/pkgconfig/mit-krb5.pc man/man1/compile_et.1 man/man1/k5srvutil.1 man/man1/kadmin.1 man/man1/kdestroy.1 -man/man1/kerberos.1 man/man1/kinit.1 man/man1/klist.1 man/man1/kpasswd.1 man/man1/krb5-config.1 -man/man1/krb5-send-pr.1 man/man1/ksu.1 man/man1/kswitch.1 man/man1/ktutil.1 @@ -89,10 +101,12 @@ man/man5/.k5identity.5 man/man5/.k5login.5 man/man5/k5identity.5 man/man5/k5login.5 +man/man5/kadm5.acl.5 man/man5/kdc.conf.5 man/man5/krb5.conf.5 man/man8/kadmin.local.8 man/man8/kadmind.8 +man/man8/kdb5_ldap_util.8 man/man8/kdb5_util.8 man/man8/kprop.8 man/man8/kpropd.8 @@ -116,5 +130,4 @@ share/et/et_h.awk share/examples/krb5/kdc.conf share/examples/krb5/krb5.conf share/examples/krb5/services.append -share/gnats/mit share/locale/en_US/LC_MESSAGES/mit-krb5.mo diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo index c6656da6e6f6d..447263ed07d93 100644 --- a/security/mit-krb5/distinfo +++ b/security/mit-krb5/distinfo @@ -1,38 +1,29 @@ -$NetBSD: distinfo,v 1.55 2016/03/10 18:21:58 jperkin Exp $ +$NetBSD: distinfo,v 1.56 2016/03/15 15:16:39 tez Exp $ -SHA1 (2014-001-patch.txt) = 919402bf3b7c289e847e9adc03a7c30f26966769 -RMD160 (2014-001-patch.txt) = a39c8e12e79ab273d562b04c1e7811c414dd70e8 -SHA512 (2014-001-patch.txt) = d7efc06dfd00a1fc4e2753a48fe1fa12a33ece8d8c3e990df4ed1562a27df73531cb0ecbb6c4e40223cfc6f144b17f33f7c73bd136c62930f147bbf5d6877f91 -Size (2014-001-patch.txt) = 592 bytes -SHA1 (krb5-1.10.7-signed.tar) = 982087d617d0b038676bbe8030047421683d508b -RMD160 (krb5-1.10.7-signed.tar) = 16e3a2cdeb410d84d055431679eb81851ae685e9 -SHA512 (krb5-1.10.7-signed.tar) = b4388c7d241f11c9c9fd2842d70d4bd4e075043b6a94670b367493bbf0807c3e6a275f6be48e0a721f293b59cc64ae2b7cd2711d00ac58d6e12a305900bc91ef -Size (krb5-1.10.7-signed.tar) = 11632640 bytes -SHA1 (patch-2015-001-patch-r110) = 17343091958096cfb45caae490018e60c79430cf -SHA1 (patch-CVE-2014-4341) = 97b316fb3c5dfc626827a13baa5dcf623d67da3c -SHA1 (patch-CVE-2014-4343) = e7d4604d81671f71c9cd9461b65a9e87b5982baa -SHA1 (patch-CVE-2014-4344) = b7ae530beaffcf1c095e6f94bdf608b7a140b064 -SHA1 (patch-CVE-2014-5351) = 2948e2a9f7adb97b8cb70bb8f0043c45e5822465 -SHA1 (patch-CVE-2014-5353) = 93217bb5f249b153b8dcb0be07a565ee8cca879a -SHA1 (patch-CVE-2014-5355) = de4f540d079b88fcf2e0ecdc504d977d47d628ab +SHA1 (krb5-1.14.1.tar.gz) = f12dc3b8630fd1fefb7058cd782754489377308b +RMD160 (krb5-1.14.1.tar.gz) = 3e32a0cd365474deeeb563831b7e408f9158b36a +SHA512 (krb5-1.14.1.tar.gz) = 5d64bb30ecb9e267e2494cea4995d8cc314916d8f6a9318fb80067ae6389ad7468656400d996698b6dc0bdb4c1355c13701b570521a7c40008cf1f83df24847d +Size (krb5-1.14.1.tar.gz) = 12259025 bytes +SHA1 (patch-Makefile.in) = 11ead9de708f4da99233b66df2cf906b156faa87 SHA1 (patch-aa) = 941848a1773dfbe51dff3134d4b8504a850a958d -SHA1 (patch-ad) = b56a7218007560470179dd811c84b8c690c966ac SHA1 (patch-ae) = c7395b9de5baf6612b8787fad55dbc051a680bfd -SHA1 (patch-af) = 1edab3a5f7eb6a7c5dc287e94ae4401c389dbabf -SHA1 (patch-ag) = a63d8929b02c41423123ee722d02af00645eda2c -SHA1 (patch-ah) = 4e40f36e8969974b3c2f68b2e3636921133c57ba -SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6 -SHA1 (patch-ak) = 19d9b15048a5920ee15c82b33da50c40cf400e46 +SHA1 (patch-aj) = 4ab922df1d86d86f9ef043f2c5cdf048c0477d3a SHA1 (patch-al) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa SHA1 (patch-cf) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3 SHA1 (patch-cg) = 30b1e8943b0cbe67f37bac6883f4bdd82776e6d1 -SHA1 (patch-ch) = 0f7f45aeb52907b52a2b143c3a2e36a7656c68c5 -SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970 SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b -SHA1 (patch-ck) = 6a483684c68f045bf6f8e165a8935338af7422db -SHA1 (patch-configure.in) = 66fc241ec9d6339268dc37548494ef87b09bc521 -SHA1 (patch-kadmin_dbutil_dump.c) = 4b49c116dbed9e6be4a0bf0a731c3ae82808d82e +SHA1 (patch-config_lib.in) = 974db26486b3239e4fcd53be7280b32c802f6007 +SHA1 (patch-config_libnover.in) = 53f539cf98a961483e2b4ccf278c7376dbcf52d9 +SHA1 (patch-config_pre.in) = 7eb1270e3cd71c7dde95f56d26e7626b212c90dd +SHA1 (patch-config_shlib.conf) = c47a647307e7d883e7c22528b7b0f5ad038cbcb3 +SHA1 (patch-configure.in) = 6675fa171d6e21ad71a58ce410d3b1ecb45add4d +SHA1 (patch-include_osconf.hin) = d31a8164f417bc31a787c8e16d1bd24f27b7140d +SHA1 (patch-lib_apputils_Makefile.in) = e001c7d0e9020c0e9feb5743805ef68e64012247 SHA1 (patch-lib_apputils_net-server.c) = 4f54924cca60e75b1b835d35c5eeb96d9f95a90e -SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7 -SHA1 (patch-util_k5ev_verto-k5ev.c) = 79a2be64fa4f9b0dc3a333271e8a3ff7944e5c18 -SHA1 (patch-util_ss_Makefile.in) = bcdb657748c45f6bbb58086b7abbc5ad71e42e27 +SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = 74d7d172ec4c8d7f68a093befc6b40c99b119e37 +SHA1 (patch-plugins_kdb_db2_Makefile.in) = f374fc5915b735075fbb751ef736f4ce54abc289 +SHA1 (patch-plugins_kdb_db2_libdb2_Makefile.in) = b4b7e8e4192b5e5318f1e42c49315789619f3ae9 +SHA1 (patch-plugins_preauth_otp_Makefile.in) = 8c779e3b37cab4138f300f4a09325387092c79f8 +SHA1 (patch-plugins_preauth_pkinit_Makefile.in) = ff56050dc6a31468977c16b192b4f5d2d79764c2 +SHA1 (patch-util_k5ev_verto-k5ev.c) = 4f148a369d1634234a90c348e6b8dc366cd6773d +SHA1 (patch-util_ss_Makefile.in) = 61b7efd68b10cbd7bedbdde523e96ae2a0ef3dfc diff --git a/security/mit-krb5/patches/patch-2015-001-patch-r110 b/security/mit-krb5/patches/patch-2015-001-patch-r110 deleted file mode 100644 index 072f58df85070..0000000000000 --- a/security/mit-krb5/patches/patch-2015-001-patch-r110 +++ /dev/null @@ -1,312 +0,0 @@ -$NetBSD: patch-2015-001-patch-r110,v 1.1 2015/02/25 22:28:58 tez Exp $ - -Patch for MITKRB5-SA-2015-001.txt backported -based on http://web.mit.edu/kerberos/advisories/2015-001-patch-r111.txt -Fixes: -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-5352 -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9421 -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9422 -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9423 - - ---- ./kadmin/server/kadm_rpc_svc.c.orig 2015-02-25 19:03:47.134238800 +0000 -+++ ./kadmin/server/kadm_rpc_svc.c -@@ -4,7 +4,7 @@ - * - */ - --#include -+#include - #include - #include /* for gss_nt_krb5_name */ - #include -@@ -301,14 +301,8 @@ check_rpcsec_auth(struct svc_req *rqstp) - c1 = krb5_princ_component(kctx, princ, 0); - c2 = krb5_princ_component(kctx, princ, 1); - realm = krb5_princ_realm(kctx, princ); -- if (strncmp(handle->params.realm, realm->data, realm->length) == 0 -- && strncmp("kadmin", c1->data, c1->length) == 0) { -- -- if (strncmp("history", c2->data, c2->length) == 0) -- goto fail_princ; -- else -- success = 1; -- } -+ success = data_eq_string(*realm, handle->params.realm) && -+ data_eq_string(*c1, "kadmin") && !data_eq_string(*c2, "history"); - - fail_princ: - if (!success) { - ---- ./lib/gssapi/krb5/context_time.c.orig 2015-02-25 19:49:12.558472400 +0000 -+++ ./lib/gssapi/krb5/context_time.c -@@ -40,7 +40,7 @@ krb5_gss_context_time(minor_status, cont - - ctx = (krb5_gss_ctx_id_rec *) context_handle; - -- if (! ctx->established) { -+ if (ctx->terminated || !ctx->established) { - *minor_status = KG_CTX_INCOMPLETE; - return(GSS_S_NO_CONTEXT); - } - ---- ./lib/gssapi/krb5/export_sec_context.c.orig 2015-02-25 20:12:11.511021400 +0000 -+++ ./lib/gssapi/krb5/export_sec_context.c -@@ -45,6 +45,11 @@ krb5_gss_export_sec_context(minor_status - *minor_status = 0; - - ctx = (krb5_gss_ctx_id_t) *context_handle; -+ if (ctx->terminated) { -+ *minor_status = KG_CTX_INCOMPLETE; -+ return (GSS_S_NO_CONTEXT); -+ } -+ - context = ctx->k5_context; - kret = krb5_gss_ser_init(context); - if (kret) - ---- ./lib/gssapi/krb5/gssapiP_krb5.h.orig 2015-02-25 20:13:50.580912000 +0000 -+++ ./lib/gssapi/krb5/gssapiP_krb5.h -@@ -202,6 +202,7 @@ typedef struct _krb5_gss_ctx_id_rec { - unsigned int big_endian : 1; - unsigned int have_acceptor_subkey : 1; - unsigned int seed_init : 1; /* XXX tested but never actually set */ -+ unsigned int terminated : 1; - OM_uint32 gss_flags; - unsigned char seed[16]; - krb5_gss_name_t here; - ---- ./lib/gssapi/krb5/gssapi_krb5.c.orig 2015-02-25 20:15:28.221874100 +0000 -+++ ./lib/gssapi/krb5/gssapi_krb5.c -@@ -369,7 +369,7 @@ krb5_gss_inquire_sec_context_by_oid (OM_ - - ctx = (krb5_gss_ctx_id_rec *) context_handle; - -- if (!ctx->established) -+ if (ctx->terminated || !ctx->established) - return GSS_S_NO_CONTEXT; - - for (i = 0; i < sizeof(krb5_gss_inquire_sec_context_by_oid_ops)/ - ---- ./lib/gssapi/krb5/inq_context.c.orig 2015-02-25 20:17:05.258340000 +0000 -+++ ./lib/gssapi/krb5/inq_context.c -@@ -105,7 +105,7 @@ krb5_gss_inquire_context(minor_status, c - - ctx = (krb5_gss_ctx_id_rec *) context_handle; - -- if (! ctx->established) { -+ if (ctx->terminated || !ctx->established) { - *minor_status = KG_CTX_INCOMPLETE; - return(GSS_S_NO_CONTEXT); - } - ---- ./lib/gssapi/krb5/k5seal.c.orig 2015-02-25 20:18:07.402899400 +0000 -+++ ./lib/gssapi/krb5/k5seal.c -@@ -347,7 +347,7 @@ kg_seal(minor_status, context_handle, co - - ctx = (krb5_gss_ctx_id_rec *) context_handle; - -- if (! ctx->established) { -+ if (ctx->terminated || !ctx->established) { - *minor_status = KG_CTX_INCOMPLETE; - return(GSS_S_NO_CONTEXT); - } - ---- ./lib/gssapi/krb5/k5sealiov.c.orig 2015-02-25 20:19:26.092234800 +0000 -+++ ./lib/gssapi/krb5/k5sealiov.c -@@ -285,7 +285,7 @@ kg_seal_iov(OM_uint32 *minor_status, - } - - ctx = (krb5_gss_ctx_id_rec *)context_handle; -- if (!ctx->established) { -+ if (ctx->terminated || !ctx->established) { - *minor_status = KG_CTX_INCOMPLETE; - return GSS_S_NO_CONTEXT; - } - ---- ./lib/gssapi/krb5/k5unseal.c.orig 2013-11-06 20:52:23.000000000 +0000 -+++ ./lib/gssapi/krb5/k5unseal.c -@@ -487,7 +487,7 @@ kg_unseal(minor_status, context_handle, - - ctx = (krb5_gss_ctx_id_rec *) context_handle; - -- if (! ctx->established) { -+ if (ctx->terminated || !ctx->established) { - *minor_status = KG_CTX_INCOMPLETE; - return(GSS_S_NO_CONTEXT); - } - ---- ./lib/gssapi/krb5/k5unsealiov.c.orig 2013-11-06 20:52:23.000000000 +0000 -+++ ./lib/gssapi/krb5/k5unsealiov.c -@@ -628,7 +628,7 @@ kg_unseal_iov(OM_uint32 *minor_status, - OM_uint32 code; - - ctx = (krb5_gss_ctx_id_rec *)context_handle; -- if (!ctx->established) { -+ if (ctx->terminated || !ctx->established) { - *minor_status = KG_CTX_INCOMPLETE; - return GSS_S_NO_CONTEXT; - } - ---- ./lib/gssapi/krb5/lucid_context.c.orig 2015-02-25 20:27:11.529478500 +0000 -+++ ./lib/gssapi/krb5/lucid_context.c -@@ -75,6 +75,11 @@ gss_krb5int_export_lucid_sec_context( - *minor_status = 0; - *data_set = GSS_C_NO_BUFFER_SET; - -+ if (ctx->terminated || !ctx->established) { -+ *minor_status = KG_CTX_INCOMPLETE; -+ return GSS_S_NO_CONTEXT; -+ } -+ - retval = generic_gss_oid_decompose(minor_status, - GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT_OID, - GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT_OID_LENGTH, - ---- ./lib/gssapi/krb5/prf.c.orig 2015-02-25 20:28:38.970661400 +0000 -+++ ./lib/gssapi/krb5/prf.c -@@ -60,6 +60,10 @@ krb5_gss_pseudo_random(OM_uint32 *minor_ - ns.data = NULL; - - ctx = (krb5_gss_ctx_id_t)context; -+ if (ctx->terminated || !ctx->established) { -+ *minor_status = KG_CTX_INCOMPLETE; -+ return GSS_S_NO_CONTEXT; -+ } - - switch (prf_key) { - case GSS_C_PRF_KEY_FULL: - ---- ./lib/gssapi/krb5/process_context_token.c.orig 2015-02-25 20:29:45.187213100 +0000 -+++ ./lib/gssapi/krb5/process_context_token.c -@@ -39,11 +39,18 @@ krb5_gss_process_context_token(minor_sta - - ctx = (krb5_gss_ctx_id_t) context_handle; - -- if (! ctx->established) { -+ if (ctx->terminated || !ctx->established) { - *minor_status = KG_CTX_INCOMPLETE; - return(GSS_S_NO_CONTEXT); - } - -+ /* We only support context deletion tokens for now, and RFC 4121 does not -+ * define a context deletion token. */ -+ if (ctx->proto) { -+ *minor_status = 0; -+ return(GSS_S_DEFECTIVE_TOKEN); -+ } -+ - /* "unseal" the token */ - - if (GSS_ERROR(majerr = kg_unseal(minor_status, context_handle, -@@ -52,8 +59,8 @@ krb5_gss_process_context_token(minor_sta - KG_TOK_DEL_CTX))) - return(majerr); - -- /* that's it. delete the context */ -- -- return(krb5_gss_delete_sec_context(minor_status, &context_handle, -- GSS_C_NO_BUFFER)); -+ /* Mark the context as terminated, but do not delete it (as that would -+ * leave the caller with a dangling context handle). */ -+ ctx->terminated = 1; -+ return(GSS_S_COMPLETE); - } - ---- ./lib/gssapi/krb5/wrap_size_limit.c.orig 2015-02-25 20:32:00.325325300 +0000 -+++ ./lib/gssapi/krb5/wrap_size_limit.c -@@ -95,7 +95,7 @@ krb5_gss_wrap_size_limit(minor_status, c - } - - ctx = (krb5_gss_ctx_id_rec *) context_handle; -- if (! ctx->established) { -+ if (ctx->terminated || !ctx->established) { - *minor_status = KG_CTX_INCOMPLETE; - return(GSS_S_NO_CONTEXT); - } - ---- ./lib/kadm5/kadm_rpc_xdr.c.orig 2015-02-25 20:48:14.376390200 +0000 -+++ ./lib/kadm5/kadm_rpc_xdr.c -@@ -320,6 +320,7 @@ bool_t xdr_krb5_tl_data(XDR *xdrs, krb5_ - free(tl); - tl = tl2; - } -+ *tl_data_head = NULL; - break; - - case XDR_ENCODE: -@@ -1067,6 +1068,7 @@ xdr_krb5_principal(XDR *xdrs, krb5_princ - case XDR_FREE: - if(*objp != NULL) - krb5_free_principal(context, *objp); -+ *objp = NULL; - break; - } - return TRUE; - ---- ./lib/rpc/auth_gssapi_misc.c.orig 2015-02-25 20:51:31.250618000 +0000 -+++ ./lib/rpc/auth_gssapi_misc.c -@@ -321,7 +321,6 @@ bool_t auth_gssapi_unwrap_data( - if (! (*xdr_func)(&temp_xdrs, xdr_ptr)) { - PRINTF(("gssapi_unwrap_data: deserializing arguments failed\n")); - gss_release_buffer(minor, &out_buf); -- xdr_free(xdr_func, xdr_ptr); - XDR_DESTROY(&temp_xdrs); - return FALSE; - } - ---- ./lib/rpc/svc_auth_gss.c.orig 2015-02-25 20:52:40.715734700 +0000 -+++ ./lib/rpc/svc_auth_gss.c -@@ -68,16 +68,6 @@ extern const gss_OID_desc * const gss_me - - extern SVCAUTH svc_auth_none; - --/* -- * from mit-krb5-1.2.1 mechglue/mglueP.h: -- * Array of context IDs typed by mechanism OID -- */ --typedef struct gss_union_ctx_id_t { -- gss_OID mech_type; -- gss_ctx_id_t internal_ctx_id; --} gss_union_ctx_id_desc, *gss_union_ctx_id_t; -- -- - static auth_gssapi_log_badauth_func log_badauth = NULL; - static caddr_t log_badauth_data = NULL; - static auth_gssapi_log_badverf_func log_badverf = NULL; -@@ -235,16 +225,8 @@ svcauth_gss_accept_sec_context(struct sv - gd->ctx = GSS_C_NO_CONTEXT; - goto errout; - } -- /* -- * ANDROS: krb5 mechglue returns ctx of size 8 - two pointers, -- * one to the mechanism oid, one to the internal_ctx_id -- */ -- if ((gr->gr_ctx.value = mem_alloc(sizeof(gss_union_ctx_id_desc))) == NULL) { -- fprintf(stderr, "svcauth_gss_accept_context: out of memory\n"); -- goto errout; -- } -- memcpy(gr->gr_ctx.value, gd->ctx, sizeof(gss_union_ctx_id_desc)); -- gr->gr_ctx.length = sizeof(gss_union_ctx_id_desc); -+ gr->gr_ctx.value = "xxxx"; -+ gr->gr_ctx.length = 4; - - /* gr->gr_win = 0x00000005; ANDROS: for debugging linux kernel version... */ - gr->gr_win = sizeof(gd->seqmask) * 8; -@@ -516,8 +498,6 @@ gssrpc__svcauth_gss(struct svc_req *rqst - - if (!svcauth_gss_nextverf(rqst, htonl(gr.gr_win))) { - gss_release_buffer(&min_stat, &gr.gr_token); -- mem_free(gr.gr_ctx.value, -- sizeof(gss_union_ctx_id_desc)); - ret_freegc (AUTH_FAILED); - } - *no_dispatch = TRUE; -@@ -527,7 +507,6 @@ gssrpc__svcauth_gss(struct svc_req *rqst - - gss_release_buffer(&min_stat, &gr.gr_token); - gss_release_buffer(&min_stat, &gd->checksum); -- mem_free(gr.gr_ctx.value, sizeof(gss_union_ctx_id_desc)); - if (!call_stat) - ret_freegc (AUTH_FAILED); - diff --git a/security/mit-krb5/patches/patch-CVE-2014-4341 b/security/mit-krb5/patches/patch-CVE-2014-4341 deleted file mode 100644 index 6b56ecc702963..0000000000000 --- a/security/mit-krb5/patches/patch-CVE-2014-4341 +++ /dev/null @@ -1,116 +0,0 @@ -$NetBSD: patch-CVE-2014-4341,v 1.1 2014/08/28 22:23:05 tez Exp $ - -Fix for CVE-2014-4341 & CVE-2014-4342 from: -https://github.com/krb5/krb5/commit/e6ae703ae597d798e310368d52b8f38ee11c6a73 - - ---- lib/gssapi/krb5/k5unseal.c -+++ lib/gssapi/krb5/k5unseal.c -@@ -74,6 +74,7 @@ - int conflen = 0; - int signalg; - int sealalg; -+ int bad_pad = 0; - gss_buffer_desc token; - krb5_checksum cksum; - krb5_checksum md5cksum; -@@ -86,6 +87,7 @@ - krb5_ui_4 seqnum; - OM_uint32 retval; - size_t sumlen; -+ size_t padlen; - krb5_keyusage sign_usage = KG_USAGE_SIGN; - - if (toktype == KG_TOK_SEAL_MSG) { -@@ -93,18 +95,23 @@ - message_buffer->value = NULL; - } - -- /* get the sign and seal algorithms */ -- -- signalg = ptr[0] + (ptr[1]<<8); -- sealalg = ptr[2] + (ptr[3]<<8); -- - /* Sanity checks */ - -- if ((ptr[4] != 0xff) || (ptr[5] != 0xff)) { -+ if (ctx->seq == NULL) { -+ /* ctx was established using a newer enctype, and cannot process RFC -+ * 1964 tokens. */ - *minor_status = 0; - return GSS_S_DEFECTIVE_TOKEN; - } - -+ if ((bodysize < 22) || (ptr[4] != 0xff) || (ptr[5] != 0xff)) { -+ *minor_status = 0; -+ return GSS_S_DEFECTIVE_TOKEN; -+ } -+ -+ signalg = ptr[0] + (ptr[1]<<8); -+ sealalg = ptr[2] + (ptr[3]<<8); -+ - if ((toktype != KG_TOK_SEAL_MSG) && - (sealalg != 0xffff)) { - *minor_status = 0; -@@ -153,6 +160,11 @@ - return GSS_S_DEFECTIVE_TOKEN; - } - -+ if ((size_t)bodysize < 14 + cksum_len) { -+ *minor_status = 0; -+ return GSS_S_DEFECTIVE_TOKEN; -+ } -+ - /* get the token parameters */ - - if ((code = kg_get_seq_num(context, ctx->seq, ptr+14, ptr+6, &direction, -@@ -210,7 +222,20 @@ - token.length = tmsglen; - } else { - conflen = kg_confounder_size(context, ctx->enc->keyblock.enctype); -- token.length = tmsglen - conflen - plain[tmsglen-1]; -+ if (tmsglen < conflen) { -+ if (sealalg != 0xffff) -+ xfree(plain); -+ *minor_status = 0; -+ return(GSS_S_DEFECTIVE_TOKEN); -+ } -+ padlen = plain[tmsglen - 1]; -+ if (tmsglen - conflen < padlen) { -+ /* Don't error out yet, to avoid padding oracle attacks. We will -+ * treat this as a checksum failure later on. */ -+ padlen = 0; -+ bad_pad = 1; -+ } -+ token.length = tmsglen - conflen - padlen; - } - - if (token.length) { -@@ -423,7 +448,7 @@ - - /* compare the computed checksum against the transmitted checksum */ - -- if (code) { -+ if (code || bad_pad) { - if (toktype == KG_TOK_SEAL_MSG) - gssalloc_free(token.value); - *minor_status = 0; - ---- lib/gssapi/krb5/k5unsealiov.c -+++ lib/gssapi/krb5/k5unsealiov.c -@@ -69,7 +69,14 @@ kg_unseal_v1_iov(krb5_context context, - return GSS_S_DEFECTIVE_TOKEN; - } - -- if (header->buffer.length < token_wrapper_len + 14) { -+ if (ctx->seq == NULL) { -+ /* ctx was established using a newer enctype, and cannot process RFC -+ * 1964 tokens. */ -+ *minor_status = 0; -+ return GSS_S_DEFECTIVE_TOKEN; -+ } -+ -+ if (header->buffer.length < token_wrapper_len + 22) { - *minor_status = 0; - return GSS_S_DEFECTIVE_TOKEN; - } diff --git a/security/mit-krb5/patches/patch-CVE-2014-4343 b/security/mit-krb5/patches/patch-CVE-2014-4343 deleted file mode 100644 index b42b8b1d9ff75..0000000000000 --- a/security/mit-krb5/patches/patch-CVE-2014-4343 +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-CVE-2014-4343,v 1.1 2014/08/28 22:23:05 tez Exp $ - -fix for cve-2014-4343 from: -https://github.com/krb5/krb5/commit/f18ddf5d82de0ab7591a36e465bc24225776940f - - ---- lib/gssapi/spnego/spnego_mech.c -+++ lib/gssapi/spnego/spnego_mech.c -@@ -796,7 +796,6 @@ init_ctx_reselect(OM_uint32 *minor_status, spnego_gss_ctx_id_t sc, - OM_uint32 tmpmin; - size_t i; - -- generic_gss_release_oid(&tmpmin, &sc->internal_mech); - gss_delete_sec_context(&tmpmin, &sc->ctx_handle, - GSS_C_NO_BUFFER); - diff --git a/security/mit-krb5/patches/patch-CVE-2014-4344 b/security/mit-krb5/patches/patch-CVE-2014-4344 deleted file mode 100644 index a2066f8808903..0000000000000 --- a/security/mit-krb5/patches/patch-CVE-2014-4344 +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-CVE-2014-4344,v 1.1 2014/08/28 22:23:05 tez Exp $ - -fix for CVE-2014-4344 from: -https://github.com/krb5/krb5/commit/a7886f0ed1277c69142b14a2c6629175a6331edc - ---- lib/gssapi/spnego/spnego_mech.c -+++ lib/gssapi/spnego/spnego_mech.c -@@ -1442,7 +1442,7 @@ acc_ctx_cont(OM_uint32 *minstat, - - ptr = bufstart = buf->value; - #define REMAIN (buf->length - (ptr - bufstart)) -- if (REMAIN > INT_MAX) -+ if (REMAIN == 0 || REMAIN > INT_MAX) - return GSS_S_DEFECTIVE_TOKEN; - - /* diff --git a/security/mit-krb5/patches/patch-CVE-2014-5351 b/security/mit-krb5/patches/patch-CVE-2014-5351 deleted file mode 100644 index 49534c6c8b5ad..0000000000000 --- a/security/mit-krb5/patches/patch-CVE-2014-5351 +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-CVE-2014-5351,v 1.1 2014/11/25 23:40:49 tez Exp $ - -Patch for CVE-2014-5351 from: -http://krbdev.mit.edu/rt/Ticket/Display.html?id=8018 -https://github.com/krb5/krb5/commit/3bf9e33f9d66c0eef486cbd83f9e4f13a74d12c3.diff - - ---- lib/kadm5/srv/svr_principal.c.orig 2014-11-25 17:09:26.278975276 -0600 -+++ lib/kadm5/srv/svr_principal.c 2014-11-25 17:11:45.406746599 -0600 -@@ -200,6 +200,20 @@ - *passptr = NULL; - } - -+/* Return the number of keys with the newest kvno. Assumes that all key data -+ * with the newest kvno are at the front of the key data array. */ -+static int -+count_new_keys(int n_key_data, krb5_key_data *key_data) -+{ -+ int n; -+ -+ for (n = 1; n < n_key_data; n++) { -+ if (key_data[n - 1].key_data_kvno != key_data[n].key_data_kvno) -+ return n; -+ } -+ return n_key_data; -+} -+ - kadm5_ret_t - kadm5_create_principal(void *server_handle, - kadm5_principal_ent_t entry, long mask, -@@ -1581,7 +1595,7 @@ - osa_princ_ent_rec adb; - krb5_int32 now; - kadm5_policy_ent_rec pol; -- int ret, last_pwd, have_pol = 0; -+ int ret, last_pwd, n_new_keys, have_pol = 0; - kadm5_server_handle_t handle = server_handle; - krb5_keyblock *act_mkey; - -@@ -1667,8 +1681,9 @@ - kdb->fail_auth_count = 0; - - if (keyblocks) { -- ret = decrypt_key_data(handle->context, -- kdb->n_key_data, kdb->key_data, -+ /* Return only the new keys added by krb5_dbe_crk. */ -+ n_new_keys = count_new_keys(kdb->n_key_data, kdb->key_data); -+ ret = decrypt_key_data(handle->context, n_new_keys, kdb->key_data, - keyblocks, n_keys); - if (ret) - goto done; diff --git a/security/mit-krb5/patches/patch-CVE-2014-5353 b/security/mit-krb5/patches/patch-CVE-2014-5353 deleted file mode 100644 index 52d8e26669716..0000000000000 --- a/security/mit-krb5/patches/patch-CVE-2014-5353 +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-CVE-2014-5353,v 1.1 2015/02/25 22:28:58 tez Exp $ - -Fix for CVE-2014-5353 from: -https://github.com/krb5/krb5/commit/5fbb56c4624df9e6b0d0a80f46e5ad37eb79c6c0 - - ---- plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c.orig 2015-02-25 18:57:47.261119800 +0000 -+++ plugins/kdb/ldap/libkdb_ldap/ldap_pwd_policy.c -@@ -261,9 +261,9 @@ krb5_ldap_get_password_policy_from_dn(kr - #endif /**************** END IFDEF'ed OUT *******************************/ - - ent=ldap_first_entry(ld, result); -- if (ent != NULL) { -- if ((st = populate_policy(context, ld, ent, pol_name, *policy)) != 0) -- goto cleanup; -+ if (ent == NULL) { -+ st = KRB5_KDB_NOENTRY; -+ goto cleanup; - #if 0 /************** Begin IFDEF'ed OUT *******************************/ - krb5_ldap_get_value(ld, ent, "krbmaxpwdlife", &((*policy)->pw_max_life)); - krb5_ldap_get_value(ld, ent, "krbminpwdlife", &((*policy)->pw_min_life)); -@@ -279,6 +279,7 @@ krb5_ldap_get_password_policy_from_dn(kr - ld); - #endif /**************** END IFDEF'ed OUT *******************************/ - } -+ st = populate_policy(context, ld, ent, pol_name, *policy); - - cleanup: - ldap_msgfree(result); diff --git a/security/mit-krb5/patches/patch-CVE-2014-5355 b/security/mit-krb5/patches/patch-CVE-2014-5355 deleted file mode 100644 index b4bb8c4cb8126..0000000000000 --- a/security/mit-krb5/patches/patch-CVE-2014-5355 +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-CVE-2014-5355,v 1.1 2015/02/25 22:28:58 tez Exp $ - -Patch for CVE-2014-5355 from: -https://github.com/krb5/krb5/commit/102bb6ebf20f9174130c85c3b052ae104e5073ec - - ---- ./appl/user_user/server.c.orig 2015-02-25 21:22:16.608302700 +0000 -+++ ./appl/user_user/server.c -@@ -113,8 +113,10 @@ int main(argc, argv) - } - #endif - -+ /* principal name must be sent null-terminated. */ - retval = krb5_read_message(context, (krb5_pointer) &sock, &pname_data); -- if (retval) { -+ if (retval || pname_data.length == 0 || -+ pname_data.data[pname_data.length - 1] != '\0') { - com_err ("uu-server", retval, "reading pname"); - return 2; - } - ---- ./lib/krb5/krb/recvauth.c.orig 2015-02-25 21:24:52.754211700 +0000 -+++ ./lib/krb5/krb/recvauth.c -@@ -59,6 +59,7 @@ recvauth_common(krb5_context context, - krb5_rcache rcache = 0; - krb5_octet response; - krb5_data null_server; -+ krb5_data d; - int need_error_free = 0; - int local_rcache = 0, local_authcon = 0; - -@@ -77,7 +78,8 @@ recvauth_common(krb5_context context, - */ - if ((retval = krb5_read_message(context, fd, &inbuf))) - return(retval); -- if (strcmp(inbuf.data, sendauth_version)) { -+ d = make_data((char *)sendauth_version, strlen(sendauth_version) + 1); -+ if (!data_eq(inbuf, d)) { - problem = KRB5_SENDAUTH_BADAUTHVERS; - response = 1; - } -@@ -93,8 +95,9 @@ recvauth_common(krb5_context context, - */ - if ((retval = krb5_read_message(context, fd, &inbuf))) - return(retval); -- if (appl_version && strcmp(inbuf.data, appl_version)) { -- if (!problem) { -+ if (appl_version != NULL && !problem) { -+ d = make_data(appl_version, strlen(appl_version) + 1); -+ if (!data_eq(inbuf, d)) { - problem = KRB5_SENDAUTH_BADAPPLVERS; - response = 2; - } diff --git a/security/mit-krb5/patches/patch-ak b/security/mit-krb5/patches/patch-Makefile.in similarity index 50% rename from security/mit-krb5/patches/patch-ak rename to security/mit-krb5/patches/patch-Makefile.in index a7f7610d7ce76..4b64c9cc03035 100644 --- a/security/mit-krb5/patches/patch-ak +++ b/security/mit-krb5/patches/patch-Makefile.in @@ -1,19 +1,32 @@ -$NetBSD: patch-ak,v 1.3 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-Makefile.in,v 1.1 2016/03/15 15:16:39 tez Exp $ -Don't build kadm5_hook and avoid libtool problem. +Don't build plugin examples & tests and avoid libtool problem. No idea why... copied from previous instance of this package. ---- Makefile.in.orig 2012-05-31 23:49:44.000000000 +0000 +--- Makefile.in.orig 2016-02-29 19:50:13.000000000 +0000 +++ Makefile.in -@@ -9,7 +9,6 @@ mydir=. - # plugins/authdata/greet +@@ -9,20 +9,11 @@ mydir=. SUBDIRS=util include lib \ @sam2_plugin@ \ + plugins/audit \ +- plugins/audit/test \ + @audit_plugin@ \ - plugins/kadm5_hook/test \ +- plugins/hostrealm/test \ +- plugins/localauth/test \ +- plugins/pwqual/test \ +- plugins/authdata/greet_server \ +- plugins/authdata/greet_client \ plugins/kdb/db2 \ @ldap_plugin_dir@ \ +- plugins/kdb/test \ + plugins/preauth/otp \ plugins/preauth/pkinit \ -@@ -64,7 +63,7 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROO +- plugins/preauth/test \ + plugins/tls/k5tls \ + kdc kadmin slave clients appl tests \ + config-files build-tools man doc @po@ +@@ -75,7 +66,7 @@ INSTALLMKDIRS = $(KRB5ROOT) $(KRB5MANROO install-strip: $(MAKE) install INSTALL_STRIP=-s @@ -22,7 +35,7 @@ No idea why... copied from previous instance of this package. install-mkdirs: @for i in $(INSTALLMKDIRS); do \ -@@ -75,7 +74,7 @@ install-headers-mkdirs: +@@ -86,7 +77,7 @@ install-headers-mkdirs: $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR) $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssapi $(srcdir)/config/mkinstalldirs $(DESTDIR)$(KRB5_INCDIR)/gssrpc diff --git a/security/mit-krb5/patches/patch-aa b/security/mit-krb5/patches/patch-aa index 1999f5214602b..a591c5cf0c9da 100644 --- a/security/mit-krb5/patches/patch-aa +++ b/security/mit-krb5/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-aa,v 1.5 2016/03/15 15:16:39 tez Exp $ Don't make sunpro warnings into errors (warnings are seen in gcc too) Add --enable-pkgsrc-libtool option diff --git a/security/mit-krb5/patches/patch-ae b/security/mit-krb5/patches/patch-ae index 3827e85c94d8a..f87ede6d8f71e 100644 --- a/security/mit-krb5/patches/patch-ae +++ b/security/mit-krb5/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.3 2011/03/22 23:31:04 tez Exp $ +$NetBSD: patch-ae,v 1.4 2016/03/15 15:16:39 tez Exp $ Add --enable-pkgsrc-libtool option diff --git a/security/mit-krb5/patches/patch-aj b/security/mit-krb5/patches/patch-aj index 7d31843bd247c..b5273eaeedff6 100644 --- a/security/mit-krb5/patches/patch-aj +++ b/security/mit-krb5/patches/patch-aj @@ -1,9 +1,9 @@ -$NetBSD: patch-aj,v 1.3 2011/03/22 23:31:04 tez Exp $ +$NetBSD: patch-aj,v 1.4 2016/03/15 15:16:39 tez Exp $ Add --enable-pkgsrc-libtool option ---- krb5-config.in.orig 2010-12-12 17:46:49.027864000 -0600 -+++ krb5-config.in 2010-12-12 17:48:58.611160100 -0600 +--- build-tools/krb5-config.in.orig 2010-12-12 17:46:49.027864000 -0600 ++++ build-tools/krb5-config.in 2010-12-12 17:48:58.611160100 -0600 @@ -180,6 +180,7 @@ # Ugly gross hack for our build tree lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \ diff --git a/security/mit-krb5/patches/patch-al b/security/mit-krb5/patches/patch-al index d65b33c87466b..46c19df88cab0 100644 --- a/security/mit-krb5/patches/patch-al +++ b/security/mit-krb5/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.6 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-al,v 1.7 2016/03/15 15:16:39 tez Exp $ Add DragonFly support. Fallback to LINE_MAX if BUFSIZ is not defined. diff --git a/security/mit-krb5/patches/patch-cf b/security/mit-krb5/patches/patch-cf index 97f8a45702173..c75c9b402db5d 100644 --- a/security/mit-krb5/patches/patch-cf +++ b/security/mit-krb5/patches/patch-cf @@ -1,4 +1,4 @@ -$NetBSD: patch-cf,v 1.2 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-cf,v 1.3 2016/03/15 15:16:39 tez Exp $ Add needed headers diff --git a/security/mit-krb5/patches/patch-cg b/security/mit-krb5/patches/patch-cg index f62ac75c887b5..d531279e6eb74 100644 --- a/security/mit-krb5/patches/patch-cg +++ b/security/mit-krb5/patches/patch-cg @@ -1,4 +1,4 @@ -$NetBSD: patch-cg,v 1.2 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-cg,v 1.3 2016/03/15 15:16:39 tez Exp $ Add two files that need to be generated and otherwise are not diff --git a/security/mit-krb5/patches/patch-cj b/security/mit-krb5/patches/patch-cj index aedd0c53bcbf8..c32fd33d01f65 100644 --- a/security/mit-krb5/patches/patch-cj +++ b/security/mit-krb5/patches/patch-cj @@ -1,4 +1,4 @@ -$NetBSD: patch-cj,v 1.1 2011/03/22 23:31:05 tez Exp $ +$NetBSD: patch-cj,v 1.2 2016/03/15 15:16:39 tez Exp $ Add --enable-pkgsrc-libtool option diff --git a/security/mit-krb5/patches/patch-ad b/security/mit-krb5/patches/patch-config_lib.in similarity index 84% rename from security/mit-krb5/patches/patch-ad rename to security/mit-krb5/patches/patch-config_lib.in index 63cb03c82fd46..6c70388cb08c7 100644 --- a/security/mit-krb5/patches/patch-ad +++ b/security/mit-krb5/patches/patch-config_lib.in @@ -1,11 +1,12 @@ -$NetBSD: patch-ad,v 1.6 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-config_lib.in,v 1.1 2016/03/15 15:16:39 tez Exp $ Add --enable-pkgsrc-libtool option +(was patch-ad) ---- config/lib.in.orig 2012-05-31 23:49:44.000000000 +0000 +--- config/lib.in.orig 2016-02-29 19:50:13.000000000 +0000 +++ config/lib.in -@@ -29,8 +29,9 @@ LIBPREFIX=lib - # STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc... +@@ -21,8 +21,9 @@ LIBPREFIX=lib + SHOBJLISTS=$(STOBJLISTS:.ST=.SH) PFOBJLISTS=$(STOBJLISTS:.ST=.PF) +LAOBJLISTS=$(STOBJLISTS:.ST=.LA) @@ -15,7 +16,7 @@ Add --enable-pkgsrc-libtool option # Gets invoked as $(PARSE_OBJLISTS) list-of-OBJS.*-files PARSE_OBJLISTS= set -x && $(PERL) -p -e 'BEGIN { $$SIG{__WARN__} = sub {die @_} }; $$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;' -@@ -101,6 +102,21 @@ lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS) +@@ -93,6 +94,21 @@ lib$(LIBBASE)$(PFLIBEXT): $(PFOBJLISTS) set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist $(RANLIB) $@ @@ -37,15 +38,15 @@ Add --enable-pkgsrc-libtool option $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT): lib$(LIBBASE)$(STLIBEXT) $(RM) $@ (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/lib$(LIBBASE)$(STLIBEXT) .) -@@ -128,6 +144,7 @@ clean-libs: +@@ -120,6 +136,7 @@ clean-libs: $(RM) lib$(LIBBASE)$(SHLIBSEXT) $(RM) lib$(LIBBASE)$(SHLIBEXT) $(RM) lib$(LIBBASE)$(PFLIBEXT) + $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) - $(RM) binutils.versions osf1.exports darwin.exports hpux10.exports + $(RM) binutils.versions osf1.exports darwin.exports hpux.exports clean-liblinks: -@@ -136,6 +153,7 @@ clean-liblinks: +@@ -128,6 +145,7 @@ clean-liblinks: $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT) $(RM) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(RM) $(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT) @@ -53,7 +54,7 @@ Add --enable-pkgsrc-libtool option install-libs: $(LIBINSTLIST) install-static: -@@ -156,6 +174,9 @@ install-profiled: +@@ -148,6 +166,9 @@ install-profiled: $(RM) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) $(INSTALL_DATA) lib$(LIBBASE)$(PFLIBEXT) $(DESTDIR)$(KRB5_LIBDIR) $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/lib$(LIBBASE)$(PFLIBEXT) diff --git a/security/mit-krb5/patches/patch-ci b/security/mit-krb5/patches/patch-config_libnover.in similarity index 72% rename from security/mit-krb5/patches/patch-ci rename to security/mit-krb5/patches/patch-config_libnover.in index 78947e9477476..b20fc92feacd0 100644 --- a/security/mit-krb5/patches/patch-ci +++ b/security/mit-krb5/patches/patch-config_libnover.in @@ -1,11 +1,12 @@ -$NetBSD: patch-ci,v 1.1 2011/03/22 23:31:05 tez Exp $ +$NetBSD: patch-config_libnover.in,v 1.1 2016/03/15 15:16:39 tez Exp $ Add --enable-pkgsrc-libtool option +(was patch-ci) ---- config/libnover.in.orig Sun Nov 22 12:13:29 2009 -+++ config/libnover.in Wed Jan 5 19:09:38 2011 -@@ -28,8 +28,10 @@ - # STOBJLISTS=dir1/OBJS.ST dir2/OBJS.ST etc... +--- config/libnover.in.orig 2016-02-29 19:50:13.000000000 +0000 ++++ config/libnover.in +@@ -20,8 +20,10 @@ LIBPREFIX= + SHOBJLISTS=$(STOBJLISTS:.ST=.SH) PFOBJLISTS=$(STOBJLISTS:.ST=.PF) +LAOBJLISTS=$(STOBJLISTS:.ST=.LA) @@ -16,7 +17,7 @@ Add --enable-pkgsrc-libtool option # Gets invoked as $(PARSE_OBJLISTS) list-of-OBJS.*-files PARSE_OBJLISTS= set -x && $(PERL) -p -e 'BEGIN { $$SIG{__WARN__} = sub {die @_} }; $$e=$$ARGV; $$e =~ s/OBJS\...$$//; s/^/ /; s/ $$//; s/ / $$e/g;' -@@ -91,6 +93,21 @@ +@@ -83,6 +85,25 @@ libkrb5_$(LIBBASE)$(PFLIBEXT): $(PFOBJLI set -x; objlist=`$(PARSE_OBJLISTS) $(PFOBJLISTS)` && $(AR) cq $@ $$objlist $(RANLIB) $@ @@ -24,6 +25,10 @@ Add --enable-pkgsrc-libtool option + $(RM) $@ + $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@ + ++../lib$(LIBBASE)$(LALIBEXT): ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) ++ $(RM) $@ ++ $(LN_S) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) $@ ++ +${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT): $(LAOBJLISTS) + $(RM) $@ + @echo "building $(LIBBASE) libtool archive ($(LIBMAJOR).$(LIBMINOR))" @@ -35,18 +40,18 @@ Add --enable-pkgsrc-libtool option + $(LALIB_EXPFLAGS) \ + $(LIBTOOL_TAIL) + - $(TOPLIBD)/libkrb5_$(LIBBASE)$(STLIBEXT): - $(RM) $@ - (cd $(TOPLIBD) && $(LN_S) $(RELDIR)/libkrb5_$(LIBBASE)$(STLIBEXT) .) -@@ -100,6 +117,7 @@ + # For static builds, we make a symlink in the main library directory, + # allowing the plugin library to be a dependency of the core libraries + # which use it. +@@ -101,6 +122,7 @@ all-libs: $(PLUGIN) clean-libs: $(RM) $(LIBBASE)$(DYNOBJEXT) + $(LIBTOOL) --mode=uninstall $(RM) ${TOPLIBD}/lib$(LIBBASE)$(LALIBEXT) - $(RM) binutils.versions osf1.exports darwin.exports hpux10.exports + $(RM) binutils.versions osf1.exports darwin.exports hpux.exports - install-libs: $(PLUGININST) -@@ -110,6 +128,9 @@ + clean-liblinks: +@@ -114,6 +136,9 @@ install-static: install-plugin: $(RM) $(DESTDIR)$(MODULE_INSTALL_DIR)/$(LIBBASE)$(DYNOBJEXT) $(INSTALL_SHLIB) $(LIBBASE)$(DYNOBJEXT) $(DESTDIR)$(MODULE_INSTALL_DIR) diff --git a/security/mit-krb5/patches/patch-af b/security/mit-krb5/patches/patch-config_pre.in similarity index 86% rename from security/mit-krb5/patches/patch-af rename to security/mit-krb5/patches/patch-config_pre.in index 3d7efd4eed407..081a6a1ef7ff7 100644 --- a/security/mit-krb5/patches/patch-af +++ b/security/mit-krb5/patches/patch-config_pre.in @@ -1,11 +1,11 @@ -$NetBSD: patch-af,v 1.5 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-config_pre.in,v 1.1 2016/03/15 15:16:39 tez Exp $ Add --enable-pkgsrc-libtool option Use $(ROOT_USER) in place of root ---- config/pre.in.orig 2012-05-31 23:49:44.000000000 +0000 +--- config/pre.in.orig 2016-02-29 19:50:13.000000000 +0000 +++ config/pre.in -@@ -172,6 +172,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ +@@ -168,6 +168,7 @@ PTHREAD_LIBS = @PTHREAD_LIBS@ THREAD_LINKOPTS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ @@ -13,7 +13,7 @@ Use $(ROOT_USER) in place of root CC = @CC@ CXX = @CXX@ LD = $(PURE) @LD@ -@@ -185,11 +186,12 @@ LIBS = @LIBS@ +@@ -177,11 +178,12 @@ LIBS = @LIBS@ INSTALL=@INSTALL@ INSTALL_STRIP= @@ -29,7 +29,7 @@ Use $(ROOT_USER) in place of root ## This is needed because autoconf will sometimes define @exec_prefix@ to be ## ${prefix}. prefix=@prefix@ -@@ -320,6 +322,10 @@ PROG_RPATH_FLAGS=@PROG_RPATH_FLAGS@ +@@ -312,6 +314,10 @@ PROG_RPATH_FLAGS=@PROG_RPATH_FLAGS@ # depending on whether we're building with shared libraries. DEPLIBEXT=@DEPLIBEXT@ @@ -40,7 +40,7 @@ Use $(ROOT_USER) in place of root KDB5_PLUGIN_DEPLIBS = @KDB5_PLUGIN_DEPLIBS@ KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@ -@@ -337,12 +343,12 @@ COM_ERR_DEPLIB-k5 = $(TOPLIBD)/libcom_er +@@ -329,12 +335,12 @@ COM_ERR_DEPLIB-k5 = $(TOPLIBD)/libcom_er SUPPORT_LIBNAME=krb5support SUPPORT_DEPLIB = $(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(DEPLIBEXT) @@ -56,7 +56,7 @@ Use $(ROOT_USER) in place of root KRB5_BASE_DEPLIBS = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) KDB5_DEPLIBS = $(KDB5_DEPLIB) $(KDB5_PLUGIN_DEPLIBS) -@@ -384,7 +390,7 @@ RL_LIBS = @RL_LIBS@ +@@ -373,7 +379,7 @@ RL_LIBS = @RL_LIBS@ SS_LIB = $(SS_LIB-@SS_VERSION@) SS_LIB-sys = @SS_LIB@ @@ -83,19 +83,15 @@ Use $(ROOT_USER) in place of root ## Parameters to be set by configure for use in libobj.in: -@@ -584,10 +594,15 @@ OBJLISTS=@OBJLISTS@ +@@ -584,6 +594,11 @@ OBJLISTS=@OBJLISTS@ # the suffix substitution will break on some platforms! SHLIBOBJS=$(STLIBOBJS:.o=@SHOBJEXT@) PFLIBOBJS=$(STLIBOBJS:.o=@PFOBJEXT@) +LALIBOBJS=$(STLIBOBJS:.o=@LAOBJEXT@) - - # "$(CC) -G", "$(LD) -Bshareable", etc. - LDCOMBINE=@LDCOMBINE@ - ++ +# Args to tack on the tail of LIBTOOL to generate versioned, installable +# libtool archives. +LIBTOOL_TAIL=@LIBTOOL_TAIL@ -+ + # # rules to make various types of object files - # diff --git a/security/mit-krb5/patches/patch-ag b/security/mit-krb5/patches/patch-config_shlib.conf similarity index 89% rename from security/mit-krb5/patches/patch-ag rename to security/mit-krb5/patches/patch-config_shlib.conf index 2a7ddfb17c46f..d4921e4e19497 100644 --- a/security/mit-krb5/patches/patch-ag +++ b/security/mit-krb5/patches/patch-config_shlib.conf @@ -1,8 +1,9 @@ -$NetBSD: patch-ag,v 1.10 2015/03/22 20:09:09 joerg Exp $ +$NetBSD: patch-config_shlib.conf,v 1.1 2016/03/15 15:16:39 tez Exp $ Add --enable-pkgsrc-libtool option +(was patch-ag) ---- config/shlib.conf.orig 2013-11-06 20:52:23.000000000 +0000 +--- config/shlib.conf.orig 2016-02-29 19:50:13.000000000 +0000 +++ config/shlib.conf @@ -22,6 +22,7 @@ SHLIBVEXT=.so.v-nobuild SHLIBSEXT=.so.s-nobuild @@ -42,24 +43,25 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(LDFLAGS)' if test "$ac_cv_c_compiler_gnu" = yes \ -@@ -127,16 +130,13 @@ alpha*-dec-osf*) +@@ -132,17 +135,14 @@ alpha*-dec-osf*) RPATH_FLAG='-Wl,+b,' if test "$ac_cv_c_compiler_gnu" = yes; then PICFLAGS=-fPIC - SHLIB_RPATH_FLAGS='-Wl,+b,$(SHLIB_RDIRS)' SHLIB_EXPFLAGS='-Wl,+s $(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - LDCOMBINE='gcc -fPIC -shared -Wl,+h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,-c,hpux10.exports' + LDCOMBINE='gcc -fPIC -shared -Wl,+h,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -Wl,-c,hpux.exports' else PICFLAGS=+z - SHLIB_RPATH_FLAGS='+b $(SHLIB_RDIRS)' - SHLIB_EXPFLAGS='+s $(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - LDCOMBINE='ld -b +h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -c hpux10.exports' + SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + LDCOMBINE='ld -b +h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) -c hpux.exports' fi + MAKE_SHLIB_COMMAND="${LDCOMBINE} -o \$@ \$\$objlist \$(LDFLAGS) \$(SHLIB_EXPFLAGS) ${LDCOMBINE_TAIL}" - PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' - CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,+s $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' + CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' - CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) -Wl,+s $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -166,12 +166,10 @@ mips-sgi-irix6.3) # This is a Kludge; se + CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' +@@ -172,12 +172,10 @@ mips-sgi-irix6.3) # This is a Kludge; se else LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)' fi @@ -72,7 +74,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -215,12 +213,10 @@ mips-sgi-irix*) +@@ -221,12 +219,10 @@ mips-sgi-irix*) opts='' fi LDCOMBINE='$(CC) -shared '$opts' -Wl,-soname -Wl,$(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $$initfini' @@ -85,7 +87,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -252,13 +248,11 @@ mips-sni-sysv4) +@@ -258,13 +254,11 @@ mips-sni-sysv4) PICFLAGS=-Kpic LDCOMBINE='$(CC) -G -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)' fi @@ -99,7 +101,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -274,10 +268,8 @@ mips-*-netbsd*) +@@ -280,10 +274,8 @@ mips-*-netbsd*) SHLIBSEXT='.so.$(LIBMAJOR)' SHLIBEXT=.so LDCOMBINE='ld -shared -soname $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)' @@ -110,7 +112,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -287,15 +279,13 @@ mips-*-netbsd*) +@@ -293,15 +285,13 @@ mips-*-netbsd*) PROFFLAGS=-pg ;; @@ -128,20 +130,20 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -319,12 +309,10 @@ mips-*-netbsd*) - RPATH_FLAG=-R - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - fi +@@ -322,12 +312,10 @@ mips-*-netbsd*) + esac + SHLIBVEXT='.so.$(LIBMAJOR)' + RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,' - PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)' CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' SHLIBEXT=.so LDCOMBINE='ld -Bshareable' -- SHLIB_RPATH_FLAGS='-R$(SHLIB_RDIRS)' +- SHLIB_RPATH_FLAGS='--enable-new-dtags -rpath $(SHLIB_RDIRS)' SHLIB_EXPFLAGS='$(SHLIB_RPATH_FLAGS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_STATIC='$(CXX) $(PROG_LIBPATH) $(CXXFLAGS) $(LDFLAGS)' -@@ -338,10 +326,8 @@ mips-*-netbsd*) +@@ -341,10 +329,8 @@ mips-*-netbsd*) SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' SHLIBEXT=.so LDCOMBINE='ld -Bshareable' @@ -153,7 +155,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -367,7 +353,7 @@ mips-*-netbsd*) +@@ -370,7 +356,7 @@ mips-*-netbsd*) for lib in libkrb5support.1.1.dylib libkadm5srv.5.1.dylib libkdb5.4.0.dylib; do LDCOMBINE_TAIL="$LDCOMBINE_TAIL -dylib_file \"\$(KRB5_LIBDIR)/$lib\":\$(TOPLIBD)/$lib" done @@ -162,7 +164,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) -dynamic $(CXXFLAGS) $(LDFLAGS)' -@@ -399,11 +385,9 @@ mips-*-netbsd*) +@@ -402,11 +388,9 @@ mips-*-netbsd*) SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' SHLIBSEXT='.so.$(LIBMAJOR)' SHLIBEXT=.so @@ -175,7 +177,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(PURE) $(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(PURE) $(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(PURE) $(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -426,10 +410,8 @@ mips-*-netbsd*) +@@ -429,10 +413,8 @@ mips-*-netbsd*) RPATH_FLAG='-Wl,--enable-new-dtags -Wl,-rpath -Wl,' # For cases where we do have dependencies on other libraries # built in this tree... @@ -186,7 +188,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -454,9 +436,7 @@ mips-*-netbsd*) +@@ -457,9 +439,7 @@ mips-*-netbsd*) SHLIBVEXT='.so.$(LIBMAJOR)' SHLIBEXT=.so LDCOMBINE='ld -Bshareable' @@ -196,7 +198,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS)' -@@ -486,9 +466,8 @@ mips-*-netbsd*) +@@ -489,9 +469,8 @@ mips-*-netbsd*) # Assume initialization always delayed. INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done' use_linker_fini_option=yes @@ -207,7 +209,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -523,10 +502,9 @@ mips-*-netbsd*) +@@ -526,10 +505,9 @@ mips-*-netbsd*) # Assume initialization always delayed. INIT_FINI_PREP="wl=${wl_prefix}; "'i=1; initfini=; for f in . $(LIBFINIFUNC); do if test $$f != .; then initfini="$$initfini $${wl}-binitfini::$$f:$$i"; else :; fi; i=`expr $$i + 1`; done' use_linker_fini_option=yes @@ -220,7 +222,7 @@ Add --enable-pkgsrc-libtool option CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CFLAGS) $(LDFLAGS)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' CXX_LINK_SHARED='$(CXX) $(PROG_LIBPATH) $(PROG_RPATH_FLAGS) $(CXXFLAGS) $(LDFLAGS)' -@@ -539,8 +517,14 @@ esac +@@ -542,8 +520,14 @@ esac if test "${MAKE_SHLIB_COMMAND}" = "x" ; then if test "${INIT_FINI_PREP}" != ":"; then diff --git a/security/mit-krb5/patches/patch-configure.in b/security/mit-krb5/patches/patch-configure.in index 6accca58bdf79..bfc2d03592cba 100644 --- a/security/mit-krb5/patches/patch-configure.in +++ b/security/mit-krb5/patches/patch-configure.in @@ -1,15 +1,15 @@ -$NetBSD: patch-configure.in,v 1.1 2015/05/26 13:56:16 jperkin Exp $ +$NetBSD: patch-configure.in,v 1.2 2016/03/15 15:16:39 tez Exp $ Find the correct libcrypto. ---- configure.in.orig 2013-11-06 20:52:23.000000000 +0000 +--- configure.in.orig 2016-02-29 19:50:13.000000000 +0000 +++ configure.in -@@ -202,7 +202,7 @@ AC_MSG_RESULT("pkinit will use \'$withva +@@ -277,7 +277,7 @@ AC_MSG_NOTICE(pkinit will use '$withval' ], withval=$PKINIT_CRYPTO_IMPL) case "$withval" in builtin|openssl) - AC_CHECK_LIB(crypto, PKCS7_get_signer_info, PKINIT_CRYPTO_IMPL_LIBS=-lcrypto) + AC_CHECK_LIB(crypto, PKCS7_get_signer_info, PKINIT_CRYPTO_IMPL_LIBS="-L${BUILDLINK_PREFIX_OPENSSL}/lib -lcrypto") PKINIT_CRYPTO_IMPL=openssl - ;; - nss) + AC_CHECK_LIB(crypto, CMS_get0_content, + [AC_DEFINE([HAVE_OPENSSL_CMS], 1, diff --git a/security/mit-krb5/patches/patch-ah b/security/mit-krb5/patches/patch-include_osconf.hin similarity index 59% rename from security/mit-krb5/patches/patch-ah rename to security/mit-krb5/patches/patch-include_osconf.hin index a4a2a4409dadf..63a8b10ce4550 100644 --- a/security/mit-krb5/patches/patch-ah +++ b/security/mit-krb5/patches/patch-include_osconf.hin @@ -1,27 +1,24 @@ -$NetBSD: patch-ah,v 1.3 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-include_osconf.hin,v 1.1 2016/03/15 15:16:39 tez Exp $ -prefer @SYSCONFDIR as location for krb5.conf and krb5.keytab +prefer @SYSCONFDIR as location for krb5.conf +(was patch-ah) ---- include/osconf.hin.orig 2012-05-31 23:49:44.000000000 +0000 +--- include/osconf.hin.orig 2016-02-29 19:50:13.000000000 +0000 +++ include/osconf.hin -@@ -45,16 +45,16 @@ - #define DEFAULT_KEYTAB_NAME "FILE:%s\\krb5kt" +@@ -44,13 +44,13 @@ + #define DEFAULT_PROFILE_FILENAME "krb5.ini" #else /* !_WINDOWS */ #if TARGET_OS_MAC --#define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:@SYSCONFDIR/krb5.conf" +-#define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf@SYSCONFCONF" -#define DEFAULT_PROFILE_PATH ("~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH) -+#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:@SYSCONFDIR/krb5.conf" ++#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf" +#define DEFAULT_PROFILE_PATH ("@SYSCONFDIR/krb5.conf:~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH) #define KRB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosFrameworkPlugins" #define KDB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosDatabasePlugins" #define KRB5_AUTHDATA_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosAuthDataPlugins" #else --#define DEFAULT_SECURE_PROFILE_PATH "/etc/krb5.conf:@SYSCONFDIR/krb5.conf" +-#define DEFAULT_SECURE_PROFILE_PATH "/etc/krb5.conf@SYSCONFCONF" +#define DEFAULT_SECURE_PROFILE_PATH "@SYSCONFDIR/krb5.conf:/etc/krb5.conf" #define DEFAULT_PROFILE_PATH DEFAULT_SECURE_PROFILE_PATH #endif --#define DEFAULT_KEYTAB_NAME "FILE:/etc/krb5.keytab" -+#define DEFAULT_KEYTAB_NAME "FILE:@SYSCONFDIR/krb5.keytab" #endif /* _WINDOWS */ - - #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins" diff --git a/security/mit-krb5/patches/patch-kadmin_dbutil_dump.c b/security/mit-krb5/patches/patch-kadmin_dbutil_dump.c deleted file mode 100644 index c66082583243c..0000000000000 --- a/security/mit-krb5/patches/patch-kadmin_dbutil_dump.c +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-kadmin_dbutil_dump.c,v 1.1 2012/12/22 02:28:30 joerg Exp $ - ---- kadmin/dbutil/dump.c.orig 2012-12-21 21:08:47.000000000 +0000 -+++ kadmin/dbutil/dump.c -@@ -1573,6 +1573,7 @@ process_k5beta_record(fname, kcontext, f - error++; - } - /* Read the key type */ -+ tmpint1 = 0; - if (!error && (fscanf(filep, "\t%d\t", &tmpint1) != 1)) { - try2read = read_key_type; - error++; -@@ -1605,6 +1606,7 @@ process_k5beta_record(fname, kcontext, f - } - - /* Read principal attributes */ -+ tmpint3 = 0; - if (!error && (fscanf(filep, - "\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t%u\t", - &tmpint1, &dbent->max_life, diff --git a/security/mit-krb5/patches/patch-ck b/security/mit-krb5/patches/patch-lib_apputils_Makefile.in similarity index 63% rename from security/mit-krb5/patches/patch-ck rename to security/mit-krb5/patches/patch-lib_apputils_Makefile.in index baaaeb12c6337..e9b362a653575 100644 --- a/security/mit-krb5/patches/patch-ck +++ b/security/mit-krb5/patches/patch-lib_apputils_Makefile.in @@ -1,12 +1,13 @@ -$NetBSD: patch-ck,v 1.4 2015/03/22 20:09:09 joerg Exp $ +$NetBSD: patch-lib_apputils_Makefile.in,v 1.1 2016/03/15 15:16:39 tez Exp $ libapputils is an internal library, so make it a convenience libtool archive. +(was patch-ck) ---- lib/apputils/Makefile.in.orig 2013-11-06 20:52:23.000000000 +0000 +--- lib/apputils/Makefile.in.orig 2016-02-29 19:50:13.000000000 +0000 +++ lib/apputils/Makefile.in -@@ -16,6 +16,9 @@ DEFS= +@@ -14,6 +14,9 @@ SED = sed + STLIBOBJS=net-server.o @LIBOBJS@ - STOBJLISTS=OBJS.ST LIBBASE=apputils +LIBTOOL_TAIL= +PROG_RPATH= ${KRB5_LIBDIR} diff --git a/security/mit-krb5/patches/patch-lib_apputils_net-server.c b/security/mit-krb5/patches/patch-lib_apputils_net-server.c index f289908d36553..bda61f6476334 100644 --- a/security/mit-krb5/patches/patch-lib_apputils_net-server.c +++ b/security/mit-krb5/patches/patch-lib_apputils_net-server.c @@ -1,4 +1,4 @@ -$NetBSD: patch-lib_apputils_net-server.c,v 1.1 2013/08/30 12:59:22 joerg Exp $ +$NetBSD: patch-lib_apputils_net-server.c,v 1.2 2016/03/15 15:16:39 tez Exp $ --- lib/apputils/net-server.c.orig 2013-08-30 12:14:00.000000000 +0000 +++ lib/apputils/net-server.c diff --git a/security/mit-krb5/patches/patch-lib_krb5_asn.1_asn1buf.h b/security/mit-krb5/patches/patch-lib_krb5_asn.1_asn1buf.h index 72349c31b694f..e2c7f9cdaf253 100644 --- a/security/mit-krb5/patches/patch-lib_krb5_asn.1_asn1buf.h +++ b/security/mit-krb5/patches/patch-lib_krb5_asn.1_asn1buf.h @@ -1,15 +1,15 @@ -$NetBSD: patch-lib_krb5_asn.1_asn1buf.h,v 1.1 2011/06/01 09:57:23 adam Exp $ +$NetBSD: patch-lib_krb5_asn.1_asn1buf.h,v 1.2 2016/03/15 15:16:39 tez Exp $ Clang does not like this kind of inlines. ---- lib/krb5/asn.1/asn1buf.h.orig 2011-06-01 09:47:31.000000000 +0000 +--- lib/krb5/asn.1/asn1buf.h.orig 2016-02-29 19:50:13.000000000 +0000 +++ lib/krb5/asn.1/asn1buf.h -@@ -147,7 +147,7 @@ asn1_error_code asn1buf_insert_octet(asn +@@ -107,7 +107,7 @@ void asn1buf_destroy(asn1buf **buf); * effects Inserts o into the buffer *buf, expanding the buffer if * necessary. Returns ENOMEM memory is exhausted. */ -#if ((__GNUC__ >= 2) && !defined(ASN1BUF_OMIT_INLINE_FUNCS)) && !defined(CONFIG_SMALL) +#if ((__GNUC__ >= 2) && !defined(__clang__) && !defined(ASN1BUF_OMIT_INLINE_FUNCS)) && !defined(CONFIG_SMALL) - extern __inline__ asn1_error_code asn1buf_insert_octet(asn1buf *buf, const int o) + static inline asn1_error_code + asn1buf_insert_octet(asn1buf *buf, const int o) { - asn1_error_code retval; diff --git a/security/mit-krb5/patches/patch-ch b/security/mit-krb5/patches/patch-plugins_kdb_db2_Makefile.in similarity index 70% rename from security/mit-krb5/patches/patch-ch rename to security/mit-krb5/patches/patch-plugins_kdb_db2_Makefile.in index c67f3650edb4b..ed5c207076dfd 100644 --- a/security/mit-krb5/patches/patch-ch +++ b/security/mit-krb5/patches/patch-plugins_kdb_db2_Makefile.in @@ -1,10 +1,11 @@ -$NetBSD: patch-ch,v 1.2 2012/07/16 19:12:33 adam Exp $ +$NetBSD: patch-plugins_kdb_db2_Makefile.in,v 1.1 2016/03/15 15:16:39 tez Exp $ Add --enable-pkgsrc-libtool option +(was patch-ch) ---- plugins/kdb/db2/Makefile.in.orig 2009-11-22 12:13:29.000000000 -0600 -+++ plugins/kdb/db2/Makefile.in 2011-01-04 17:08:39.419207800 -0600 -@@ -35,8 +35,8 @@ +--- plugins/kdb/db2/Makefile.in.orig 2016-02-29 19:50:13.000000000 +0000 ++++ plugins/kdb/db2/Makefile.in +@@ -29,8 +29,8 @@ RELDIR=../plugins/kdb/db2 # Also on gssrpc, for xdr stuff. SHLIB_EXPDEPS = \ $(GSSRPC_DEPLIBS) \ @@ -14,8 +15,8 @@ Add --enable-pkgsrc-libtool option + $(TOPLIBD)/libkrb5$(DEPLIBEXT) SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB) $(KADMSRV_LIBS) $(SUPPORT_LIB) $(LIBS) @DB_EXTRA_LIBS@ - SHLIB_DIRS=-L$(TOPLIBD) -@@ -47,7 +47,7 @@ + DBDIR = libdb2 +@@ -38,7 +38,7 @@ DBOBJLISTS = $(DBOBJLISTS-@DB_VERSION@) DBOBJLISTS-sys = DBOBJLISTS-k5 = $(DBDIR)/hash/OBJS.ST $(DBDIR)/btree/OBJS.ST \ $(DBDIR)/db/OBJS.ST $(DBDIR)/mpool/OBJS.ST $(DBDIR)/recno/OBJS.ST @@ -24,7 +25,7 @@ Add --enable-pkgsrc-libtool option SRCS= \ $(srcdir)/kdb_xdr.c \ -@@ -58,7 +58,7 @@ +@@ -49,7 +49,7 @@ SRCS= \ $(srcdir)/db2_exp.c \ $(srcdir)/lockout.c diff --git a/security/mit-krb5/patches/patch-plugins_kdb_db2_libdb2_Makefile.in b/security/mit-krb5/patches/patch-plugins_kdb_db2_libdb2_Makefile.in new file mode 100644 index 0000000000000..20728073f36ce --- /dev/null +++ b/security/mit-krb5/patches/patch-plugins_kdb_db2_libdb2_Makefile.in @@ -0,0 +1,22 @@ +$NetBSD: patch-plugins_kdb_db2_libdb2_Makefile.in,v 1.1 2016/03/15 15:16:39 tez Exp $ + +Add --enable-pkgsrc-libtool option + +--- plugins/kdb/db2/libdb2/Makefile.in.orig 2016-02-29 19:50:13.000000000 +0000 ++++ plugins/kdb/db2/libdb2/Makefile.in +@@ -1,12 +1,12 @@ + mydir=plugins$(S)kdb$(S)db2$(S)libdb2 + BUILDTOP=$(REL)..$(S)..$(S)..$(S).. +-SUBDIRS=hash btree db mpool recno test ++SUBDIRS=hash btree db mpool recno + + LIBBASE=db + LIBMAJOR=1 + LIBMINOR=1 +-STOBJLISTS=hash/OBJS.ST btree/OBJS.ST db/OBJS.ST mpool/OBJS.ST \ +- recno/OBJS.ST ++STOBJLISTS=hash/OBJS.LA btree/OBJS.LA db/OBJS.LA mpool/OBJS.LA \ ++ recno/OBJS.LA + SUBDIROBJLISTS=$(STOBJLISTS) + RELDIR=../plugins/kdb/db2/libdb2 + diff --git a/security/mit-krb5/patches/patch-plugins_preauth_otp_Makefile.in b/security/mit-krb5/patches/patch-plugins_preauth_otp_Makefile.in new file mode 100644 index 0000000000000..a3a627ab2f5be --- /dev/null +++ b/security/mit-krb5/patches/patch-plugins_preauth_otp_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-plugins_preauth_otp_Makefile.in,v 1.1 2016/03/15 15:16:39 tez Exp $ + +--- plugins/preauth/otp/Makefile.in.orig 2016-03-02 15:29:43.595168500 +0000 ++++ plugins/preauth/otp/Makefile.in +@@ -8,7 +8,7 @@ LIBMINOR=0 + RELDIR=../plugins/preauth/otp + + SHLIB_EXPDEPS = $(VERTO_DEPLIBS) $(KRB5_BASE_DEPLIBS) \ +- $(TOPLIBD)/libkrad$(SHLIBEXT) ++ $(TOPLIBD)/libkrad$(DEPLIBEXT) + + SHLIB_EXPLIBS= -lkrad $(VERTO_LIBS) $(KRB5_BASE_LIBS) + diff --git a/security/mit-krb5/patches/patch-plugins_preauth_pkinit_Makefile.in b/security/mit-krb5/patches/patch-plugins_preauth_pkinit_Makefile.in new file mode 100644 index 0000000000000..680d589d7ae93 --- /dev/null +++ b/security/mit-krb5/patches/patch-plugins_preauth_pkinit_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-plugins_preauth_pkinit_Makefile.in,v 1.1 2016/03/15 15:16:39 tez Exp $ + +--- plugins/preauth/pkinit/Makefile.in.orig 2016-03-02 15:30:03.611463900 +0000 ++++ plugins/preauth/pkinit/Makefile.in +@@ -9,8 +9,8 @@ LIBMINOR=0 + RELDIR=../plugins/preauth/pkinit + # Depends on libk5crypto and libkrb5 + SHLIB_EXPDEPS = \ +- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \ +- $(TOPLIBD)/libkrb5$(SHLIBEXT) ++ $(TOPLIBD)/libk5crypto$(DEPLIBEXT) \ ++ $(TOPLIBD)/libkrb5$(DEPLIBEXT) + SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(PKINIT_CRYPTO_IMPL_LIBS) $(DL_LIB) $(SUPPORT_LIB) $(LIBS) + DEFINES=-DPKINIT_DYNOBJEXT=\""$(PKINIT_DYNOBJEXT)"\" + diff --git a/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c b/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c index c1d355f02c2de..60eca2cce9d89 100644 --- a/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c +++ b/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c @@ -1,15 +1,15 @@ -$NetBSD: patch-util_k5ev_verto-k5ev.c,v 1.2 2013/03/13 12:35:40 adam Exp $ +$NetBSD: patch-util_k5ev_verto-k5ev.c,v 1.3 2016/03/15 15:16:39 tez Exp $ Fix include file path ---- util/k5ev/verto-k5ev.c.orig 2013-03-02 01:05:38.000000000 +0000 -+++ util/k5ev/verto-k5ev.c -@@ -34,7 +34,7 @@ +--- util/verto/verto-k5ev.c.orig 2016-02-29 19:50:13.000000000 +0000 ++++ util/verto/verto-k5ev.c +@@ -35,7 +35,7 @@ - #include "verto-k5ev.h" + #include #include -#include "rename.h" +#include "gssrpc/rename.h" - #include "autoconf.h" #define EV_STANDALONE 1 /* Avoid using clock_gettime, which would create a dependency on librt. */ + #define EV_USE_MONOTONIC 0 diff --git a/security/mit-krb5/patches/patch-util_ss_Makefile.in b/security/mit-krb5/patches/patch-util_ss_Makefile.in index 5f3c2a421dff9..c0a38d2d7da37 100644 --- a/security/mit-krb5/patches/patch-util_ss_Makefile.in +++ b/security/mit-krb5/patches/patch-util_ss_Makefile.in @@ -1,15 +1,15 @@ -$NetBSD: patch-util_ss_Makefile.in,v 1.2 2016/03/10 18:21:58 jperkin Exp $ +$NetBSD: patch-util_ss_Makefile.in,v 1.3 2016/03/15 15:16:39 tez Exp $ Only build a static library as this library is not installed. ---- util/ss/Makefile.in.orig 2013-11-06 20:52:23.000000000 +0000 +--- util/ss/Makefile.in.orig 2016-02-29 19:50:13.000000000 +0000 +++ util/ss/Makefile.in -@@ -14,6 +14,8 @@ LIBBASE=ss +@@ -13,6 +13,8 @@ LIBBASE=ss LIBMAJOR=1 LIBMINOR=0 RELDIR=../util/ss +LIBTOOL_TAIL=-static +SHLIB_RDIRS=${KRB5_LIBDIR} - STOBJLISTS=OBJS.ST - + clean-unix:: clean-liblinks clean-libs clean-libobjs + install-unix:: install-libs From 3e266a95421d25f398649bc797065ece58597fbd Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:18:26 +0000 Subject: [PATCH 0162/2457] Update ruby-childprocess to 0.5.9. Shut down the test processes. --- sysutils/ruby-childprocess/Makefile | 4 ++-- sysutils/ruby-childprocess/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sysutils/ruby-childprocess/Makefile b/sysutils/ruby-childprocess/Makefile index 028debe4bbb40..8176ac934d89d 100644 --- a/sysutils/ruby-childprocess/Makefile +++ b/sysutils/ruby-childprocess/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2015/12/13 15:25:09 taca Exp $ +# $NetBSD: Makefile,v 1.7 2016/03/15 15:18:26 taca Exp $ -DISTNAME= childprocess-0.5.8 +DISTNAME= childprocess-0.5.9 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} CATEGORIES= ruby sysutils diff --git a/sysutils/ruby-childprocess/distinfo b/sysutils/ruby-childprocess/distinfo index 0407f785c8470..176bb10c9a777 100644 --- a/sysutils/ruby-childprocess/distinfo +++ b/sysutils/ruby-childprocess/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2015/12/13 15:25:09 taca Exp $ +$NetBSD: distinfo,v 1.6 2016/03/15 15:18:26 taca Exp $ -SHA1 (childprocess-0.5.8.gem) = a851a4c7bfe5f6c8c03beabce5807e5077dee7c3 -RMD160 (childprocess-0.5.8.gem) = 0ca9afcc7822a76163fa87e6d62a0fb90c882a71 -SHA512 (childprocess-0.5.8.gem) = e2871861f727945ee3635364152acbb4229f5b896039f28a9735f5c42230180e4142e7ee1473cd43724483cd63c93d58502e48c9f6554e1b3036dc3f82141a56 -Size (childprocess-0.5.8.gem) = 29184 bytes +SHA1 (childprocess-0.5.9.gem) = dcf487a03be6740dd26009ca0cd0ed1aebc26de6 +RMD160 (childprocess-0.5.9.gem) = 0402a3d94375071344eef2fd867860a61484ff4c +SHA512 (childprocess-0.5.9.gem) = 5a671e59d19531347438dc149d5309218c7e439cfd0bfcfe201ae8e1099a2608a0170f9a3f3752fb709afc6b68fa3a10dc60d0632af545a9ba71483c7be2c21d +Size (childprocess-0.5.9.gem) = 29184 bytes From a4afd7f873662573a44925351caaa9ed1abcd8a5 Mon Sep 17 00:00:00 2001 From: mef Date: Tue, 15 Mar 2016 15:19:03 +0000 Subject: [PATCH 0163/2457] Added cad/klayout version 0.24.5 --- cad/Makefile | 3 ++- doc/CHANGES-2016 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cad/Makefile b/cad/Makefile index 0de19d77cd10d..72905bc024d0d 100644 --- a/cad/Makefile +++ b/cad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2016/02/03 19:42:38 bouyer Exp $ +# $NetBSD: Makefile,v 1.84 2016/03/15 15:19:03 mef Exp $ # COMMENT= CAD tools @@ -38,6 +38,7 @@ SUBDIR+= kicad-doc SUBDIR+= kicad-footprints SUBDIR+= kicad-i18n SUBDIR+= kicad-lib +SUBDIR+= klayout SUBDIR+= librecad SUBDIR+= libwcalc SUBDIR+= magic diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index db36e09ff9eb4..66b2605959cc7 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1197 2016/03/15 15:16:21 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1198 2016/03/15 15:19:03 mef Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1587,3 +1587,4 @@ Changes to the packages collection and infrastructure in 2016: Updated print/ruby-prawn to 2.1.0 [taca 2016-03-15] Updated security/ruby-bcrypt to 3.1.11 [taca 2016-03-15] Updated security/ruby-oauth to 0.5.1 [taca 2016-03-15] + Added cad/klayout version 0.24.5 [mef 2016-03-15] From 5d65e41749dcdfa83c84f4189826d2f1910f0500 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:20:13 +0000 Subject: [PATCH 0164/2457] Note Updated sysutils/ruby-childprocess to 0.5.9. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 66b2605959cc7..7cf5479b4ca71 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1198 2016/03/15 15:19:03 mef Exp $ +$NetBSD: CHANGES-2016,v 1.1199 2016/03/15 15:20:13 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1588,3 +1588,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/ruby-bcrypt to 3.1.11 [taca 2016-03-15] Updated security/ruby-oauth to 0.5.1 [taca 2016-03-15] Added cad/klayout version 0.24.5 [mef 2016-03-15] + Updated sysutils/ruby-childprocess to 0.5.9 [taca 2016-03-15] From 936d7a0246221a30ec33e48fea44c59123b1160b Mon Sep 17 00:00:00 2001 From: tez Date: Tue, 15 Mar 2016 15:22:38 +0000 Subject: [PATCH 0165/2457] Missed one checksum update... fixed. --- security/mit-krb5/distinfo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/mit-krb5/distinfo b/security/mit-krb5/distinfo index 447263ed07d93..27e1598338a70 100644 --- a/security/mit-krb5/distinfo +++ b/security/mit-krb5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2016/03/15 15:16:39 tez Exp $ +$NetBSD: distinfo,v 1.57 2016/03/15 15:22:38 tez Exp $ SHA1 (krb5-1.14.1.tar.gz) = f12dc3b8630fd1fefb7058cd782754489377308b RMD160 (krb5-1.14.1.tar.gz) = 3e32a0cd365474deeeb563831b7e408f9158b36a @@ -26,4 +26,4 @@ SHA1 (patch-plugins_kdb_db2_libdb2_Makefile.in) = b4b7e8e4192b5e5318f1e42c493157 SHA1 (patch-plugins_preauth_otp_Makefile.in) = 8c779e3b37cab4138f300f4a09325387092c79f8 SHA1 (patch-plugins_preauth_pkinit_Makefile.in) = ff56050dc6a31468977c16b192b4f5d2d79764c2 SHA1 (patch-util_k5ev_verto-k5ev.c) = 4f148a369d1634234a90c348e6b8dc366cd6773d -SHA1 (patch-util_ss_Makefile.in) = 61b7efd68b10cbd7bedbdde523e96ae2a0ef3dfc +SHA1 (patch-util_ss_Makefile.in) = f561b3689021b2b2db895228c717b4cdf7fbc32a From 6cdeece0466b54ee574cd2df206f157279704d77 Mon Sep 17 00:00:00 2001 From: tez Date: Tue, 15 Mar 2016 15:24:07 +0000 Subject: [PATCH 0166/2457] Update mit-kbr5 to 1.14.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 7cf5479b4ca71..0c509190e416c 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1199 2016/03/15 15:20:13 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1200 2016/03/15 15:24:07 tez Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1589,3 +1589,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/ruby-oauth to 0.5.1 [taca 2016-03-15] Added cad/klayout version 0.24.5 [mef 2016-03-15] Updated sysutils/ruby-childprocess to 0.5.9 [taca 2016-03-15] + Updated security/mit-krb5 to 1.14.1 [tez 2016-03-15] From 83a4032c199d64bc81132b94f65e9837ecffd48e Mon Sep 17 00:00:00 2001 From: tez Date: Tue, 15 Mar 2016 15:24:36 +0000 Subject: [PATCH 0167/2457] mit-krb5 update done --- doc/TODO | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/TODO b/doc/TODO index 60fce2355b292..f98e8236341a7 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15598 2016/03/15 13:45:29 szptvlfn Exp $ +$NetBSD: TODO,v 1.15599 2016/03/15 15:24:36 tez Exp $ Suggested new packages ====================== @@ -1155,7 +1155,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o mini_sendmail-1.3.9 o minivmac-3.2.3 o miredo-1.2.4 - o mit-krb5-1.12.1 o mit-scheme-bin-9.2 o mksh-52b o mkvtoolnix-5.9.0 From a7cb901d0add29b8f88d0bbf6aef287fd3894d31 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:28:05 +0000 Subject: [PATCH 0168/2457] Update ruby-facter to 2.4.6. * (FACT-959) Incorrect processor counts on Windows * (FACT-1286) Only return files, never directories * (FACT-765) Constrain windows `id` gid resolution * (FACT-704) Fix docker detection for systemd slices * (maint) Remove rubygems_version from gemspec. --- sysutils/ruby-facter/Makefile | 4 ++-- sysutils/ruby-facter/PLIST | 3 ++- sysutils/ruby-facter/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sysutils/ruby-facter/Makefile b/sysutils/ruby-facter/Makefile index ab64fccec54ae..dbb01b593225b 100644 --- a/sysutils/ruby-facter/Makefile +++ b/sysutils/ruby-facter/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2015/06/10 14:45:09 taca Exp $ +# $NetBSD: Makefile,v 1.28 2016/03/15 15:28:05 taca Exp $ -DISTNAME= facter-2.4.4 +DISTNAME= facter-2.4.6 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} CATEGORIES= sysutils diff --git a/sysutils/ruby-facter/PLIST b/sysutils/ruby-facter/PLIST index ba535151bb2cb..3410095a8bea2 100644 --- a/sysutils/ruby-facter/PLIST +++ b/sysutils/ruby-facter/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2015/06/10 14:45:09 taca Exp $ +@comment $NetBSD: PLIST,v 1.25 2016/03/15 15:28:05 taca Exp $ bin/facter${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/COMMITTERS.md @@ -362,6 +362,7 @@ ${GEM_LIBDIR}/spec/fixtures/unit/zpool_version/solaris_11 ${GEM_LIBDIR}/spec/fixtures/unit/zpool_version/zfsonlinux_0.6.1 ${GEM_LIBDIR}/spec/fixtures/virtual/proc_1_cgroup/in_a_container ${GEM_LIBDIR}/spec/fixtures/virtual/proc_1_cgroup/in_a_docker_container +${GEM_LIBDIR}/spec/fixtures/virtual/proc_1_cgroup/in_a_docker_container_with_systemd_slices ${GEM_LIBDIR}/spec/fixtures/virtual/proc_1_cgroup/not_in_a_container ${GEM_LIBDIR}/spec/fixtures/virtual/proc_self_status/vserver_2_1/guest ${GEM_LIBDIR}/spec/fixtures/virtual/proc_self_status/vserver_2_1/host diff --git a/sysutils/ruby-facter/distinfo b/sysutils/ruby-facter/distinfo index 219d61e4bac7f..700225f1d5d98 100644 --- a/sysutils/ruby-facter/distinfo +++ b/sysutils/ruby-facter/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.24 2015/11/04 01:32:29 agc Exp $ +$NetBSD: distinfo,v 1.25 2016/03/15 15:28:05 taca Exp $ -SHA1 (facter-2.4.4.gem) = 09c835e91d51f6b7d334d48bbd9a48e3f595dca1 -RMD160 (facter-2.4.4.gem) = 01a4f71344f4552c7caa88ec219605d4eb90f272 -SHA512 (facter-2.4.4.gem) = 9d485d147cf726cd4a2943d1ee3475d2593067953102c11487e2916d59464407016a074b6eb31af4da37a3914588937d827d2cf4c64196650baefa2fb097bb89 -Size (facter-2.4.4.gem) = 245760 bytes +SHA1 (facter-2.4.6.gem) = a3b757a7f6319944bdd60d50c2b44e096734f1db +RMD160 (facter-2.4.6.gem) = c39d0821879c3062079a97e244335e01e2da267a +SHA512 (facter-2.4.6.gem) = a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a +Size (facter-2.4.6.gem) = 246272 bytes From 25ec4db6085d1a65c87af0082452b6b7fd6cacec Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:28:44 +0000 Subject: [PATCH 0169/2457] Note update of sysutils/ruby-facter package to 2.4.6. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 0c509190e416c..0952ceb31f9b3 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1200 2016/03/15 15:24:07 tez Exp $ +$NetBSD: CHANGES-2016,v 1.1201 2016/03/15 15:28:44 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1590,3 +1590,4 @@ Changes to the packages collection and infrastructure in 2016: Added cad/klayout version 0.24.5 [mef 2016-03-15] Updated sysutils/ruby-childprocess to 0.5.9 [taca 2016-03-15] Updated security/mit-krb5 to 1.14.1 [tez 2016-03-15] + Updated sysutils/ruby-facter to 2.4.6 [taca 2016-03-15] From 2c2650572c95ea739a71d01441e1a5da55cea5de Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:33:02 +0000 Subject: [PATCH 0170/2457] Update ruby-rb-inotify to 0.9.7. * Regenerate gemspec. * Improve documentation. * Return nil and the caller will return empty array for each method. * Avoid exception in case of closing a file watched by notifier, like tapping SIGINT to close the file without exception. * Fix the logic used for retrying reads after EINVAL * Use a specific exception class for queue overflows --- sysutils/ruby-rb-inotify/Makefile | 4 ++-- sysutils/ruby-rb-inotify/PLIST | 3 ++- sysutils/ruby-rb-inotify/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sysutils/ruby-rb-inotify/Makefile b/sysutils/ruby-rb-inotify/Makefile index d2f7f749745b2..176b35fa3ad92 100644 --- a/sysutils/ruby-rb-inotify/Makefile +++ b/sysutils/ruby-rb-inotify/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2015/03/13 15:58:33 taca Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/15 15:33:02 taca Exp $ -DISTNAME= rb-inotify-0.9.5 +DISTNAME= rb-inotify-0.9.7 CATEGORIES= sysutils MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/sysutils/ruby-rb-inotify/PLIST b/sysutils/ruby-rb-inotify/PLIST index 7f6447058ff1e..d21d20a04cd8d 100644 --- a/sysutils/ruby-rb-inotify/PLIST +++ b/sysutils/ruby-rb-inotify/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/03/13 15:58:33 taca Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/15 15:33:02 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.yardopts ${GEM_LIBDIR}/MIT-LICENSE @@ -6,6 +6,7 @@ ${GEM_LIBDIR}/README.md ${GEM_LIBDIR}/Rakefile ${GEM_LIBDIR}/VERSION ${GEM_LIBDIR}/lib/rb-inotify.rb +${GEM_LIBDIR}/lib/rb-inotify/errors.rb ${GEM_LIBDIR}/lib/rb-inotify/event.rb ${GEM_LIBDIR}/lib/rb-inotify/native.rb ${GEM_LIBDIR}/lib/rb-inotify/native/flags.rb diff --git a/sysutils/ruby-rb-inotify/distinfo b/sysutils/ruby-rb-inotify/distinfo index cdd4ad14866bb..0e13c1071efd9 100644 --- a/sysutils/ruby-rb-inotify/distinfo +++ b/sysutils/ruby-rb-inotify/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 01:32:30 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/03/15 15:33:02 taca Exp $ -SHA1 (rb-inotify-0.9.5.gem) = 52c673c2f546aab1958d19db6bdf2d1a7cbe34f1 -RMD160 (rb-inotify-0.9.5.gem) = 67b5e39bad4b5eedc0b445d36d84657fa886db9d -SHA512 (rb-inotify-0.9.5.gem) = 1ecc0142ed44358a2f51403736533e9854b5fc13cb81b552eb866310b60535b14e2ac6bfb6ee53bc1ee65ac14e51fc5a981e52f843607dbb3d8390c1d6c13e60 -Size (rb-inotify-0.9.5.gem) = 14336 bytes +SHA1 (rb-inotify-0.9.7.gem) = a47c5e88135cc959bb520894d635d631fa23a3f6 +RMD160 (rb-inotify-0.9.7.gem) = 4da255def1ef0c386c4c8889a09181de56e27d95 +SHA512 (rb-inotify-0.9.7.gem) = bc9be713becf7ee644a58e5d68dc0c514f8ba69a5b78de19cc84c2f55c98601065da59612a7373cd784646234b8ae9acd6575089c6a77e0317a0284c3f1fcbe4 +Size (rb-inotify-0.9.7.gem) = 14336 bytes From 2003218d2450286afded7dc790698dae9eb42ced Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:33:35 +0000 Subject: [PATCH 0171/2457] Note update of sysutils/ruby-rb-inotify package to 0.9.7. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 0952ceb31f9b3..123746a6d6775 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1201 2016/03/15 15:28:44 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1202 2016/03/15 15:33:35 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1591,3 +1591,4 @@ Changes to the packages collection and infrastructure in 2016: Updated sysutils/ruby-childprocess to 0.5.9 [taca 2016-03-15] Updated security/mit-krb5 to 1.14.1 [tez 2016-03-15] Updated sysutils/ruby-facter to 2.4.6 [taca 2016-03-15] + Updated sysutils/ruby-rb-inotify to 0.9.7 [taca 2016-03-15] From f70b220f48cdf0935f650c0f522e74438b0ab525 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:35:52 +0000 Subject: [PATCH 0172/2457] Update ruby-listen to 3.0.6. pkgsrc change: * Depend on ruby-rb-fsevent Darwin. Bugfixes * #364 - fix broken dependency (rb-inotify gem version 0.9.6 was removed from RubyGems) - thanks, @benja83 ! --- sysutils/ruby-listen/Makefile | 16 +++++++++++----- sysutils/ruby-listen/distinfo | 10 +++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sysutils/ruby-listen/Makefile b/sysutils/ruby-listen/Makefile index 19cf692e8435d..511f2a2870200 100644 --- a/sysutils/ruby-listen/Makefile +++ b/sysutils/ruby-listen/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2015/12/13 15:12:04 taca Exp $ +# $NetBSD: Makefile,v 1.9 2016/03/15 15:35:52 taca Exp $ -DISTNAME= listen-3.0.5 +DISTNAME= listen-3.0.6 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} CATEGORIES= sysutils @@ -9,11 +9,17 @@ HOMEPAGE= https://github.com/guard/listen COMMENT= Listen to file modifications LICENSE= mit -#DEPENDS+= ${RUBY_PKGPREFIX}-rb-fsevent>=0.9.3:../../sysutils/ruby-rb-fsevent -DEPENDS+= ${RUBY_PKGPREFIX}-rb-inotify>=0.9:../../sysutils/ruby-rb-inotify - RUBYGEM_OPTIONS+= --format-executable + +.include "../../lang/ruby/rubyversion.mk" + +.if ${OPSYS} == "Darwin" +DEPENDS+= ${RUBY_PKGPREFIX}-rb-fsevent>=0.9.7:../../devel/ruby-rb-fsevent +OVERRIDE_GEMSPEC+= rb-inotify: +.else +DEPENDS+= ${RUBY_PKGPREFIX}-rb-inotify>=0.9:../../sysutils/ruby-rb-inotify OVERRIDE_GEMSPEC+= rb-fsevent: +.endif .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/ruby-listen/distinfo b/sysutils/ruby-listen/distinfo index 64eb51d7cac01..7f3e1b80b789f 100644 --- a/sysutils/ruby-listen/distinfo +++ b/sysutils/ruby-listen/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2015/12/13 15:12:04 taca Exp $ +$NetBSD: distinfo,v 1.8 2016/03/15 15:35:52 taca Exp $ -SHA1 (listen-3.0.5.gem) = b8186e059cc5bb57c618fa387a744639970dd7ba -RMD160 (listen-3.0.5.gem) = 4754fd1d794b375d2eb9afe9bd7ae39fa6293eee -SHA512 (listen-3.0.5.gem) = cc4d4c2cb235a664039724e54e9d5dc891a9886a5c7b2a315ea86696240cfa5081081a5eb8ed465d989d4e97371340f47e7e6f1772408f32ac651d0de1cb30cf -Size (listen-3.0.5.gem) = 26624 bytes +SHA1 (listen-3.0.6.gem) = 279ce3fd44375138770982a06f46d698573b7dac +RMD160 (listen-3.0.6.gem) = 99b32cb53a15d2dd708a538cdb01b0fc446ab362 +SHA512 (listen-3.0.6.gem) = 2a195ea3e227fc56967c11cdbf190ef129168c9995fffac49c880c7b5b9c19aca2441bde3d73dc45b1d55d5779c0c016c25f4dff2f13c24ae974890fb337685d +Size (listen-3.0.6.gem) = 26624 bytes From 99c349774172be86b2c5c327e53f29174e1e5b29 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:36:20 +0000 Subject: [PATCH 0173/2457] Note update of sysutils/ruby-listen package to 3.0.6. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 123746a6d6775..526f41882577d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1202 2016/03/15 15:33:35 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1203 2016/03/15 15:36:20 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1592,3 +1592,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/mit-krb5 to 1.14.1 [tez 2016-03-15] Updated sysutils/ruby-facter to 2.4.6 [taca 2016-03-15] Updated sysutils/ruby-rb-inotify to 0.9.7 [taca 2016-03-15] + Updated sysutils/ruby-listen to 3.0.6 [taca 2016-03-15] From c2b354f27828fd2f3f2c016e7a8b1157a65f1177 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:39:04 +0000 Subject: [PATCH 0174/2457] Update ruby-coderay to 1.1.1. * SQL scanner: Allow $ signs in SQL identifiers [#164, thanks to jasir and Ben Basson] * SQL scanner: Fix open strings [#163, thanks to Adam] * Ruby scanner: Accept number literal suffixes r and i (Ruby 2.1) * Ruby scanner: Accept quoted hash keys like { "a": boss } (Ruby 2.2) * Ruby scanner: Accept save navigation operator &. (Ruby 2.3) * Ruby scanner: Accept squiggly heredoc <<~ (Ruby 2.3) * Diff scanner: Prevent running out of regexp stack. * HTML encoder: You can keep tabs intact now by setting tab_width: false. * Alpha style: Tweaked colors for :function group with :content. * File structure: One module per file, autoload CodeRay::Version, paths follow namespace hierarchy. --- textproc/ruby-coderay/Makefile | 4 ++-- textproc/ruby-coderay/PLIST | 12 ++++++++---- textproc/ruby-coderay/distinfo | 10 +++++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/textproc/ruby-coderay/Makefile b/textproc/ruby-coderay/Makefile index 9eda0c40c5340..35d911fed3398 100644 --- a/textproc/ruby-coderay/Makefile +++ b/textproc/ruby-coderay/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2013/09/15 16:14:17 taca Exp $ +# $NetBSD: Makefile,v 1.13 2016/03/15 15:39:04 taca Exp $ -DISTNAME= coderay-1.1.0 +DISTNAME= coderay-1.1.1 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/textproc/ruby-coderay/PLIST b/textproc/ruby-coderay/PLIST index 922028971db0d..2faf89ce86357 100644 --- a/textproc/ruby-coderay/PLIST +++ b/textproc/ruby-coderay/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2013/09/15 16:14:17 taca Exp $ +@comment $NetBSD: PLIST,v 1.9 2016/03/15 15:39:04 taca Exp $ bin/coderay ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/README_INDEX.rdoc @@ -6,13 +6,14 @@ ${GEM_LIBDIR}/Rakefile ${GEM_LIBDIR}/bin/coderay ${GEM_LIBDIR}/lib/coderay.rb ${GEM_LIBDIR}/lib/coderay/duo.rb -${GEM_LIBDIR}/lib/coderay/encoder.rb +${GEM_LIBDIR}/lib/coderay/encoders.rb ${GEM_LIBDIR}/lib/coderay/encoders/_map.rb ${GEM_LIBDIR}/lib/coderay/encoders/comment_filter.rb ${GEM_LIBDIR}/lib/coderay/encoders/count.rb ${GEM_LIBDIR}/lib/coderay/encoders/debug.rb ${GEM_LIBDIR}/lib/coderay/encoders/debug_lint.rb ${GEM_LIBDIR}/lib/coderay/encoders/div.rb +${GEM_LIBDIR}/lib/coderay/encoders/encoder.rb ${GEM_LIBDIR}/lib/coderay/encoders/filter.rb ${GEM_LIBDIR}/lib/coderay/encoders/html.rb ${GEM_LIBDIR}/lib/coderay/encoders/html/css.rb @@ -33,8 +34,9 @@ ${GEM_LIBDIR}/lib/coderay/encoders/yaml.rb ${GEM_LIBDIR}/lib/coderay/for_redcloth.rb ${GEM_LIBDIR}/lib/coderay/helpers/file_type.rb ${GEM_LIBDIR}/lib/coderay/helpers/plugin.rb +${GEM_LIBDIR}/lib/coderay/helpers/plugin_host.rb ${GEM_LIBDIR}/lib/coderay/helpers/word_list.rb -${GEM_LIBDIR}/lib/coderay/scanner.rb +${GEM_LIBDIR}/lib/coderay/scanners.rb ${GEM_LIBDIR}/lib/coderay/scanners/_map.rb ${GEM_LIBDIR}/lib/coderay/scanners/c.rb ${GEM_LIBDIR}/lib/coderay/scanners/clojure.rb @@ -60,14 +62,16 @@ ${GEM_LIBDIR}/lib/coderay/scanners/ruby.rb ${GEM_LIBDIR}/lib/coderay/scanners/ruby/patterns.rb ${GEM_LIBDIR}/lib/coderay/scanners/ruby/string_state.rb ${GEM_LIBDIR}/lib/coderay/scanners/sass.rb +${GEM_LIBDIR}/lib/coderay/scanners/scanner.rb ${GEM_LIBDIR}/lib/coderay/scanners/sql.rb ${GEM_LIBDIR}/lib/coderay/scanners/taskpaper.rb ${GEM_LIBDIR}/lib/coderay/scanners/text.rb ${GEM_LIBDIR}/lib/coderay/scanners/xml.rb ${GEM_LIBDIR}/lib/coderay/scanners/yaml.rb -${GEM_LIBDIR}/lib/coderay/style.rb +${GEM_LIBDIR}/lib/coderay/styles.rb ${GEM_LIBDIR}/lib/coderay/styles/_map.rb ${GEM_LIBDIR}/lib/coderay/styles/alpha.rb +${GEM_LIBDIR}/lib/coderay/styles/style.rb ${GEM_LIBDIR}/lib/coderay/token_kinds.rb ${GEM_LIBDIR}/lib/coderay/tokens.rb ${GEM_LIBDIR}/lib/coderay/tokens_proxy.rb diff --git a/textproc/ruby-coderay/distinfo b/textproc/ruby-coderay/distinfo index 1fff8f9a5e27f..6c2a7393ecefe 100644 --- a/textproc/ruby-coderay/distinfo +++ b/textproc/ruby-coderay/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2015/11/04 02:00:07 agc Exp $ +$NetBSD: distinfo,v 1.13 2016/03/15 15:39:04 taca Exp $ -SHA1 (coderay-1.1.0.gem) = e69373e18738ca543e7ccb002454ac50179dd7f8 -RMD160 (coderay-1.1.0.gem) = 4cb19554352771e6e70d689f32cbdaf1e56457a2 -SHA512 (coderay-1.1.0.gem) = 3d06b4e1026489d5a9a9e5d31c41e3c6af84ac29f7d4e8cc29cca54f764209982a3257b5a4493bfdee44738c1c7eb3b020e43e1313c715ccccdc4734a66013d9 -Size (coderay-1.1.0.gem) = 95232 bytes +SHA1 (coderay-1.1.1.gem) = 8c757d65331e622f2c55464ce47ab6e666542137 +RMD160 (coderay-1.1.1.gem) = b0d014c50911dd70daedd004f61a6346df772b84 +SHA512 (coderay-1.1.1.gem) = 7b2bbf51e6625a252f7eb6de6d3a5b2d401a3bcbd5ed3074a8a34e468bcbd4400f54906dd9ce0c7afcd2dd56b0bb28a597d2e01c614d19388f1576385bf4e97f +Size (coderay-1.1.1.gem) = 96256 bytes From 8191b73b3a9ec468a9e1ba43b65640c01e4a43b9 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:39:39 +0000 Subject: [PATCH 0175/2457] Note update of textproc/ruby-coderay package to 1.1.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 526f41882577d..7ea64f64dbe92 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1203 2016/03/15 15:36:20 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1204 2016/03/15 15:39:39 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1593,3 +1593,4 @@ Changes to the packages collection and infrastructure in 2016: Updated sysutils/ruby-facter to 2.4.6 [taca 2016-03-15] Updated sysutils/ruby-rb-inotify to 0.9.7 [taca 2016-03-15] Updated sysutils/ruby-listen to 3.0.6 [taca 2016-03-15] + Updated textproc/ruby-coderay to 1.1.1 [taca 2016-03-15] From d73d03d76d9e261256eb71249659953368f0c0f5 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:43:28 +0000 Subject: [PATCH 0176/2457] Update ruby-kramdown to 1.10.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kramdown 1.10.0 released This release brings the usual bug fixes but also support for the strikethrough syntax in the GFM parser as well as some enhancements regarding the specification of language names for syntax highlighting purposes. Changes * 4 minor changes: o Support for the math-engine MathJax-Node was updated to use the new mathjax-node package (fixes #313, pull request by Tom Thorogood) o URL query parameters can now be appended to language names specified in fenced code blocks if the syntax highlighting engine accepts them (fixes #234) o Added strikethrough syntax to the GFM parser (fixes #184 and #307; initial pull request by Diego Galeota, updated by Parker Moore) o Allow almost all characters in class names that are defined via a special syntax (fixes #318, requested by cabo) * 4 bug fixes: o Fixed a problem where Kramdown::Document.new would only accept the symbol :input but not the string ��input�� as valid key (fixes #312, pull request by Sun Yaozhu) o Fixed inconsistent behavior: Empty link text is now also allowed for normal links, not just images (fixes #305, reported by cabo) o The HTML5 element is now recognized as span level element (fixes #298, reported by Niclas Darville) o Fixed problem where e-mail autolinks containing an underscore character were not correctly recognized (fixes #293, reported by erikse) * 3 other fixes: o Fixed missing package update statement for Travis (by Parker Moore) o Add some more documentation regarding MathJax (fixes #296, pull request by Christopher Jefferson) o Fixed bad link in API documentation (fixes #315, reported by Tom MacWright) --- textproc/ruby-kramdown/Makefile | 5 ++--- textproc/ruby-kramdown/PLIST | 10 +++++++++- textproc/ruby-kramdown/distinfo | 10 +++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/textproc/ruby-kramdown/Makefile b/textproc/ruby-kramdown/Makefile index 9bca612b03ac4..e6fceeea2e903 100644 --- a/textproc/ruby-kramdown/Makefile +++ b/textproc/ruby-kramdown/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2015/12/11 21:29:27 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2016/03/15 15:43:28 taca Exp $ -DISTNAME= kramdown-1.9.0 -PKGREVISION= 1 +DISTNAME= kramdown-1.10.0 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/textproc/ruby-kramdown/PLIST b/textproc/ruby-kramdown/PLIST index 438646b50fb70..f9ffdf3e00a1a 100644 --- a/textproc/ruby-kramdown/PLIST +++ b/textproc/ruby-kramdown/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2015/10/04 13:32:49 taca Exp $ +@comment $NetBSD: PLIST,v 1.12 2016/03/15 15:43:28 taca Exp $ bin/kramdown${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/AUTHORS @@ -202,6 +202,9 @@ ${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_ial.text ${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block.html ${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block.options ${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block.text +${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.html +${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.options +${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block_any_char.text ${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block_name_with_dash.html ${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block_name_with_dash.options ${GEM_LIBDIR}/test/testcases/block/06_codeblock/with_lang_in_fenced_block_name_with_dash.text @@ -484,6 +487,8 @@ ${GEM_LIBDIR}/test/testcases/span/05_html/invalid.html ${GEM_LIBDIR}/test/testcases/span/05_html/invalid.text ${GEM_LIBDIR}/test/testcases/span/05_html/link_with_mailto.html ${GEM_LIBDIR}/test/testcases/span/05_html/link_with_mailto.text +${GEM_LIBDIR}/test/testcases/span/05_html/mark_element.html +${GEM_LIBDIR}/test/testcases/span/05_html/mark_element.text ${GEM_LIBDIR}/test/testcases/span/05_html/markdown_attr.html ${GEM_LIBDIR}/test/testcases/span/05_html/markdown_attr.text ${GEM_LIBDIR}/test/testcases/span/05_html/normal.html @@ -557,6 +562,9 @@ ${GEM_LIBDIR}/test/testcases_gfm/hard_line_breaks.text ${GEM_LIBDIR}/test/testcases_gfm/hard_line_breaks_off.html ${GEM_LIBDIR}/test/testcases_gfm/hard_line_breaks_off.options ${GEM_LIBDIR}/test/testcases_gfm/hard_line_breaks_off.text +${GEM_LIBDIR}/test/testcases_gfm/strikethrough.html +${GEM_LIBDIR}/test/testcases_gfm/strikethrough.html.19 +${GEM_LIBDIR}/test/testcases_gfm/strikethrough.text ${GEM_LIBDIR}/test/testcases_gfm/two_para_hard_line_breaks.html ${GEM_LIBDIR}/test/testcases_gfm/two_para_hard_line_breaks.text ${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/textproc/ruby-kramdown/distinfo b/textproc/ruby-kramdown/distinfo index 44dbdc47a5816..21de50cd6dab3 100644 --- a/textproc/ruby-kramdown/distinfo +++ b/textproc/ruby-kramdown/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.13 2015/11/04 02:00:09 agc Exp $ +$NetBSD: distinfo,v 1.14 2016/03/15 15:43:28 taca Exp $ -SHA1 (kramdown-1.9.0.gem) = 34b7b8201f48a955c026fd065b8740ba41a56863 -RMD160 (kramdown-1.9.0.gem) = b871ffc7b485eebb92053244971c4aa19b214b46 -SHA512 (kramdown-1.9.0.gem) = 0ac14adec59c4032d27ac0e3c66a0737688295562782c86f80c953fdca56b5611b7f32dfb570649421fdc1b47deea72715a21c907124c99663bc1a23c1f489ec -Size (kramdown-1.9.0.gem) = 238592 bytes +SHA1 (kramdown-1.10.0.gem) = a12a1f7f5bfcb4c6652f6f3f10f77dd99e966859 +RMD160 (kramdown-1.10.0.gem) = 48b46ac26a074b3e8bf483380b99709d138ccdb2 +SHA512 (kramdown-1.10.0.gem) = fa0c8f1de6ea7306c7ca47a99f0d3e4a2e720e8d7d00f85a811b0ddd7f533960d583f94dee59f1d04900069163dd583c70520bedeeada77d673ff1b3d8b3782e +Size (kramdown-1.10.0.gem) = 240128 bytes From 477423c32760dd30b368023a19a16f51b7596c33 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:44:02 +0000 Subject: [PATCH 0177/2457] Note update of textproc/ruby-kramdown package to 1.10.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 7ea64f64dbe92..29b98549e428f 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1204 2016/03/15 15:39:39 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1205 2016/03/15 15:44:02 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1594,3 +1594,4 @@ Changes to the packages collection and infrastructure in 2016: Updated sysutils/ruby-rb-inotify to 0.9.7 [taca 2016-03-15] Updated sysutils/ruby-listen to 3.0.6 [taca 2016-03-15] Updated textproc/ruby-coderay to 1.1.1 [taca 2016-03-15] + Updated textproc/ruby-kramdown to 1.10.0 [taca 2016-03-15] From f03cab395e1e6bc09d3968a5d6172b87e8f575bb Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:45:46 +0000 Subject: [PATCH 0178/2457] Update ruby-nokogiri to 1.6.7.2. Below security problem dose not affect to pkgsrc since we do not use bundlerd libxml2. === 1.6.7.2 / 2015-01-20 This version pulls in several upstream patches to the vendored libxml2 and libxslt to address: CVE-2015-7499 Ubuntu classifies this as "Priority: Low", RedHat classifies this as "Impact: Moderate", and NIST classifies this as "Severity: 5.0 (MEDIUM)". MITRE record is https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7499 --- textproc/ruby-nokogiri/Makefile | 4 ++-- textproc/ruby-nokogiri/PLIST | 5 ++++- textproc/ruby-nokogiri/distinfo | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/textproc/ruby-nokogiri/Makefile b/textproc/ruby-nokogiri/Makefile index f45e601744018..071b699cbd44b 100644 --- a/textproc/ruby-nokogiri/Makefile +++ b/textproc/ruby-nokogiri/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.30 2016/01/10 11:55:44 tsutsui Exp $ +# $NetBSD: Makefile,v 1.31 2016/03/15 15:45:46 taca Exp $ -DISTNAME= nokogiri-1.6.7.1 +DISTNAME= nokogiri-1.6.7.2 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/textproc/ruby-nokogiri/PLIST b/textproc/ruby-nokogiri/PLIST index 33ed514ec97a9..20c17e05a8df9 100644 --- a/textproc/ruby-nokogiri/PLIST +++ b/textproc/ruby-nokogiri/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2016/01/10 11:55:44 tsutsui Exp $ +@comment $NetBSD: PLIST,v 1.19 2016/03/15 15:45:46 taca Exp $ bin/nokogiri${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_EXTSDIR}/gem.build_complete @@ -174,6 +174,9 @@ ${GEM_LIBDIR}/patches/libxml2/0015-Add-xmlHaltParser-to-stop-the-parser.patch ${GEM_LIBDIR}/patches/libxml2/0016-Detect-incoherency-on-GROW.patch ${GEM_LIBDIR}/patches/libxml2/0017-CVE-2015-7500-Fix-memory-access-error-due-to-incorre.patch ${GEM_LIBDIR}/patches/libxml2/0018-CVE-2015-8242-Buffer-overead-with-HTML-parser-in-pus.patch +${GEM_LIBDIR}/patches/libxml2/0019-Do-not-print-error-context-when-there-is-none.patch +${GEM_LIBDIR}/patches/libxml2/0020-xmlStopParser-reset-errNo.patch +${GEM_LIBDIR}/patches/libxml2/0021-Reuse-xmlHaltParser-where-it-makes-sense.patch ${GEM_LIBDIR}/patches/libxslt/0001-Adding-doc-update-related-to-1.1.28.patch ${GEM_LIBDIR}/patches/libxslt/0002-Fix-a-couple-of-places-where-f-printf-parameters-wer.patch ${GEM_LIBDIR}/patches/libxslt/0003-Initialize-pseudo-random-number-generator-with-curre.patch diff --git a/textproc/ruby-nokogiri/distinfo b/textproc/ruby-nokogiri/distinfo index e4cabe5515e5a..c5ea0a3c7c402 100644 --- a/textproc/ruby-nokogiri/distinfo +++ b/textproc/ruby-nokogiri/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.20 2016/01/10 11:55:44 tsutsui Exp $ +$NetBSD: distinfo,v 1.21 2016/03/15 15:45:46 taca Exp $ -SHA1 (nokogiri-1.6.7.1.gem) = 5891d05b0ed63825f2955418a9282ca5cd61436e -RMD160 (nokogiri-1.6.7.1.gem) = df79c4c80e7df6d9af45fb544bad482e4a182a68 -SHA512 (nokogiri-1.6.7.1.gem) = 85212317ac44ab4b08f7c35d9fb930402146a4576b03c2b23aa84901a7684c7a7e128af77dc7427f458606fd54250b95cbb13fc27d8097e8e8dc688db1220304 -Size (nokogiri-1.6.7.1.gem) = 9274368 bytes +SHA1 (nokogiri-1.6.7.2.gem) = d6a374a969abd6105d19076558e57a5cbb10e484 +RMD160 (nokogiri-1.6.7.2.gem) = e7e531b522128552d042d024c483b878626aca07 +SHA512 (nokogiri-1.6.7.2.gem) = 27f72763f4f572b9a7042b48bd3a7a7516773eda128be603b8316e8ecaef42028f3d3a190947011cc6973fa4a43265a56f4b563bf28a8b2739b470cc19cee6cd +Size (nokogiri-1.6.7.2.gem) = 9276928 bytes From dd6c430cfc7c7b235703cef7bf3715e74a2259bd Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:46:23 +0000 Subject: [PATCH 0179/2457] Note update of textproc/ruby-nokogiri package to 1.6.7.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 29b98549e428f..2aa133d790fa8 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1205 2016/03/15 15:44:02 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1206 2016/03/15 15:46:23 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1595,3 +1595,4 @@ Changes to the packages collection and infrastructure in 2016: Updated sysutils/ruby-listen to 3.0.6 [taca 2016-03-15] Updated textproc/ruby-coderay to 1.1.1 [taca 2016-03-15] Updated textproc/ruby-kramdown to 1.10.0 [taca 2016-03-15] + Updated textproc/ruby-nokogiri to 1.6.7.2 [taca 2016-03-15] From 52c985126d9b2b5634acce3403e4af763a955ce8 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:55:42 +0000 Subject: [PATCH 0180/2457] Update ruby-plist to 3.2.0. * Updated dprecated File.exists? to File.exist? * Updated README.rdoc 'Apple Computer' -> 'Apple' * Fixed defect in PData in which exception was thrown when element was read from plist. * guard against not being able to load rdoc tasks * Fix typo in comment * Remove 'Computer' from 'Apple Computer' string in plist files ;-) * Changed sort to sort_by in Plist::Emit.plist_node to allow mixed symbol and string hash keys. --- textproc/ruby-plist/Makefile | 6 +++--- textproc/ruby-plist/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/textproc/ruby-plist/Makefile b/textproc/ruby-plist/Makefile index 99cd5572744b9..3ace42eda48e8 100644 --- a/textproc/ruby-plist/Makefile +++ b/textproc/ruby-plist/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2010/09/10 08:33:30 taca Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/15 15:55:42 taca Exp $ -DISTNAME= plist-3.1.0 +DISTNAME= plist-3.2.0 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://plist.rubyforge.org/ +HOMEPAGE= https://github.com/bleything/plist COMMENT= Manipulate Property List files LICENSE= mit diff --git a/textproc/ruby-plist/distinfo b/textproc/ruby-plist/distinfo index 9a6d4ef11531a..91c45ea20ad5a 100644 --- a/textproc/ruby-plist/distinfo +++ b/textproc/ruby-plist/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 02:00:09 agc Exp $ +$NetBSD: distinfo,v 1.4 2016/03/15 15:55:42 taca Exp $ -SHA1 (plist-3.1.0.gem) = 8a5b74ba1dcf32e42c850723c7768963813e8bda -RMD160 (plist-3.1.0.gem) = 00afd5cf5677ecb6f38e20c2def7d74d885d1a6b -SHA512 (plist-3.1.0.gem) = d31f4f2f30cab864c42e374799ce8e85d8b0c6e10b115c28054529fa2b76c36a7ae20087a7949fb8508f9a2360c83f8f0ddec9356505afa1c8539a46cb73d352 -Size (plist-3.1.0.gem) = 37888 bytes +SHA1 (plist-3.2.0.gem) = af471e101f07409dcf145657bab2f3ff784acc42 +RMD160 (plist-3.2.0.gem) = f145eb550fc6b59712bdc51546ce3211379905a5 +SHA512 (plist-3.2.0.gem) = 87035859b346b2b59284c5389025570ed678a4fc584bc07e8b1e3246fafc5d0f39818505cb15eb7f45e4aaa680c67d56be9e5f73d5f99f96eded885c3f5dac32 +Size (plist-3.2.0.gem) = 38912 bytes From d77beea73355d4782acc3bdf07737f08a34d2046 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:56:16 +0000 Subject: [PATCH 0181/2457] Note update of textproc/ruby-plist package to 3.2.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 2aa133d790fa8..091ae070b572d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1206 2016/03/15 15:46:23 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1207 2016/03/15 15:56:16 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1596,3 +1596,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/ruby-coderay to 1.1.1 [taca 2016-03-15] Updated textproc/ruby-kramdown to 1.10.0 [taca 2016-03-15] Updated textproc/ruby-nokogiri to 1.6.7.2 [taca 2016-03-15] + Updated textproc/ruby-plist to 3.2.0 [taca 2016-03-15] From 31262d3242fc69f34bc4ef0e5681bbe64b0ed439 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:57:59 +0000 Subject: [PATCH 0182/2457] Update ruby-redcarpet to 3.3.4. This release simply fixes the bufprintf function to correctly work on Windows MinGW-w64 so strings are properly written to the buffer and also skips non-ASCII chars during anchor generation to avoid generating invalid UTF-8 bytes sequences. --- textproc/ruby-redcarpet/Makefile | 4 ++-- textproc/ruby-redcarpet/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/textproc/ruby-redcarpet/Makefile b/textproc/ruby-redcarpet/Makefile index 9fb90c2a2aaef..300fdf3df35c3 100644 --- a/textproc/ruby-redcarpet/Makefile +++ b/textproc/ruby-redcarpet/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2015/10/04 13:38:17 taca Exp $ +# $NetBSD: Makefile,v 1.9 2016/03/15 15:57:59 taca Exp $ -DISTNAME= redcarpet-3.3.3 +DISTNAME= redcarpet-3.3.4 CATEGORIES= textproc MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/textproc/ruby-redcarpet/distinfo b/textproc/ruby-redcarpet/distinfo index 9b3adc836989d..b81fc358c9cae 100644 --- a/textproc/ruby-redcarpet/distinfo +++ b/textproc/ruby-redcarpet/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 02:00:10 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 15:57:59 taca Exp $ -SHA1 (redcarpet-3.3.3.gem) = f2d0743e973b95bd0fa37669cadf1b4c0b2f4ab5 -RMD160 (redcarpet-3.3.3.gem) = 11f26e95e0ce9a40e71ed65b850240dc30d00afc -SHA512 (redcarpet-3.3.3.gem) = 48c069c03683b9b952fda28046f1518346c4a06854bae8cc818a311f8570bf0385e6963e0d01ced763a76743d952243ae781c258beac87b6035e5834d4adfb17 -Size (redcarpet-3.3.3.gem) = 60416 bytes +SHA1 (redcarpet-3.3.4.gem) = 777caf4db4b331cf0bf4966f5169591cff1889e5 +RMD160 (redcarpet-3.3.4.gem) = 0b606d8192fc71406cf5ca5768277aa786400cda +SHA512 (redcarpet-3.3.4.gem) = 8ef78c351d319b193167a5dc7b45fa39c81b02fe5c0d0102cbbeea2af85ed0b3e7a00b16a58596996739c2538ba3d95bc3e85d6614d85fb845c34891b4c407c2 +Size (redcarpet-3.3.4.gem) = 60416 bytes From 3f0bfab5b25416010f61dffe8f52ad4cc233b2a0 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 15:58:28 +0000 Subject: [PATCH 0183/2457] Note update of textproc/ruby-redcarpet package to 3.3.4. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 091ae070b572d..c42e26cf9aa85 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1207 2016/03/15 15:56:16 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1208 2016/03/15 15:58:28 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1597,3 +1597,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/ruby-kramdown to 1.10.0 [taca 2016-03-15] Updated textproc/ruby-nokogiri to 1.6.7.2 [taca 2016-03-15] Updated textproc/ruby-plist to 3.2.0 [taca 2016-03-15] + Updated textproc/ruby-redcarpet to 3.3.4 [taca 2016-03-15] From 0569b9533607d9288bac56ac0a35a090e8de3365 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:00:58 +0000 Subject: [PATCH 0184/2457] Update ruby-will-paginate to 3.1.0. * Rails 5.0 support * Drop support for old Active Record finder params to paginate(): # now unsupported: User.paginate(:page => 1, :order => 'created_at DESC', :conditions => ...) # convert to Arel syntax instead: User.order('created_at DESC').where(...).paginate(:page => 1) # or, even better: User.order('created_at DESC').where(...).page(1) * Add support for pagination with Mongoid --- textproc/ruby-will-paginate/Makefile | 4 ++-- textproc/ruby-will-paginate/PLIST | 4 +++- textproc/ruby-will-paginate/distinfo | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/textproc/ruby-will-paginate/Makefile b/textproc/ruby-will-paginate/Makefile index 7abe5f14d0555..193b8ba08f82e 100644 --- a/textproc/ruby-will-paginate/Makefile +++ b/textproc/ruby-will-paginate/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2015/02/05 15:21:40 taca Exp $ +# $NetBSD: Makefile,v 1.10 2016/03/15 16:00:58 taca Exp $ -DISTNAME= will_paginate-3.0.7 +DISTNAME= will_paginate-3.1.0 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/_/-/} CATEGORIES= textproc LICENSE= mit diff --git a/textproc/ruby-will-paginate/PLIST b/textproc/ruby-will-paginate/PLIST index a3472ac457e4f..7442f659a6fee 100644 --- a/textproc/ruby-will-paginate/PLIST +++ b/textproc/ruby-will-paginate/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2015/02/05 15:21:40 taca Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/03/15 16:00:58 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/LICENSE ${GEM_LIBDIR}/README.md @@ -11,6 +11,7 @@ ${GEM_LIBDIR}/lib/will_paginate/data_mapper.rb ${GEM_LIBDIR}/lib/will_paginate/deprecation.rb ${GEM_LIBDIR}/lib/will_paginate/i18n.rb ${GEM_LIBDIR}/lib/will_paginate/locale/en.yml +${GEM_LIBDIR}/lib/will_paginate/mongoid.rb ${GEM_LIBDIR}/lib/will_paginate/page_number.rb ${GEM_LIBDIR}/lib/will_paginate/per_page.rb ${GEM_LIBDIR}/lib/will_paginate/railtie.rb @@ -31,6 +32,7 @@ ${GEM_LIBDIR}/spec/finders/active_record_spec.rb ${GEM_LIBDIR}/spec/finders/activerecord_test_connector.rb ${GEM_LIBDIR}/spec/finders/data_mapper_spec.rb ${GEM_LIBDIR}/spec/finders/data_mapper_test_connector.rb +${GEM_LIBDIR}/spec/finders/mongoid_spec.rb ${GEM_LIBDIR}/spec/finders/sequel_spec.rb ${GEM_LIBDIR}/spec/finders/sequel_test_connector.rb ${GEM_LIBDIR}/spec/fixtures/admin.rb diff --git a/textproc/ruby-will-paginate/distinfo b/textproc/ruby-will-paginate/distinfo index cc646e9f080b4..ac5cdc24ab615 100644 --- a/textproc/ruby-will-paginate/distinfo +++ b/textproc/ruby-will-paginate/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2015/11/04 02:00:11 agc Exp $ +$NetBSD: distinfo,v 1.11 2016/03/15 16:00:58 taca Exp $ -SHA1 (will_paginate-3.0.7.gem) = 48adba17eb9cc4e9bc7fd11abe20eeb0d6626396 -RMD160 (will_paginate-3.0.7.gem) = af99bf0818a31922e05b23e6f5ecc9626dd7d7bd -SHA512 (will_paginate-3.0.7.gem) = 2f675905bcc5c890781677188576584ea7b2a003d3e5e9c9c32a5c5a1093ae436dec72b93cc39a1a7c897d81b181fbd8ab88ed7d098ba204426f7462806f677b -Size (will_paginate-3.0.7.gem) = 35840 bytes +SHA1 (will_paginate-3.1.0.gem) = 7067f6ec6665797e5c5506f26843262b601632ba +RMD160 (will_paginate-3.1.0.gem) = 0e8f15b12fbd481372aa5d4637c49329446a3d0c +SHA512 (will_paginate-3.1.0.gem) = e53583eceec6381ddd4b5936a84fa84fb7d956a267aac15df5c4758b22f54d48c00d66880ad1b2b1c0c18c09a645d1b99d3cefe758f6a51fdf169ca10e875afa +Size (will_paginate-3.1.0.gem) = 36352 bytes From a5e24cfd51c5225bcb8d80e4eb0ae11d67c2a52a Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:01:30 +0000 Subject: [PATCH 0185/2457] Note update of textproc/ruby-will-paginate package to 3.1.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index c42e26cf9aa85..316d00f484136 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1208 2016/03/15 15:58:28 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1209 2016/03/15 16:01:30 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1598,3 +1598,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/ruby-nokogiri to 1.6.7.2 [taca 2016-03-15] Updated textproc/ruby-plist to 3.2.0 [taca 2016-03-15] Updated textproc/ruby-redcarpet to 3.3.4 [taca 2016-03-15] + Updated textproc/ruby-will-paginate to 3.1.0 [taca 2016-03-15] From 54f77cbc332dd773362dd27507e06cdd63064d6f Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:02:46 +0000 Subject: [PATCH 0186/2457] Update ruby-capybara to 2.6.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #Version 2.6.2 Relase date: 2016-01-27 ### Fixed * support for more than just addressable 2.4.0 [Thomas Walpole] # Version 2.6.1 Release date: 2016-01-27 ### Fixed * Add missing require for addressable [Jorge Bejar] # Version 2.6.0 Relase date: 2016-01-17 ### Fixed * Fixed path escaping issue with current_path matchers [Tom Walpole, Luke Rollans] (Issue #1611) * Fixed circular require [David Rodríguez] * Capybara::RackTest::Form no longer overrides Object#method [David Rodriguez] * options and with_options filter for :select selector have more intuitive visibility behavior [Nathan] * Test for nested modal API method support [Tom Walpole] ### Added * Capybara.modify_selector [Tom Walpole] * xfeature and ffeature aliases added when using RSpec [Filip Bartuzi] * Selenium driver supports a :clear option to #set to handle different strategies for clearing a field [Tom Walpole] * Support the use of rack 2.0 with the rack_test driver [Travis Grathwell, Tom Walpole] * Disabled option for default selectors now supports true, false, or :all [Jillian Rosile, Tom Walpole] * Modal API methods now default wait time to Capybara.max_default_wait_time [Tom Walpole] --- www/ruby-capybara/Makefile | 5 +++-- www/ruby-capybara/PLIST | 4 +++- www/ruby-capybara/distinfo | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/www/ruby-capybara/Makefile b/www/ruby-capybara/Makefile index f6433b93b8551..3550bffd0f26f 100644 --- a/www/ruby-capybara/Makefile +++ b/www/ruby-capybara/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2015/09/13 15:27:55 taca Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/15 16:02:46 taca Exp $ -DISTNAME= capybara-2.5.0 +DISTNAME= capybara-2.6.2 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} CATEGORIES= devel ruby www @@ -14,6 +14,7 @@ DEPENDS+= ${RUBY_PKGPREFIX}-nokogiri>=1.3.3:../../textproc/ruby-nokogiri DEPENDS+= ${RUBY_PKGPREFIX}-rack>=1.0.0:../../www/ruby-rack DEPENDS+= ${RUBY_PKGPREFIX}-rack-test>=0.5.4:../../www/ruby-rack-test DEPENDS+= ${RUBY_PKGPREFIX}-xpath>=2.0:../../textproc/ruby-xpath +DEPENDS+= ${RUBY_PKGPREFIX}-addressable>=0:../../net/ruby-addressable USE_LANGUAGES= # none diff --git a/www/ruby-capybara/PLIST b/www/ruby-capybara/PLIST index ac50d875b241d..f58eddbc35317 100644 --- a/www/ruby-capybara/PLIST +++ b/www/ruby-capybara/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2015/09/13 15:27:55 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/15 16:02:46 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/History.md ${GEM_LIBDIR}/License.txt @@ -150,8 +150,10 @@ ${GEM_LIBDIR}/spec/rack_test_spec.rb ${GEM_LIBDIR}/spec/result_spec.rb ${GEM_LIBDIR}/spec/rspec/features_spec.rb ${GEM_LIBDIR}/spec/rspec/matchers_spec.rb +${GEM_LIBDIR}/spec/rspec/scenarios_spec.rb ${GEM_LIBDIR}/spec/rspec/views_spec.rb ${GEM_LIBDIR}/spec/rspec_spec.rb +${GEM_LIBDIR}/spec/selector_spec.rb ${GEM_LIBDIR}/spec/selenium_spec.rb ${GEM_LIBDIR}/spec/selenium_spec_chrome.rb ${GEM_LIBDIR}/spec/server_spec.rb diff --git a/www/ruby-capybara/distinfo b/www/ruby-capybara/distinfo index 1841b470ee825..b6d728940edfb 100644 --- a/www/ruby-capybara/distinfo +++ b/www/ruby-capybara/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:47:33 agc Exp $ +$NetBSD: distinfo,v 1.5 2016/03/15 16:02:46 taca Exp $ -SHA1 (capybara-2.5.0.gem) = 0c0bda34fa36385b4ab79469799e675f531bfe47 -RMD160 (capybara-2.5.0.gem) = 0db02d8835657f73d37c88109080af6037ed0248 -SHA512 (capybara-2.5.0.gem) = 30431cc78c16a26f850ef1a1d60af4c9934ce89ffa3ed9c305af903640a66dc78e831614c22ed7725bf23d70e5de6b50b6c1d23cc3e33c815e73a2f1117dc13c -Size (capybara-2.5.0.gem) = 240640 bytes +SHA1 (capybara-2.6.2.gem) = 9544b4fefaff42cfd3bb0b7cc614e53ad6411fd1 +RMD160 (capybara-2.6.2.gem) = 0f1a3620f516ae96900946e5f36049e29a6e5df8 +SHA512 (capybara-2.6.2.gem) = a50de9bf3e09270a8ad4739326ecb938901e098caa7610cb5daa3df7d79753dcbe77beca60237d3a0536e0e6518af517dc6d96e9fea37d19ceb89a6f6905969d +Size (capybara-2.6.2.gem) = 220160 bytes From b118448eb5afeb22fd1049a6a0c71f020ff3b919 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:03:15 +0000 Subject: [PATCH 0187/2457] Note update of www/ruby-capybara package to 2.6.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 316d00f484136..8b1c2101c2aa0 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1209 2016/03/15 16:01:30 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1210 2016/03/15 16:03:15 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1599,3 +1599,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/ruby-plist to 3.2.0 [taca 2016-03-15] Updated textproc/ruby-redcarpet to 3.3.4 [taca 2016-03-15] Updated textproc/ruby-will-paginate to 3.1.0 [taca 2016-03-15] + Updated www/ruby-capybara to 2.6.2 [taca 2016-03-15] From 366324c648ca025c6bde7dde7e57541490b3dfc2 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:09:04 +0000 Subject: [PATCH 0188/2457] Update ruby-cookiejar to 0.3.3. Changes are not available. --- www/ruby-cookiejar/Makefile | 4 ++-- www/ruby-cookiejar/PLIST | 9 ++++++++- www/ruby-cookiejar/distinfo | 10 +++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/www/ruby-cookiejar/Makefile b/www/ruby-cookiejar/Makefile index 2040829890003..d7a3c4e7f5561 100644 --- a/www/ruby-cookiejar/Makefile +++ b/www/ruby-cookiejar/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2014/03/14 18:56:59 taca Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/15 16:09:04 taca Exp $ -DISTNAME= cookiejar-0.3.2 +DISTNAME= cookiejar-0.3.3 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/www/ruby-cookiejar/PLIST b/www/ruby-cookiejar/PLIST index 118484c43646d..0952b0424f854 100644 --- a/www/ruby-cookiejar/PLIST +++ b/www/ruby-cookiejar/PLIST @@ -1,14 +1,21 @@ -@comment $NetBSD: PLIST,v 1.2 2014/03/26 13:37:22 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/15 16:09:04 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem +${GEM_LIBDIR}/.gitignore +${GEM_LIBDIR}/.rspec +${GEM_LIBDIR}/.travis.yml +${GEM_LIBDIR}/Gemfile ${GEM_LIBDIR}/LICENSE ${GEM_LIBDIR}/README.markdown ${GEM_LIBDIR}/Rakefile ${GEM_LIBDIR}/contributors.json +${GEM_LIBDIR}/cookiejar.gemspec ${GEM_LIBDIR}/lib/cookiejar.rb ${GEM_LIBDIR}/lib/cookiejar/cookie.rb ${GEM_LIBDIR}/lib/cookiejar/cookie_validation.rb ${GEM_LIBDIR}/lib/cookiejar/jar.rb +${GEM_LIBDIR}/lib/cookiejar/version.rb ${GEM_LIBDIR}/spec/cookie_spec.rb ${GEM_LIBDIR}/spec/cookie_validation_spec.rb ${GEM_LIBDIR}/spec/jar_spec.rb +${GEM_LIBDIR}/spec/spec_helper.rb ${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/www/ruby-cookiejar/distinfo b/www/ruby-cookiejar/distinfo index 913b8637dab48..7dc11d8ae73b0 100644 --- a/www/ruby-cookiejar/distinfo +++ b/www/ruby-cookiejar/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 02:47:33 agc Exp $ +$NetBSD: distinfo,v 1.4 2016/03/15 16:09:04 taca Exp $ -SHA1 (cookiejar-0.3.2.gem) = 401bb397e69c198ccab0f4d4ed3e5ccdf83bb9ed -RMD160 (cookiejar-0.3.2.gem) = d70e53843bdff2316fda6bcfff1f003904e970c2 -SHA512 (cookiejar-0.3.2.gem) = b3260b3c3d10bd2460e6289e63476bef1dfbc22078cf5dd4390778cfb0afc3b0dc290d0e39accd6d0d6165f71ea24ad7293d96ab2206e6ee2eaedd9e5db8789d -Size (cookiejar-0.3.2.gem) = 19968 bytes +SHA1 (cookiejar-0.3.3.gem) = 33dcc20d7c06e792fe12f47ebc413f34525e9758 +RMD160 (cookiejar-0.3.3.gem) = a59e8664538ebf7584dd31ac14805433b24b9d6b +SHA512 (cookiejar-0.3.3.gem) = 52ef655ef7f5219812216328ae24bbae0f5f6edea493bb96dffb1f9d665efa22cd3d1567e84c5cc3bec53ab3ceb8243afb4d710631cd274801e5b2de63a6edbe +Size (cookiejar-0.3.3.gem) = 20992 bytes From f45acc15271981d2947fdc6099aa533529b5e0bd Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:09:33 +0000 Subject: [PATCH 0189/2457] Note update of www/ruby-cookiejar package to 0.3.3. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 8b1c2101c2aa0..54d63f85af835 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1210 2016/03/15 16:03:15 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1211 2016/03/15 16:09:33 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1600,3 +1600,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/ruby-redcarpet to 3.3.4 [taca 2016-03-15] Updated textproc/ruby-will-paginate to 3.1.0 [taca 2016-03-15] Updated www/ruby-capybara to 2.6.2 [taca 2016-03-15] + Updated www/ruby-cookiejar to 0.3.3 [taca 2016-03-15] From 2211a516f88b69706fc736fc0ebea97365212deb Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:12:13 +0000 Subject: [PATCH 0190/2457] Update ruby-jekyll-watch to 1.3.1. * Test against Jekyll 2 and 3. (#30) * watcher: set LISTEN_GEM_DEBUGGING if --verbose flag set (#31) * Apply Rubocop auditing and fix up (#32) --- www/ruby-jekyll-watch/Makefile | 4 ++-- www/ruby-jekyll-watch/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/ruby-jekyll-watch/Makefile b/www/ruby-jekyll-watch/Makefile index 4dcc0cbd2e4e2..efee8e681dd42 100644 --- a/www/ruby-jekyll-watch/Makefile +++ b/www/ruby-jekyll-watch/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2015/10/04 13:28:41 taca Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/15 16:12:13 taca Exp $ -DISTNAME= jekyll-watch-1.3.0 +DISTNAME= jekyll-watch-1.3.1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/www/ruby-jekyll-watch/distinfo b/www/ruby-jekyll-watch/distinfo index 9523776a8c586..6e710e9687b0e 100644 --- a/www/ruby-jekyll-watch/distinfo +++ b/www/ruby-jekyll-watch/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2015/11/04 02:47:35 agc Exp $ +$NetBSD: distinfo,v 1.4 2016/03/15 16:12:13 taca Exp $ -SHA1 (jekyll-watch-1.3.0.gem) = 3a98196aa49f6de7452d53956c9c48b3296f780f -RMD160 (jekyll-watch-1.3.0.gem) = a327b5e8d39f71ed2d33fe27c49c9eb8027011f6 -SHA512 (jekyll-watch-1.3.0.gem) = b97c30b83e02fcb72ece1c886ff1bbef5363f0cac7b6af79631802156d4031d2bd307189a7174504d2e41fd6a5ba1f3d47806a9315cd5821b3c71ff511abcb49 -Size (jekyll-watch-1.3.0.gem) = 5632 bytes +SHA1 (jekyll-watch-1.3.1.gem) = 6968f3fb26133fe08394c64267a28d180837250d +RMD160 (jekyll-watch-1.3.1.gem) = 6fca431880f4e1f5347bc60becb746fea3d71213 +SHA512 (jekyll-watch-1.3.1.gem) = b47930117f502b701da54cc99ca8686f26d53a009758a17b03f9148381dd355b4e3b29e447e31b644226ce0757a2dc070cee0285180c5fdd34c52751e1ddfbd5 +Size (jekyll-watch-1.3.1.gem) = 5632 bytes From d75c59e9bc3a0ce29207b8bc11a117bbb87c3d2b Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:12:47 +0000 Subject: [PATCH 0191/2457] Note update of www/ruby-jekyll-watch package to 1.3.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 54d63f85af835..218201d3f11f3 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1211 2016/03/15 16:09:33 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1212 2016/03/15 16:12:47 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1601,3 +1601,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/ruby-will-paginate to 3.1.0 [taca 2016-03-15] Updated www/ruby-capybara to 2.6.2 [taca 2016-03-15] Updated www/ruby-cookiejar to 0.3.3 [taca 2016-03-15] + Updated www/ruby-jekyll-watch to 1.3.1 [taca 2016-03-15] From 23ba35987f2fe8e0e1a3df0c1bdb19350e3be74b Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:15:38 +0000 Subject: [PATCH 0192/2457] Update ruby-jekyll to 3.1.2. pkgsrc change: Drop dependency to ruby-rb-fsevent on Darwin since ruby-listen depends on ruby-rb-fsevent now. Changes are too many to write here, please refer . --- www/ruby-jekyll/Makefile | 11 ++--------- www/ruby-jekyll/PLIST | 13 ++++++++++++- www/ruby-jekyll/distinfo | 10 +++++----- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/www/ruby-jekyll/Makefile b/www/ruby-jekyll/Makefile index f8eb6c36c3c16..fd5fdba3f1776 100644 --- a/www/ruby-jekyll/Makefile +++ b/www/ruby-jekyll/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2016/03/03 14:43:44 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2016/03/15 16:15:38 taca Exp $ -DISTNAME= jekyll-3.0.1 -PKGREVISION= 1 +DISTNAME= jekyll-3.1.2 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -20,11 +19,5 @@ DEPENDS+= ${RUBY_PKGPREFIX}-jekyll-watch>=1.1<2:../../www/ruby-jekyll-watch RUBYGEM_OPTIONS+= --format-executable -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "Darwin" -DEPENDS+= ${RUBY_PKGPREFIX}-rb-fsevent>=0.9.7:../../devel/ruby-rb-fsevent -.endif - .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ruby-jekyll/PLIST b/www/ruby-jekyll/PLIST index f990049921940..ae1aed6d76ded 100644 --- a/www/ruby-jekyll/PLIST +++ b/www/ruby-jekyll/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.7 2015/12/13 16:49:28 taca Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/03/15 16:15:38 taca Exp $ bin/jekyll${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem +${GEM_LIBDIR}/.rubocop.yml ${GEM_LIBDIR}/LICENSE ${GEM_LIBDIR}/README.markdown ${GEM_LIBDIR}/bin/jekyll @@ -14,6 +15,7 @@ ${GEM_LIBDIR}/lib/jekyll/commands/doctor.rb ${GEM_LIBDIR}/lib/jekyll/commands/help.rb ${GEM_LIBDIR}/lib/jekyll/commands/new.rb ${GEM_LIBDIR}/lib/jekyll/commands/serve.rb +${GEM_LIBDIR}/lib/jekyll/commands/serve/servlet.rb ${GEM_LIBDIR}/lib/jekyll/configuration.rb ${GEM_LIBDIR}/lib/jekyll/converter.rb ${GEM_LIBDIR}/lib/jekyll/converters/identity.rb @@ -21,9 +23,17 @@ ${GEM_LIBDIR}/lib/jekyll/converters/markdown.rb ${GEM_LIBDIR}/lib/jekyll/converters/markdown/kramdown_parser.rb ${GEM_LIBDIR}/lib/jekyll/converters/markdown/rdiscount_parser.rb ${GEM_LIBDIR}/lib/jekyll/converters/markdown/redcarpet_parser.rb +${GEM_LIBDIR}/lib/jekyll/converters/smartypants.rb ${GEM_LIBDIR}/lib/jekyll/convertible.rb ${GEM_LIBDIR}/lib/jekyll/deprecator.rb ${GEM_LIBDIR}/lib/jekyll/document.rb +${GEM_LIBDIR}/lib/jekyll/drops/collection_drop.rb +${GEM_LIBDIR}/lib/jekyll/drops/document_drop.rb +${GEM_LIBDIR}/lib/jekyll/drops/drop.rb +${GEM_LIBDIR}/lib/jekyll/drops/jekyll_drop.rb +${GEM_LIBDIR}/lib/jekyll/drops/site_drop.rb +${GEM_LIBDIR}/lib/jekyll/drops/unified_payload_drop.rb +${GEM_LIBDIR}/lib/jekyll/drops/url_drop.rb ${GEM_LIBDIR}/lib/jekyll/entry_filter.rb ${GEM_LIBDIR}/lib/jekyll/errors.rb ${GEM_LIBDIR}/lib/jekyll/excerpt.rb @@ -61,6 +71,7 @@ ${GEM_LIBDIR}/lib/jekyll/tags/include.rb ${GEM_LIBDIR}/lib/jekyll/tags/post_url.rb ${GEM_LIBDIR}/lib/jekyll/url.rb ${GEM_LIBDIR}/lib/jekyll/utils.rb +${GEM_LIBDIR}/lib/jekyll/utils/ansi.rb ${GEM_LIBDIR}/lib/jekyll/utils/platforms.rb ${GEM_LIBDIR}/lib/jekyll/version.rb ${GEM_LIBDIR}/lib/site_template/.gitignore diff --git a/www/ruby-jekyll/distinfo b/www/ruby-jekyll/distinfo index 0696f9a2b7f3f..70826c3e025e5 100644 --- a/www/ruby-jekyll/distinfo +++ b/www/ruby-jekyll/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/12/13 16:49:28 taca Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:15:38 taca Exp $ -SHA1 (jekyll-3.0.1.gem) = ecfb35f1488590256456bcd479cc65f28471397e -RMD160 (jekyll-3.0.1.gem) = d519176bcf1cb35833a235a7e7d6476d3c3eda9a -SHA512 (jekyll-3.0.1.gem) = 6108c822f64c0c7163e75f80040dfcc8be48d1cfb742b35af031fadaac85b6824608803da0470d90926124aaa71da1fb9d39b3365ad1d834208e2ef02d8a025c -Size (jekyll-3.0.1.gem) = 74752 bytes +SHA1 (jekyll-3.1.2.gem) = 8cf81cfa98889b72b95de6dd1684a250885e21b5 +RMD160 (jekyll-3.1.2.gem) = de3e5521165425da9255e7e6ce58149d48f366b7 +SHA512 (jekyll-3.1.2.gem) = 5452e93413d60d93958e6c7085203171130dda127c39405640fc072b45eae10e37d6fe0b7a0731002405050af7c41cb12180eaf5d4743503de230ab97b9b812e +Size (jekyll-3.1.2.gem) = 81920 bytes From 090daa077bbebc3c5b2ae8b1dadd6bbbc70324d6 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:16:21 +0000 Subject: [PATCH 0193/2457] Note update of www/ruby-jekyll package to 3.1.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 218201d3f11f3..f20c5cadcf7c5 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1212 2016/03/15 16:12:47 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1213 2016/03/15 16:16:21 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1602,3 +1602,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-capybara to 2.6.2 [taca 2016-03-15] Updated www/ruby-cookiejar to 0.3.3 [taca 2016-03-15] Updated www/ruby-jekyll-watch to 1.3.1 [taca 2016-03-15] + Updated www/ruby-jekyll to 3.1.2 [taca 2016-03-15] From a6fe64e12d7b234f173a82e8a8453eaaa65d5cbe Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:18:11 +0000 Subject: [PATCH 0194/2457] Update ruby-rack-cache to 1.6.1 ## 1.6.1 * Revert 'No longer read responses from cache when we already have them' ## 1.6.0 * Noop backend * No longer read responses from cache when we already have them * renamed files from entitystore -> entity_store (metastore/cachecontrol/appengine) and added warns for old ones --- www/ruby-rack-cache/Makefile | 4 ++-- www/ruby-rack-cache/PLIST | 6 +++++- www/ruby-rack-cache/distinfo | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/www/ruby-rack-cache/Makefile b/www/ruby-rack-cache/Makefile index 87660a14b8ba1..1104269646617 100644 --- a/www/ruby-rack-cache/Makefile +++ b/www/ruby-rack-cache/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2015/12/13 16:11:33 taca Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/15 16:18:11 taca Exp $ -DISTNAME= rack-cache-1.5.1 +DISTNAME= rack-cache-1.6.1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/www/ruby-rack-cache/PLIST b/www/ruby-rack-cache/PLIST index ba8432fa460a5..33017e6243154 100644 --- a/www/ruby-rack-cache/PLIST +++ b/www/ruby-rack-cache/PLIST @@ -1,15 +1,19 @@ -@comment $NetBSD: PLIST,v 1.3 2015/12/13 16:11:33 taca Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/03/15 16:18:11 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/CHANGES ${GEM_LIBDIR}/MIT-LICENSE ${GEM_LIBDIR}/README.md ${GEM_LIBDIR}/lib/rack-cache.rb ${GEM_LIBDIR}/lib/rack/cache.rb +${GEM_LIBDIR}/lib/rack/cache/app_engine.rb ${GEM_LIBDIR}/lib/rack/cache/appengine.rb +${GEM_LIBDIR}/lib/rack/cache/cache_control.rb ${GEM_LIBDIR}/lib/rack/cache/cachecontrol.rb ${GEM_LIBDIR}/lib/rack/cache/context.rb +${GEM_LIBDIR}/lib/rack/cache/entity_store.rb ${GEM_LIBDIR}/lib/rack/cache/entitystore.rb ${GEM_LIBDIR}/lib/rack/cache/key.rb +${GEM_LIBDIR}/lib/rack/cache/meta_store.rb ${GEM_LIBDIR}/lib/rack/cache/metastore.rb ${GEM_LIBDIR}/lib/rack/cache/options.rb ${GEM_LIBDIR}/lib/rack/cache/request.rb diff --git a/www/ruby-rack-cache/distinfo b/www/ruby-rack-cache/distinfo index 126210edb6a38..69b4c193b82bc 100644 --- a/www/ruby-rack-cache/distinfo +++ b/www/ruby-rack-cache/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2015/12/13 16:11:33 taca Exp $ +$NetBSD: distinfo,v 1.5 2016/03/15 16:18:11 taca Exp $ -SHA1 (rack-cache-1.5.1.gem) = d0098a93e96f8af7a33f1835f114408c7a56665c -RMD160 (rack-cache-1.5.1.gem) = b8fa4e602b5b6cfe1af038bc3d6e749d17556862 -SHA512 (rack-cache-1.5.1.gem) = 355a935861fc72f23df0d3d94b12d588ae7d376d01497ee9a4d01fdf136ddec2dabbabc2cb46625338ad30feff373729a13acf93c04d8d62ac3590b9e0f430da -Size (rack-cache-1.5.1.gem) = 27136 bytes +SHA1 (rack-cache-1.6.1.gem) = f1036d32148ad1d0bb64ab32f024a90e83750bc7 +RMD160 (rack-cache-1.6.1.gem) = 60f2797487a2dc2e18724027ac41ccd2da05aea5 +SHA512 (rack-cache-1.6.1.gem) = 79c3ef7f52c6b114d72a79721d8f9f49f73f0677193f56637781afac45e5ab7ef3e7f81ba451d12632d9c43ab6748e78a6145819eb336720594f5fb04cc784c9 +Size (rack-cache-1.6.1.gem) = 28160 bytes From f84ccd4c33ce3352701dc630c38a25297552f944 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:18:39 +0000 Subject: [PATCH 0195/2457] Note update of www/ruby-rack-cache package to 1.6.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index f20c5cadcf7c5..6f2192d44bcba 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1213 2016/03/15 16:16:21 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1214 2016/03/15 16:18:39 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1603,3 +1603,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-cookiejar to 0.3.3 [taca 2016-03-15] Updated www/ruby-jekyll-watch to 1.3.1 [taca 2016-03-15] Updated www/ruby-jekyll to 3.1.2 [taca 2016-03-15] + Updated www/ruby-rack-cache to 1.6.1 [taca 2016-03-15] From fb4a5c5d5e24e4fd69995b9f9cd2d8c15a980a0b Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:22:46 +0000 Subject: [PATCH 0196/2457] Update ruby-sass to 3.4.21. 3.4.21 (11 January 2016) This is a bug fix release. * Consistent output formatting for numbers close to an integer. Issue #1931 * Correctly round negative numbers that were almost but not quite a whole number (slightly greater than the negative number). Issue #1938 * Don't strip escaped semicolons from compressed output. Issue #1932 * Only compress around dashes within nth selectors. Issue #1933 * Selector compression of whitespace around commas was affecting attribute values. Issue #1947 * Make subtraction work when a unit is followed directly by a hyphen and then a period. For example, 1em-.75em now returns 0.25em rather than 1em-0.75em. This is consistent with the behavior when the subtrahend begins with a 0. Issue #1954 --- www/ruby-sass/Makefile | 4 ++-- www/ruby-sass/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/ruby-sass/Makefile b/www/ruby-sass/Makefile index b6a7299aff7cc..5e87dedf8e33c 100644 --- a/www/ruby-sass/Makefile +++ b/www/ruby-sass/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2015/12/13 16:14:53 taca Exp $ +# $NetBSD: Makefile,v 1.20 2016/03/15 16:22:46 taca Exp $ -DISTNAME= sass-3.4.20 +DISTNAME= sass-3.4.21 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/www/ruby-sass/distinfo b/www/ruby-sass/distinfo index 2911f351f871e..fdf240b9a4c46 100644 --- a/www/ruby-sass/distinfo +++ b/www/ruby-sass/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.18 2015/12/13 16:14:53 taca Exp $ +$NetBSD: distinfo,v 1.19 2016/03/15 16:22:46 taca Exp $ -SHA1 (sass-3.4.20.gem) = 996f09ef7ca58fcbd6f0047542aeab0c66143b69 -RMD160 (sass-3.4.20.gem) = 7596acef12bc7f7ff794dfe0b229d7777539cb94 -SHA512 (sass-3.4.20.gem) = 3df8eb248499b5b08d1dee828cd359f86d47fe487e442f073c84cf18b88d004e41bcf0e5505fc38e1a37d985ad2d6863487406773ff0a0d876676fb72c774cdb -Size (sass-3.4.20.gem) = 343552 bytes +SHA1 (sass-3.4.21.gem) = e340d12cef811198b7a40152c8f9e21c4c568a1c +RMD160 (sass-3.4.21.gem) = 0f36c17b0c74619e8c8c6a6b5ac5561991661163 +SHA512 (sass-3.4.21.gem) = 10b46c79690edfca10704824b562385b39842832dedeaed80c7b2fb8921174120c48a6997aad4e61c1bfa4bc5a7deaed46e42005f49060f62ff93b6311368a07 +Size (sass-3.4.21.gem) = 345088 bytes From 7fb62a48b7f5c3009843c8410f86acb8efbf1601 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:23:22 +0000 Subject: [PATCH 0197/2457] Note update of www/ruby-sass package to 3.4.21. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 6f2192d44bcba..c341a5b92ab0e 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1214 2016/03/15 16:18:39 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1215 2016/03/15 16:23:22 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1604,3 +1604,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-jekyll-watch to 1.3.1 [taca 2016-03-15] Updated www/ruby-jekyll to 3.1.2 [taca 2016-03-15] Updated www/ruby-rack-cache to 1.6.1 [taca 2016-03-15] + Updated www/ruby-sass to 3.4.21 [taca 2016-03-15] From 1ab216dfde268c2b5d2958967b85bc0c86f23b02 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:23:48 +0000 Subject: [PATCH 0198/2457] Update ruby-sinatra to 1.4.7. = 1.4.7 / 2016-01-24 * Add Ashley Williams, Trevor Bramble, and Kashyap Kondamudi to team Sinatra. * Correctly handle encoded colons in routes. (Jeremy Evans) * Rename CHANGES to CHANGELOG.md and update Rakefile. #1043 (Eliza Sorensen) * Improve documentation. #941, #1069, #1075, #1025, #1052 (Many great folks) * Introduce `Sinatra::Ext` to workaround Rack 1.6 bug to fix Ruby 1.8.7 support. #1080 (Zachary Scott) * Add CONTRIBUTING guide. #987 (Katrina Owen) --- www/ruby-sinatra/Makefile | 6 +++--- www/ruby-sinatra/PLIST | 7 +++++-- www/ruby-sinatra/distinfo | 10 +++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/www/ruby-sinatra/Makefile b/www/ruby-sinatra/Makefile index 0bb0812325f20..7c05b49a84ea2 100644 --- a/www/ruby-sinatra/Makefile +++ b/www/ruby-sinatra/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2015/06/11 17:03:17 taca Exp $ +# $NetBSD: Makefile,v 1.18 2016/03/15 16:23:48 taca Exp $ -DISTNAME= sinatra-1.4.6 +DISTNAME= sinatra-1.4.7 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org @@ -8,7 +8,7 @@ HOMEPAGE= http://www.sinatrarb.com/ COMMENT= Classy web-development dressed in a DSL LICENSE= mit -DEPENDS+= ${RUBY_PKGPREFIX}-rack>=1.4<2:../../www/ruby-rack +DEPENDS+= ${RUBY_PKGPREFIX}-rack>=1.5<2:../../www/ruby-rack DEPENDS+= ${RUBY_PKGPREFIX}-rack-protection>=1.4<2:../../www/ruby-rack-protection DEPENDS+= ${RUBY_PKGPREFIX}-tilt>=1.3.4<3:../../textproc/ruby-tilt diff --git a/www/ruby-sinatra/PLIST b/www/ruby-sinatra/PLIST index 2cb590573f92a..229e6031d7014 100644 --- a/www/ruby-sinatra/PLIST +++ b/www/ruby-sinatra/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.9 2015/06/11 17:03:17 taca Exp $ +@comment $NetBSD: PLIST,v 1.10 2016/03/15 16:23:48 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.yardopts ${GEM_LIBDIR}/AUTHORS.md -${GEM_LIBDIR}/CHANGES +${GEM_LIBDIR}/CHANGELOG.md +${GEM_LIBDIR}/CONTRIBUTING.md ${GEM_LIBDIR}/Gemfile ${GEM_LIBDIR}/LICENSE ${GEM_LIBDIR}/README.de.md @@ -22,6 +23,7 @@ ${GEM_LIBDIR}/examples/simple.rb ${GEM_LIBDIR}/examples/stream.ru ${GEM_LIBDIR}/lib/sinatra.rb ${GEM_LIBDIR}/lib/sinatra/base.rb +${GEM_LIBDIR}/lib/sinatra/ext.rb ${GEM_LIBDIR}/lib/sinatra/images/404.png ${GEM_LIBDIR}/lib/sinatra/images/500.png ${GEM_LIBDIR}/lib/sinatra/main.rb @@ -55,6 +57,7 @@ ${GEM_LIBDIR}/test/mediawiki_test.rb ${GEM_LIBDIR}/test/middleware_test.rb ${GEM_LIBDIR}/test/nokogiri_test.rb ${GEM_LIBDIR}/test/public/favicon.ico +${GEM_LIBDIR}/test/public/hello+world.txt ${GEM_LIBDIR}/test/rabl_test.rb ${GEM_LIBDIR}/test/rack_test.rb ${GEM_LIBDIR}/test/radius_test.rb diff --git a/www/ruby-sinatra/distinfo b/www/ruby-sinatra/distinfo index 2da17a354d6eb..4a1691929cf15 100644 --- a/www/ruby-sinatra/distinfo +++ b/www/ruby-sinatra/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.13 2015/11/04 02:47:37 agc Exp $ +$NetBSD: distinfo,v 1.14 2016/03/15 16:23:48 taca Exp $ -SHA1 (sinatra-1.4.6.gem) = b1c01945a2af9449c7bb0f8df6dd22a5f1ac5d62 -RMD160 (sinatra-1.4.6.gem) = d0979348e447ecc443be15c6b1da0e4fc4ea36c5 -SHA512 (sinatra-1.4.6.gem) = 3b80137a8c31bc60c24b4fb4e5984fc9064f52733f5a7214079a50d1c9acfa3046f06935c7eeb611aa4e3d0979fcd88c8db741a08429000a2fb94956c7648552 -Size (sinatra-1.4.6.gem) = 355840 bytes +SHA1 (sinatra-1.4.7.gem) = 1c7f1ad8af670f4990373ebddb4d9fecd8f3c7d1 +RMD160 (sinatra-1.4.7.gem) = d131931c031b57ab7a2b18ca44db0b2ae1f761b3 +SHA512 (sinatra-1.4.7.gem) = f13531390af95e0bb42f7c5cc350e3aee7136c1bb81b487ef71cc194ed6675722a1c23ff6b65ac0e3b2c1a0986bfa733c4a0f24cf9bbe0168a18cd4d18d8a13a +Size (sinatra-1.4.7.gem) = 369664 bytes From 568bea6e11911a5b315c60f6f46970e8c6ca7c45 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:24:20 +0000 Subject: [PATCH 0199/2457] Note update of www/ruby-sinatra package to 1.4.7. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index c341a5b92ab0e..8ce4cac8024f2 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1215 2016/03/15 16:23:22 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1216 2016/03/15 16:24:20 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1605,3 +1605,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-jekyll to 3.1.2 [taca 2016-03-15] Updated www/ruby-rack-cache to 1.6.1 [taca 2016-03-15] Updated www/ruby-sass to 3.4.21 [taca 2016-03-15] + Updated www/ruby-sinatra to 1.4.7 [taca 2016-03-15] From d9c59f6e9f36f9c51bd4e6a7bc9d4b7919fbd9b8 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:41:49 +0000 Subject: [PATCH 0200/2457] Update Padrino to 0.13.1. Padrino 0.13.1 - Router and Reloader Updates, Ruby Compatibility, and Bug Fixes Posted on January 17, 2016 by Nathan Esquenazi Padrino 0.13.0 was shipped 3 months ago on October 2015 and laid important groundwork towards our eventual 1.0 release but also introduced some new issues. After a few months of effort, we are excited to announce the release of Padrino 0.13.1! This version is filled with routing and reloader optimizations, compatibility updates, and bug fixes. Full details for this release are below. Router and Reloader Updates The biggest improvement in this release is a significant reduction in the memory usage of Padrino apps by changing the configuration of the underlying mustermann router. Full list of improvements to router and reloader include: * FIX #1975 Improve routing memory usage and performance (@namusyaka) * FIX #1982 Support nested query for expanding path (@namusyaka) * FIX #1978 Enable reloading of custom dependencies (@markglenfletcher) Ruby Compatibility Padrino 0.13.1 has been fixed to be fully compatible with Ruby 2.3 thanks to @tyabe: * FIX #2000 Fix mutex handling for Ruby 2.3 (@tyabe) Bug Fixes and Miscellaneous There are also several bug fixes and other updates: * FIX Remove use of ActiveSupport in tests (@ujifgc) * FIX #1994 Missing new line in mocha generator (@peter50216) * FIX #1995 Invalid german dates (@ujifgc) * FIX #1998 Only output a warning message if the spec task is invoked (@postmodern) * FIX #1882 test for selected values for select tag (@ujifgc) * FIX rendering exception for custom mime types (@nesquena) * FIX relax mail gem dependency (@ujifgc) * FIX minor doc typos (@lokyoung, @markglenfletcher) --- www/ruby-padrino-admin/distinfo | 10 +++++----- www/ruby-padrino-cache/distinfo | 10 +++++----- www/ruby-padrino-core/PLIST | 4 +++- www/ruby-padrino-core/distinfo | 10 +++++----- www/ruby-padrino-gen/distinfo | 10 +++++----- www/ruby-padrino-helpers/distinfo | 10 +++++----- www/ruby-padrino-mailer/Makefile | 4 ++-- www/ruby-padrino-mailer/distinfo | 10 +++++----- www/ruby-padrino-support/PLIST | 4 +++- www/ruby-padrino-support/distinfo | 10 +++++----- www/ruby-padrino/Makefile.common | 4 ++-- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/www/ruby-padrino-admin/distinfo b/www/ruby-padrino-admin/distinfo index 08019f16125f3..de6cf15fcf2f9 100644 --- a/www/ruby-padrino-admin/distinfo +++ b/www/ruby-padrino-admin/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/12/13 15:52:14 taca Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:41:49 taca Exp $ -SHA1 (padrino-admin-0.13.0.gem) = b7fa83121573902167fb8ce3271adeaedd5f6d67 -RMD160 (padrino-admin-0.13.0.gem) = bf89dc8b72e3099919c3a717c6257890e9234e4a -SHA512 (padrino-admin-0.13.0.gem) = 5da85f88bfee5354b8a79eed30ef1caf4ebbe2ae60eac31c49aaa4945dc5d4bf7c4aafc0fc4466462e18490c35add7f65f020e2c74219203a5062484bc20d13c -Size (padrino-admin-0.13.0.gem) = 685056 bytes +SHA1 (padrino-admin-0.13.1.gem) = 59920e37d18fc8b8abbebaeda38d0efda62efec9 +RMD160 (padrino-admin-0.13.1.gem) = 9e0a810289fa9b67ed7714d934ffc1980346d40e +SHA512 (padrino-admin-0.13.1.gem) = 19d6b0630b913b18f572e7ea8b759e43dd9cd3f14b6eafd5d5173f0cbf32d9ecc7dbfcc15ddd7a5891daa911f2f7973ab1f6496f6a0f2c78708f3afa4d220cf2 +Size (padrino-admin-0.13.1.gem) = 685056 bytes diff --git a/www/ruby-padrino-cache/distinfo b/www/ruby-padrino-cache/distinfo index 35c484bd5569a..2bda69b317a28 100644 --- a/www/ruby-padrino-cache/distinfo +++ b/www/ruby-padrino-cache/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/12/13 15:52:14 taca Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:41:49 taca Exp $ -SHA1 (padrino-cache-0.13.0.gem) = f34681be5f273909e2309f33a3be8ccc4c68d001 -RMD160 (padrino-cache-0.13.0.gem) = 2d75812507d96a819c5d7665aee580281107e553 -SHA512 (padrino-cache-0.13.0.gem) = c56b9ea7389c7b470fd036e3f31470996c34882a2da41f9d99045ac0dc54440faeb8ef308241efded496bca01b6be5fc1f151b995d44e13e79083809866dd244 -Size (padrino-cache-0.13.0.gem) = 14848 bytes +SHA1 (padrino-cache-0.13.1.gem) = c30e09f2bb8ec9a5db272d64a3436044bc2d3a70 +RMD160 (padrino-cache-0.13.1.gem) = 18d1a47c7347a6ceebc94dd972265650378f2f4c +SHA512 (padrino-cache-0.13.1.gem) = a15165f8e8f00c5c371d9781f023dcf4080379308689cd77b3f3b1c1ad3ca645212808572ee4a5c686817cf6239d456c15c33bdb2ad7b323fed1fc5ea09b1e26 +Size (padrino-cache-0.13.1.gem) = 14848 bytes diff --git a/www/ruby-padrino-core/PLIST b/www/ruby-padrino-core/PLIST index 493ff00a2f9f7..6fdf6a4a27167 100644 --- a/www/ruby-padrino-core/PLIST +++ b/www/ruby-padrino-core/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2015/12/13 15:52:14 taca Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/03/15 16:41:49 taca Exp $ bin/padrino${RUBY_SUFFIX} ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.document @@ -53,6 +53,8 @@ ${GEM_LIBDIR}/test/fixtures/app_gem/app_gem.gemspec ${GEM_LIBDIR}/test/fixtures/app_gem/lib/app_gem.rb ${GEM_LIBDIR}/test/fixtures/app_gem/lib/app_gem/version.rb ${GEM_LIBDIR}/test/fixtures/apps/complex.rb +${GEM_LIBDIR}/test/fixtures/apps/custom_dependencies/custom_dependencies.rb +${GEM_LIBDIR}/test/fixtures/apps/custom_dependencies/my_dependencies/my_dependency.rb ${GEM_LIBDIR}/test/fixtures/apps/demo_app.rb ${GEM_LIBDIR}/test/fixtures/apps/demo_demo.rb ${GEM_LIBDIR}/test/fixtures/apps/demo_project/api/app.rb diff --git a/www/ruby-padrino-core/distinfo b/www/ruby-padrino-core/distinfo index f4c449e810ce9..4cbedd9106141 100644 --- a/www/ruby-padrino-core/distinfo +++ b/www/ruby-padrino-core/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/12/13 15:52:14 taca Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:41:49 taca Exp $ -SHA1 (padrino-core-0.13.0.gem) = 5789e456678af4ac17e4a2a1789fb230dbfa25a1 -RMD160 (padrino-core-0.13.0.gem) = de6e6a15bfc0eb1fdbd648c7fc72153da42e94cf -SHA512 (padrino-core-0.13.0.gem) = dbe33f7760d4b231235f5b5bb247a79bf60c54f4299b492e5397cc544daf8a307a7360fd7934fb0189c4afab775a113958b6767089db60222cd5c1a2192c958a -Size (padrino-core-0.13.0.gem) = 136704 bytes +SHA1 (padrino-core-0.13.1.gem) = dd9b071cf1093bab5466eeb043b7eafa6914bd96 +RMD160 (padrino-core-0.13.1.gem) = f86d1af0619b9dbe97441dbd5a27c78d45df9ce2 +SHA512 (padrino-core-0.13.1.gem) = ee89ea825588d823af989381400725d26cba1a5488c82513e05986f21869caa00f77d272e7c969799c9fc52db1b03562766e5464875b9d08ea5e9f3d16d9164c +Size (padrino-core-0.13.1.gem) = 136704 bytes diff --git a/www/ruby-padrino-gen/distinfo b/www/ruby-padrino-gen/distinfo index d1001885f355f..fb2eb41604e5f 100644 --- a/www/ruby-padrino-gen/distinfo +++ b/www/ruby-padrino-gen/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/12/13 15:52:14 taca Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:41:50 taca Exp $ -SHA1 (padrino-gen-0.13.0.gem) = 2680a8fccf5e5e4d18ca9255b7bdce1d5a59b7f6 -RMD160 (padrino-gen-0.13.0.gem) = 673a5ab37ca929ffc298aa8fa609ed1ad52c6820 -SHA512 (padrino-gen-0.13.0.gem) = de72e21d5d4379d0dcfe8a5fded11f1b510584a8694432462796dafd4237141c289940ea35b6d3e334df4733bd20324d1df3ccd056fcbb3344ef7dfaee2baa92 -Size (padrino-gen-0.13.0.gem) = 650240 bytes +SHA1 (padrino-gen-0.13.1.gem) = cb4e432955871728370fdc032c2105a20eb17fd4 +RMD160 (padrino-gen-0.13.1.gem) = e92a67dce8f4605ca35b5d7be60da0a7dc7ed02d +SHA512 (padrino-gen-0.13.1.gem) = c84e838a102d33101dd68904c5609d0f80cbc524f3f0bca63c058431c0b0f5460e22132fd2991d1e7e66fbc56a45de0eca3464f8f679d84dd8b6bc2c4c978cb3 +Size (padrino-gen-0.13.1.gem) = 650240 bytes diff --git a/www/ruby-padrino-helpers/distinfo b/www/ruby-padrino-helpers/distinfo index 2524679def62a..7004b3225902c 100644 --- a/www/ruby-padrino-helpers/distinfo +++ b/www/ruby-padrino-helpers/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/12/13 15:52:14 taca Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:41:50 taca Exp $ -SHA1 (padrino-helpers-0.13.0.gem) = 34c79827e7faa95b1f1e049e596e5c89af4a146d -RMD160 (padrino-helpers-0.13.0.gem) = d8666ff595cb1209d7f7b70f0b8cd7d8c0912971 -SHA512 (padrino-helpers-0.13.0.gem) = 6222f00e76db8f76b0f88830ff3331f0860ff60ab17c84e46c85736966363418a890f065cb0c2b9edb1930b2970788bd7d0289968f9448cb4d83afe49470ca42 -Size (padrino-helpers-0.13.0.gem) = 85504 bytes +SHA1 (padrino-helpers-0.13.1.gem) = 21aa4d632d5b2ccec6e2d20f44c0c09bed92088b +RMD160 (padrino-helpers-0.13.1.gem) = 685a6376f3aec0c296fdfbb764062ad5a2b22b40 +SHA512 (padrino-helpers-0.13.1.gem) = 1a614c81de6b6d034839d2a768359d0810028d060e8b2dfe403f569ff9dafa2e8437f573a00f62c785ea3e568610a68871b5c39090f668b8ce542ff0ef0a683b +Size (padrino-helpers-0.13.1.gem) = 85504 bytes diff --git a/www/ruby-padrino-mailer/Makefile b/www/ruby-padrino-mailer/Makefile index a20d9037db50c..eead1bb8e999f 100644 --- a/www/ruby-padrino-mailer/Makefile +++ b/www/ruby-padrino-mailer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/02/04 14:57:44 taca Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/15 16:41:50 taca Exp $ DISTNAME= padrino-mailer-${RUBY_PADRINO_VERS} CATEGORIES= www @@ -9,7 +9,7 @@ COMMENT= Mailer system for padrino LICENSE= mit DEPENDS+= ${RUBY_PKGPREFIX}-padrino-core>=${RUBY_PADRINO_VERS}:../../www/ruby-padrino-core -DEPENDS+= ${RUBY_PKGPREFIX}-mail25>=2.5.3<2.6:../../mail/ruby-mail25 +DEPENDS+= ${RUBY_PKGPREFIX}-mail25>=2.5<3:../../mail/ruby-mail .include "../../www/ruby-padrino/Makefile.common" .include "../../lang/ruby/gem.mk" diff --git a/www/ruby-padrino-mailer/distinfo b/www/ruby-padrino-mailer/distinfo index 07870eff9fb3d..117123a0a5125 100644 --- a/www/ruby-padrino-mailer/distinfo +++ b/www/ruby-padrino-mailer/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/12/13 15:52:14 taca Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:41:50 taca Exp $ -SHA1 (padrino-mailer-0.13.0.gem) = 66146845a61cc859709bc7ed9e98b95d1dba24ae -RMD160 (padrino-mailer-0.13.0.gem) = f0b7a8c7abafbb6708947ed585ef8be26167238b -SHA512 (padrino-mailer-0.13.0.gem) = 6257d6ba6fc61ba75d75c674e1b941bd5265ab88e4bd89b91ba0522e107ea2d3959ffbb4216064237b14e3620b330dc5c31862d146bdd53a96d9c370961195da -Size (padrino-mailer-0.13.0.gem) = 17408 bytes +SHA1 (padrino-mailer-0.13.1.gem) = 6310e269bace7a069617dd4983591761f6717f02 +RMD160 (padrino-mailer-0.13.1.gem) = 42a66926e7476742ad95972a5b351348905fff8c +SHA512 (padrino-mailer-0.13.1.gem) = 9456a1d286ec166a707862f9bad767e1b20d5c5c51af9dd3c73128d5ca9ff1bd73cdccd4dc714d4f81b9032a17604a2e491462cbcf48687ce6e7502942c3938b +Size (padrino-mailer-0.13.1.gem) = 17408 bytes diff --git a/www/ruby-padrino-support/PLIST b/www/ruby-padrino-support/PLIST index 15da2f41bb092..8a8f3d331ce82 100644 --- a/www/ruby-padrino-support/PLIST +++ b/www/ruby-padrino-support/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2015/12/13 15:52:14 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/15 16:41:50 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.document ${GEM_LIBDIR}/.gitignore @@ -31,8 +31,10 @@ ${GEM_LIBDIR}/lib/padrino-support/locale/tr.yml ${GEM_LIBDIR}/lib/padrino-support/locale/uk.yml ${GEM_LIBDIR}/lib/padrino-support/locale/zh_cn.yml ${GEM_LIBDIR}/lib/padrino-support/locale/zh_tw.yml +${GEM_LIBDIR}/lib/padrino-support/utils.rb ${GEM_LIBDIR}/padrino-support.gemspec ${GEM_LIBDIR}/test/helper.rb ${GEM_LIBDIR}/test/test_colorize.rb ${GEM_LIBDIR}/test/test_support_lite.rb +${GEM_LIBDIR}/test/test_utils.rb ${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/www/ruby-padrino-support/distinfo b/www/ruby-padrino-support/distinfo index 58ff39aeb4855..077e2f126bfe3 100644 --- a/www/ruby-padrino-support/distinfo +++ b/www/ruby-padrino-support/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2015/12/13 15:52:14 taca Exp $ +$NetBSD: distinfo,v 1.5 2016/03/15 16:41:50 taca Exp $ -SHA1 (padrino-support-0.13.0.gem) = da1cb79792784914f8896020ea7295ec2426a954 -RMD160 (padrino-support-0.13.0.gem) = c4c29039bcfd8391fcb5444487eb2e48ea9df1e6 -SHA512 (padrino-support-0.13.0.gem) = 39116848d834d89df7c3ea7bd7b0622e2e6ac114a57335f7404507a98e89af1100cf0955fad532dd78816201168e93aa188a36b04272fb1780ca37849877eef3 -Size (padrino-support-0.13.0.gem) = 13824 bytes +SHA1 (padrino-support-0.13.1.gem) = cbec3a6b117b867fd9043996d834d4ae9413b3a6 +RMD160 (padrino-support-0.13.1.gem) = 1732efc331aa7a5bcb679d9579b690ac7dde87c1 +SHA512 (padrino-support-0.13.1.gem) = 8aab881ca19c2fc9943abc3a8eed92dff387fffd53086cad4cc65e474a7fe70228cebf6a3f9ddb531b646600b44d74df4dcdedc2291656d03719185bc00e4b20 +Size (padrino-support-0.13.1.gem) = 14848 bytes diff --git a/www/ruby-padrino/Makefile.common b/www/ruby-padrino/Makefile.common index f86d41b29950f..9e9d9c0d43e31 100644 --- a/www/ruby-padrino/Makefile.common +++ b/www/ruby-padrino/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2015/12/13 15:52:13 taca Exp $ +# $NetBSD: Makefile.common,v 1.9 2016/03/15 16:41:49 taca Exp $ # # used by www/ruby-padrino/Makefile # used by www/ruby-padrino-admin/Makefile @@ -9,5 +9,5 @@ # used by www/ruby-padrino-mailer/Makefile # used by www/ruby-padrino-support/Makefile -RUBY_PADRINO_VERS= 0.13.0 +RUBY_PADRINO_VERS= 0.13.1 RUBY_PADRINO_SITE= http://www.padrinorb.com/ From 2907c06ccc341de73ba1d6c0a5c7889ffdbd4b06 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:44:46 +0000 Subject: [PATCH 0201/2457] Note update of Padrino packages to 0.13.1. www/ruby-padrino-support www/ruby-padrino-helpers www/ruby-padrino-core www/ruby-padrino-cache www/ruby-padrino-gen www/ruby-padrino-admin www/ruby-padrino-mailer www/ruby-padrino --- doc/CHANGES-2016 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 8ce4cac8024f2..1d022538c49b7 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1216 2016/03/15 16:24:20 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1217 2016/03/15 16:44:46 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1606,3 +1606,11 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-rack-cache to 1.6.1 [taca 2016-03-15] Updated www/ruby-sass to 3.4.21 [taca 2016-03-15] Updated www/ruby-sinatra to 1.4.7 [taca 2016-03-15] + Updated www/ruby-padrino-support to 0.13.1 [taca 2016-03-15] + Updated www/ruby-padrino-helpers to 0.13.1 [taca 2016-03-15] + Updated www/ruby-padrino-core to 0.13.1 [taca 2016-03-15] + Updated www/ruby-padrino-cache to 0.13.1 [taca 2016-03-15] + Updated www/ruby-padrino-gen to 0.13.1 [taca 2016-03-15] + Updated www/ruby-padrino-admin to 0.13.1 [taca 2016-03-15] + Updated www/ruby-padrino-mailer to 0.13.1 [taca 2016-03-15] + Updated www/ruby-padrino to 0.13.1 [taca 2016-03-15] From 86dac473173a0e729c6f951b4d9757fb15f419e9 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:46:50 +0000 Subject: [PATCH 0202/2457] Update ruby-puma to 2.16.0. === 2.16.0 / 2016-01-27 * 7 minor features: * Add 'set_remote_address' config option * Allow to run puma in silent mode * Expose cli options in DSL * Support passing JRuby keystore info in ssl_bind DSL * Allow umask for unix:/// style control urls * Expose `old_worker_count` in stats url * Support TLS client auth (verify_mode) in jruby * 7 bug fixes: * Don't persist before_fork hook in state file * Reload bundler before pulling in rack. Fixes #859 * Remove NEWRELIC_DISPATCHER env variable * Cleanup C code * Use Timeout.timeout instead of Object.timeout * Make phased restarts faster * Ignore the case of certain headers, because HTTP * 1 doc changes: * Test against the latest Ruby 2.1, 2.2, 2.3, head and JRuby 9.0.4.0 on Travis * 12 merged PRs * Merge pull request #822 from kwugirl/remove_NEWRELIC_DISPATCHER * Merge pull request #833 from joemiller/jruby-client-tls-auth * Merge pull request #837 from YuriSolovyov/ssl-keystore-jruby * Merge pull request #839 from mezuka/master * Merge pull request #845 from deepj/timeout-deprecation * Merge pull request #846 from sriedel/strip_before_fork * Merge pull request #850 from deepj/travis * Merge pull request #853 from Jeffrey6052/patch-1 * Merge pull request #857 from zendesk/faster_phased_restarts * Merge pull request #858 from mlarraz/fix_some_warnings * Merge pull request #860 from zendesk/expose_old_worker_count * Merge pull request #861 from zendesk/allow_control_url_umask --- www/ruby-puma/Makefile | 5 ++--- www/ruby-puma/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/www/ruby-puma/Makefile b/www/ruby-puma/Makefile index af27c097f0326..14a899db890e7 100644 --- a/www/ruby-puma/Makefile +++ b/www/ruby-puma/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2016/03/05 11:29:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.13 2016/03/15 16:46:50 taca Exp $ -DISTNAME= puma-2.15.3 -PKGREVISION= 1 +DISTNAME= puma-2.16.0 CATEGORIES= www MAINTAINER= taca@NetBSD.org diff --git a/www/ruby-puma/distinfo b/www/ruby-puma/distinfo index b6df45588da07..f8c268e4311b0 100644 --- a/www/ruby-puma/distinfo +++ b/www/ruby-puma/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2015/12/13 16:09:19 taca Exp $ +$NetBSD: distinfo,v 1.11 2016/03/15 16:46:50 taca Exp $ -SHA1 (puma-2.15.3.gem) = bbbc6705544c1dc86f3a0904c39b0517dde9c772 -RMD160 (puma-2.15.3.gem) = e32261d5acfd43801b347bf3a05add52457edf56 -SHA512 (puma-2.15.3.gem) = 9de40300debc6b9f277faaa8c3ef3f6a84151b4640e85e2a1634db793844e40c40fad419973026f6e94f1b1a1d70bef2631ac04947672c66af8830287a95bcc3 -Size (puma-2.15.3.gem) = 98816 bytes +SHA1 (puma-2.16.0.gem) = b25ed1528acd909fd42301d3f1f1548047cceda9 +RMD160 (puma-2.16.0.gem) = 6045a0c59ea31a6d3bf312e0ccbfac9ebdb24527 +SHA512 (puma-2.16.0.gem) = 04a8230d18662669452b14febcc9d07ca6daa1a718f3fd38c9dbead975822e28344ff83dd0c9816321a6d95d552433fe1401c0e4534e3dd267664018d06fff02 +Size (puma-2.16.0.gem) = 100352 bytes From 6a459561ff7542c58922fa61ac097d078a1a4e4e Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:47:27 +0000 Subject: [PATCH 0203/2457] Note update of www/ruby-puma package to 2.16.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 1d022538c49b7..44655d8e96e0c 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1217 2016/03/15 16:44:46 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1218 2016/03/15 16:47:27 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1614,3 +1614,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-padrino-admin to 0.13.1 [taca 2016-03-15] Updated www/ruby-padrino-mailer to 0.13.1 [taca 2016-03-15] Updated www/ruby-padrino to 0.13.1 [taca 2016-03-15] + Updated www/ruby-puma to 2.16.0 [taca 2016-03-15] From 0b4333ae8893dc4b62e3059475a556ba447ec38d Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:48:53 +0000 Subject: [PATCH 0204/2457] Update ruby-mustermann19 to 0.4.2. * Specify constraint to avoid including . in capture. * Implement Mustermann::Grape. --- www/ruby-mustermann19/Makefile | 4 ++-- www/ruby-mustermann19/PLIST | 4 +++- www/ruby-mustermann19/distinfo | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/www/ruby-mustermann19/Makefile b/www/ruby-mustermann19/Makefile index dafe73e6ff0b7..2d830d6dd0c07 100644 --- a/www/ruby-mustermann19/Makefile +++ b/www/ruby-mustermann19/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2015/12/18 11:17:44 taca Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/15 16:48:53 taca Exp $ -DISTNAME= mustermann19-0.4.0 +DISTNAME= mustermann19-0.4.2 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/www/ruby-mustermann19/PLIST b/www/ruby-mustermann19/PLIST index 947832e1823a1..dc2231f124e3c 100644 --- a/www/ruby-mustermann19/PLIST +++ b/www/ruby-mustermann19/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/12/13 15:44:51 taca Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/15 16:48:53 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.gitignore ${GEM_LIBDIR}/.rspec @@ -33,6 +33,7 @@ ${GEM_LIBDIR}/lib/mustermann/expander.rb ${GEM_LIBDIR}/lib/mustermann/express.rb ${GEM_LIBDIR}/lib/mustermann/extension.rb ${GEM_LIBDIR}/lib/mustermann/flask.rb +${GEM_LIBDIR}/lib/mustermann/grape.rb ${GEM_LIBDIR}/lib/mustermann/identity.rb ${GEM_LIBDIR}/lib/mustermann/mapper.rb ${GEM_LIBDIR}/lib/mustermann/pattern.rb @@ -65,6 +66,7 @@ ${GEM_LIBDIR}/spec/express_spec.rb ${GEM_LIBDIR}/spec/extension_spec.rb ${GEM_LIBDIR}/spec/flask_spec.rb ${GEM_LIBDIR}/spec/flask_subclass_spec.rb +${GEM_LIBDIR}/spec/grape_spec.rb ${GEM_LIBDIR}/spec/identity_spec.rb ${GEM_LIBDIR}/spec/mapper_spec.rb ${GEM_LIBDIR}/spec/mustermann_spec.rb diff --git a/www/ruby-mustermann19/distinfo b/www/ruby-mustermann19/distinfo index 9d12323a6a453..0c20c4f29fe78 100644 --- a/www/ruby-mustermann19/distinfo +++ b/www/ruby-mustermann19/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2015/12/13 15:44:51 taca Exp $ +$NetBSD: distinfo,v 1.2 2016/03/15 16:48:53 taca Exp $ -SHA1 (mustermann19-0.4.0.gem) = c84203fd40c02850d0f1206aaa215511901b8b4c -RMD160 (mustermann19-0.4.0.gem) = a25b2938cd7720de86d98a9de7e7f4486f0186c2 -SHA512 (mustermann19-0.4.0.gem) = 4130a91f7275e4f6aa9d76db32def2ab9d7ce4308368cee0765b3740f0fb1fb7c748cfd5151e65d04800c9bb01b9bfaa8f13545bf0bd01e32be77c70de718115 -Size (mustermann19-0.4.0.gem) = 81920 bytes +SHA1 (mustermann19-0.4.2.gem) = 4cdb1958454fe18517539698e3419042eddd8d49 +RMD160 (mustermann19-0.4.2.gem) = 0612e522e0a2a0ccdc1f50f7366472bc99fdc6bd +SHA512 (mustermann19-0.4.2.gem) = 038a9227753c5592f4580da447bceb6a9f275c2acdd589e6223ccf413ecbb544f661ebb8751504f5e296d70870294f0ddbc70732e5776b2d32d1118a17208ad7 +Size (mustermann19-0.4.2.gem) = 85504 bytes From e1e279da09655b7d4448667198183b894a7e9893 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:49:32 +0000 Subject: [PATCH 0205/2457] Note update of www/ruby-mustermann19 package to 0.4.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 44655d8e96e0c..5c5793fb6312a 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1218 2016/03/15 16:47:27 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1219 2016/03/15 16:49:32 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1615,3 +1615,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-padrino-mailer to 0.13.1 [taca 2016-03-15] Updated www/ruby-padrino to 0.13.1 [taca 2016-03-15] Updated www/ruby-puma to 2.16.0 [taca 2016-03-15] + Updated www/ruby-mustermann19 to 0.4.2 [taca 2016-03-15] From 7e4c18d4084a84bac1b731f8ccac98c46918866f Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:50:07 +0000 Subject: [PATCH 0206/2457] Update ruby-raindrops to 0.16.0. === raindrops 0.16.0 - minor fixes and workarounds / 2016-02-29 12:36 UTC There's mainly a fix/workaround for Ruby 2.3 now returning locale-aware strings for File.readlink and our test suite using strange paths allowed by *nix. https://bugs.ruby-lang.org/issues/12034 tcp_listener_stats won't return "true" object placeholders if stats are configured for a non-existent listener. There are also minor optimizations for Ruby 2.2+ (at the expense of 2.1 and earlier). And the usual round of minor tweaks and doc updates. 10 changes since v0.15.0: gemspec: avoid circular dependency on unicorn remove optimizations which made sense for older rubies linux: workaround Ruby 2.3 change linux: remove Pathname stdlib dependency add .gitattributes for Ruby method detection middleware: minor bytecode size reduction doc: update URLs and references README: remove indentation from URLs in RDoc linux: tcp_listener_stats drops "true" placeholders build: use '--local' domain for dev gem install --- www/ruby-raindrops/Makefile | 4 ++-- www/ruby-raindrops/PLIST | 3 ++- www/ruby-raindrops/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/www/ruby-raindrops/Makefile b/www/ruby-raindrops/Makefile index f7b5fc24472ed..87a943ea8e182 100644 --- a/www/ruby-raindrops/Makefile +++ b/www/ruby-raindrops/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2015/09/13 15:40:36 taca Exp $ +# $NetBSD: Makefile,v 1.9 2016/03/15 16:50:07 taca Exp $ -DISTNAME= raindrops-0.15.0 +DISTNAME= raindrops-0.16.0 CATEGORIES= www MAINTAINER= pkgsrc@NetBSD.org diff --git a/www/ruby-raindrops/PLIST b/www/ruby-raindrops/PLIST index 36144d702ecf8..7ab5b0d9dfd29 100644 --- a/www/ruby-raindrops/PLIST +++ b/www/ruby-raindrops/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.5 2015/09/13 15:40:36 taca Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/03/15 16:50:07 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_EXTSDIR}/gem.build_complete ${GEM_EXTSDIR}/raindrops_ext.${RUBY_DLEXT} ${GEM_LIBDIR}/.document +${GEM_LIBDIR}/.gitattributes ${GEM_LIBDIR}/.gitignore ${GEM_LIBDIR}/.manifest ${GEM_LIBDIR}/.olddoc.yml diff --git a/www/ruby-raindrops/distinfo b/www/ruby-raindrops/distinfo index faeb084022fd5..da7dd7ef7bd73 100644 --- a/www/ruby-raindrops/distinfo +++ b/www/ruby-raindrops/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 02:47:37 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:50:07 taca Exp $ -SHA1 (raindrops-0.15.0.gem) = 1ff7b9610be4fc5dd243c9989da5e3ea0dceaf07 -RMD160 (raindrops-0.15.0.gem) = 5247e7fc49d75d9479968b2224b7f0a560ffa68a -SHA512 (raindrops-0.15.0.gem) = 29eaf4f9592681813a42c63bacd049ac1c2cda2af1410e5cec0848d9e3602ff7caafc63e7e03bd428a2a665fc75fd84f55495951fe220058657da31f85177715 -Size (raindrops-0.15.0.gem) = 57856 bytes +SHA1 (raindrops-0.16.0.gem) = a932ee5a97bd740cf2b01cac014277067a08f39a +RMD160 (raindrops-0.16.0.gem) = 6edb5e40b032f8fe6a64bf694ae33f413ba7d69e +SHA512 (raindrops-0.16.0.gem) = 121b1dab065ae4fa12c9a7591e7bbee1c416f54ba717868dfdd56c23549f155c71c64631be17c3f4a8b2676f0b1b209adcbcf73c51afa66cc2ac22d353c723d2 +Size (raindrops-0.16.0.gem) = 58368 bytes From 5ac09f4260b5121046065cac522170950bf0416e Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:50:32 +0000 Subject: [PATCH 0207/2457] Note update of www/ruby-raindrops package to 0.16.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 5c5793fb6312a..98af53b44a735 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1219 2016/03/15 16:49:32 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1220 2016/03/15 16:50:32 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1616,3 +1616,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-padrino to 0.13.1 [taca 2016-03-15] Updated www/ruby-puma to 2.16.0 [taca 2016-03-15] Updated www/ruby-mustermann19 to 0.4.2 [taca 2016-03-15] + Updated www/ruby-raindrops to 0.16.0 [taca 2016-03-15] From 4646d34dfe7967f6127a5e5783b98ea2789f5218 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:54:33 +0000 Subject: [PATCH 0208/2457] Update ruby-logging to 2.1.0. == 2.1.0 / 2016-03-13 Enhancements - appender factories now fail explicitly on bad arguments [PR #117] - console loggers (stdout, stderr) use `write` for compatibility [PR #127] - allow whitespace in traced method names [PR #128] - accessor methods for `backtrace` settings [PR #134] - asynchronous writing from buffered appenders [PR #135] - improve date format performance when outputting microseconds [PR #136] - added some thread safety to log level setters [PR #137] - use `write` everywhere instead of `syswrite` [PR #138] Bug Fixes - fixing encodings in tests [PR #116] - fix Rails4 logger compatibility [PR #121] - explicitly adding the MIT license [PR #123] - update `object_id` format in inspect methods [PR #133] - fixed Travis-CI tests --- devel/ruby-logging/Makefile | 6 +++--- devel/ruby-logging/PLIST | 7 +++++-- devel/ruby-logging/distinfo | 10 +++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/devel/ruby-logging/Makefile b/devel/ruby-logging/Makefile index bf3c06609a74a..4bc9f4ff11195 100644 --- a/devel/ruby-logging/Makefile +++ b/devel/ruby-logging/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2015/06/03 14:45:17 taca Exp $ +# $NetBSD: Makefile,v 1.9 2016/03/15 16:54:33 taca Exp $ -DISTNAME= logging-2.0.0 +DISTNAME= logging-2.1.0 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org @@ -9,7 +9,7 @@ COMMENT= Flexible logging library for Ruby based on log4j LICENSE= ruby-license DEPENDS+= ${RUBY_PKGPREFIX}-little-plugger>=1.1.3:../../devel/ruby-little-plugger -DEPENDS+= ${RUBY_PKGPREFIX}-multi_json>=1.3.6:../../textproc/ruby-multi_json +DEPENDS+= ${RUBY_PKGPREFIX}-multi_json>=1.10:../../textproc/ruby-multi_json .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-logging/PLIST b/devel/ruby-logging/PLIST index a55df9db6f811..20a005ba3e701 100644 --- a/devel/ruby-logging/PLIST +++ b/devel/ruby-logging/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2015/06/03 14:45:17 taca Exp $ +@comment $NetBSD: PLIST,v 1.9 2016/03/15 16:54:33 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.gitignore ${GEM_LIBDIR}/.travis.yml @@ -17,6 +17,7 @@ ${GEM_LIBDIR}/examples/lazy.rb ${GEM_LIBDIR}/examples/loggers.rb ${GEM_LIBDIR}/examples/mdc.rb ${GEM_LIBDIR}/examples/names.rb +${GEM_LIBDIR}/examples/rails4.rb ${GEM_LIBDIR}/examples/rspec_integration.rb ${GEM_LIBDIR}/examples/simple.rb ${GEM_LIBDIR}/lib/logging.rb @@ -51,11 +52,12 @@ ${GEM_LIBDIR}/lib/rspec/logging_helper.rb ${GEM_LIBDIR}/lib/spec/logging_helper.rb ${GEM_LIBDIR}/logging.gemspec ${GEM_LIBDIR}/script/bootstrap +${GEM_LIBDIR}/script/console +${GEM_LIBDIR}/test/appenders/test_async_flushing.rb ${GEM_LIBDIR}/test/appenders/test_buffered_io.rb ${GEM_LIBDIR}/test/appenders/test_console.rb ${GEM_LIBDIR}/test/appenders/test_file.rb ${GEM_LIBDIR}/test/appenders/test_io.rb -${GEM_LIBDIR}/test/appenders/test_periodic_flushing.rb ${GEM_LIBDIR}/test/appenders/test_rolling_file.rb ${GEM_LIBDIR}/test/appenders/test_string_io.rb ${GEM_LIBDIR}/test/appenders/test_syslog.rb @@ -65,6 +67,7 @@ ${GEM_LIBDIR}/test/layouts/test_color_pattern.rb ${GEM_LIBDIR}/test/layouts/test_json.rb ${GEM_LIBDIR}/test/layouts/test_pattern.rb ${GEM_LIBDIR}/test/layouts/test_yaml.rb +${GEM_LIBDIR}/test/performance.rb ${GEM_LIBDIR}/test/setup.rb ${GEM_LIBDIR}/test/test_appender.rb ${GEM_LIBDIR}/test/test_color_scheme.rb diff --git a/devel/ruby-logging/distinfo b/devel/ruby-logging/distinfo index f2fed399581ff..455f9b994443a 100644 --- a/devel/ruby-logging/distinfo +++ b/devel/ruby-logging/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 03:29:24 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/03/15 16:54:33 taca Exp $ -SHA1 (logging-2.0.0.gem) = 3424c3386549543152245efff3328b929c5aa6a8 -RMD160 (logging-2.0.0.gem) = 7ac52ebd3792a6ce67c6dd03df48a128fc08b132 -SHA512 (logging-2.0.0.gem) = cddd1a8fb083662c60ac06adfd3a1ddb3db19bd249ddddee7580a16c15f3c2886abb367113affd43c7dcb7fd9358fd334f812815a4fdf55b674ba086792d482e -Size (logging-2.0.0.gem) = 81408 bytes +SHA1 (logging-2.1.0.gem) = 88f616d8e6df89a65bd3c17eed6cffb2f331cf18 +RMD160 (logging-2.1.0.gem) = 923a543285367bf0a662009676a7e82e58f85f6d +SHA512 (logging-2.1.0.gem) = e8aad48ef24f8f70fad2aa4d78c25cb675b8c65ea883e14f6e2697af79111de38bced389d2f20d5699bc722274268ddac835c34f89884ea0aee86571a7ca1b55 +Size (logging-2.1.0.gem) = 83456 bytes From e65a4fd32fa4d896a937a9d1c89d065b127a3b68 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 16:55:14 +0000 Subject: [PATCH 0209/2457] Note update of devel/ruby-logging package to 2.1.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 98af53b44a735..1f6b77b61cbbc 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1220 2016/03/15 16:50:32 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1221 2016/03/15 16:55:14 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1617,3 +1617,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-puma to 2.16.0 [taca 2016-03-15] Updated www/ruby-mustermann19 to 0.4.2 [taca 2016-03-15] Updated www/ruby-raindrops to 0.16.0 [taca 2016-03-15] + Updated devel/ruby-logging to 2.1.0 [taca 2016-03-15] From 7eb3919ed3a2a66655abd7d4ebf9043511eb73b9 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 17:00:29 +0000 Subject: [PATCH 0210/2457] Update ruby-patron to 0.5.1. * Cast request body to string when uploading * Add the ability to override the Response class * Ensure the form data is freed in cleanup * Don't fail with invalid charset names --- www/ruby-patron/Makefile | 5 ++--- www/ruby-patron/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/www/ruby-patron/Makefile b/www/ruby-patron/Makefile index b510826a57952..eeb69d215fa88 100644 --- a/www/ruby-patron/Makefile +++ b/www/ruby-patron/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2016/03/05 11:29:39 jperkin Exp $ +# $NetBSD: Makefile,v 1.22 2016/03/15 17:00:29 taca Exp $ -DISTNAME= patron-0.5.0 -PKGREVISION= 1 +DISTNAME= patron-0.5.1 CATEGORIES= www MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/www/ruby-patron/distinfo b/www/ruby-patron/distinfo index b45312fef365f..9b687435f5faa 100644 --- a/www/ruby-patron/distinfo +++ b/www/ruby-patron/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.12 2015/11/04 02:47:36 agc Exp $ +$NetBSD: distinfo,v 1.13 2016/03/15 17:00:29 taca Exp $ -SHA1 (patron-0.5.0.gem) = 2916c065eb783ffed18ddfb844a1512283408476 -RMD160 (patron-0.5.0.gem) = 086b74a2ac5940d6f5066c24b33fdf66883ef387 -SHA512 (patron-0.5.0.gem) = 84c4cbb4ebeac3a9320915b35e4afefda5637f1bed96e83b8c2345dfd08ba02e07806b13a87c5067dd842ccddb67928c7f60889687676c0683d4e09373d8c2a7 -Size (patron-0.5.0.gem) = 44032 bytes +SHA1 (patron-0.5.1.gem) = aba41ac5153549a7ee004ec5072dc35569133d09 +RMD160 (patron-0.5.1.gem) = 15a663d261fee3aa2690a57eac2aef527df2b83f +SHA512 (patron-0.5.1.gem) = d47549ae1712f25e0d15bc2e1e32de6ad3084da4f0149013c4cf50dd92ccb7c01024831ef6df7c4acb78ed3923cde95e3f36a5ef8430d3f103ebb7f5906dd0fd +Size (patron-0.5.1.gem) = 45056 bytes From a3fa0b69772ccc8d1fee82094efed17a3903f703 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 17:01:35 +0000 Subject: [PATCH 0211/2457] Note update of www/ruby-patron package to 0.5.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 1f6b77b61cbbc..be3721c0d3940 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1221 2016/03/15 16:55:14 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1222 2016/03/15 17:01:35 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1618,3 +1618,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-mustermann19 to 0.4.2 [taca 2016-03-15] Updated www/ruby-raindrops to 0.16.0 [taca 2016-03-15] Updated devel/ruby-logging to 2.1.0 [taca 2016-03-15] + Updated www/ruby-patron to 0.5.1 [taca 2016-03-15] From 45d93891e41d2be6a9a953319dbca4c033093294 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 17:07:03 +0000 Subject: [PATCH 0212/2457] Update ruby-eventmachine to 1.2.0. ## 1.2.0 (March 15, 2016) * Integrate work from the EventMachine-LE 1.1.x versions [#570] * Add start_tls options :ecdh_curve, :dhparam, :fail_if_no_peer_cert [#195, #275, #399, #665] * Add start_tls option :ssl_version for choosing SSL/TLS versions and ciphers [#359, #348, #603, #654] * Add start_tls option :sni_hostname to be passed to TLS params [#593] * Add method EM::Channel#num_subscribers to get the number of subscribers to a channel [#640] * Add support for proc-sources in EM::Iterator [#639] * Factor out method cleanup_machine to cleanup code from EM.run [#650] * Replace Exception class with StandardError [#637] * Close socket on close_connection even after close_connection_after_writing [#694] * Allow reusing of datagram socket/setting bind device [#662] * Handle deferred exceptions in reactor thread [#486] * Reimplement Queue to avoid shift/push performance problem [#311] * Windows: Switch from gethostbyname to getaddrinfo, support IPv6 addresses [#303, #630] * Windows: Use rake-compiler-dock to cross-compile gems [#627] * Windows: Add AppVeyor configuration for Windows CI testing [#578] * Windows: Bump rake-compiler to version 0.9.x [#542] * Fix compilation on AIX (w/ XLC) [#693] * Fix build on OpenBSD [#690] * Fix OpenSSL compile issue on AIX 7.1 [#678] * Fix EventMachine.fork_reactor keeps the threadpool of the original process [#425] * Fix to prevent event machine from stopping when a raise is done in an unbind [#327] --- devel/ruby-eventmachine/Makefile | 5 ++--- devel/ruby-eventmachine/PLIST | 17 +++++++++-------- devel/ruby-eventmachine/distinfo | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/devel/ruby-eventmachine/Makefile b/devel/ruby-eventmachine/Makefile index bba633b1c681f..a0bfe1593d277 100644 --- a/devel/ruby-eventmachine/Makefile +++ b/devel/ruby-eventmachine/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2016/03/05 11:28:26 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2016/03/15 17:07:03 taca Exp $ -DISTNAME= eventmachine-1.0.9.1 -PKGREVISION= 1 +DISTNAME= eventmachine-1.2.0 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/ruby-eventmachine/PLIST b/devel/ruby-eventmachine/PLIST index e6a541e7c3642..a9bd65ae5fcdc 100644 --- a/devel/ruby-eventmachine/PLIST +++ b/devel/ruby-eventmachine/PLIST @@ -1,17 +1,12 @@ -@comment $NetBSD: PLIST,v 1.11 2015/03/08 15:17:19 taca Exp $ +@comment $NetBSD: PLIST,v 1.12 2016/03/15 17:07:03 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_EXTSDIR}/fastfilereaderext.${RUBY_DLEXT} ${GEM_EXTSDIR}/gem.build_complete ${GEM_EXTSDIR}/rubyeventmachine.${RUBY_DLEXT} -${GEM_LIBDIR}/.gitignore -${GEM_LIBDIR}/.travis.yml -${GEM_LIBDIR}/.yardopts ${GEM_LIBDIR}/CHANGELOG.md ${GEM_LIBDIR}/GNU -${GEM_LIBDIR}/Gemfile ${GEM_LIBDIR}/LICENSE ${GEM_LIBDIR}/README.md -${GEM_LIBDIR}/Rakefile ${GEM_LIBDIR}/docs/DocumentationGuidesIndex.md ${GEM_LIBDIR}/docs/GettingStarted.md ${GEM_LIBDIR}/docs/old/ChangeLog @@ -26,7 +21,6 @@ ${GEM_LIBDIR}/docs/old/RELEASE_NOTES ${GEM_LIBDIR}/docs/old/SMTP ${GEM_LIBDIR}/docs/old/SPAWNED_PROCESSES ${GEM_LIBDIR}/docs/old/TODO -${GEM_LIBDIR}/eventmachine.gemspec ${GEM_LIBDIR}/examples/guides/getting_started/01_eventmachine_echo_server.rb ${GEM_LIBDIR}/examples/guides/getting_started/02_eventmachine_echo_server_that_recognizes_exit_command.rb ${GEM_LIBDIR}/examples/guides/getting_started/03_simple_chat_server.rb @@ -111,11 +105,11 @@ ${GEM_LIBDIR}/lib/eventmachine.rb ${GEM_LIBDIR}/lib/fastfilereaderext.${RUBY_DLEXT} ${GEM_LIBDIR}/lib/jeventmachine.rb ${GEM_LIBDIR}/lib/rubyeventmachine.${RUBY_DLEXT} -${GEM_LIBDIR}/rakelib/cpp.rake_example ${GEM_LIBDIR}/rakelib/package.rake ${GEM_LIBDIR}/rakelib/test.rake ${GEM_LIBDIR}/tests/client.crt ${GEM_LIBDIR}/tests/client.key +${GEM_LIBDIR}/tests/dhparam.pem ${GEM_LIBDIR}/tests/em_test_helper.rb ${GEM_LIBDIR}/tests/test_attach.rb ${GEM_LIBDIR}/tests/test_basic.rb @@ -129,6 +123,7 @@ ${GEM_LIBDIR}/tests/test_epoll.rb ${GEM_LIBDIR}/tests/test_error_handler.rb ${GEM_LIBDIR}/tests/test_exc.rb ${GEM_LIBDIR}/tests/test_file_watch.rb +${GEM_LIBDIR}/tests/test_fork.rb ${GEM_LIBDIR}/tests/test_futures.rb ${GEM_LIBDIR}/tests/test_get_sock_opt.rb ${GEM_LIBDIR}/tests/test_handler_check.rb @@ -137,6 +132,8 @@ ${GEM_LIBDIR}/tests/test_httpclient.rb ${GEM_LIBDIR}/tests/test_httpclient2.rb ${GEM_LIBDIR}/tests/test_idle_connection.rb ${GEM_LIBDIR}/tests/test_inactivity_timeout.rb +${GEM_LIBDIR}/tests/test_ipv4.rb +${GEM_LIBDIR}/tests/test_ipv6.rb ${GEM_LIBDIR}/tests/test_iterator.rb ${GEM_LIBDIR}/tests/test_kb.rb ${GEM_LIBDIR}/tests/test_line_protocol.rb @@ -164,7 +161,11 @@ ${GEM_LIBDIR}/tests/test_smtpclient.rb ${GEM_LIBDIR}/tests/test_smtpserver.rb ${GEM_LIBDIR}/tests/test_spawn.rb ${GEM_LIBDIR}/tests/test_ssl_args.rb +${GEM_LIBDIR}/tests/test_ssl_dhparam.rb +${GEM_LIBDIR}/tests/test_ssl_ecdh_curve.rb +${GEM_LIBDIR}/tests/test_ssl_extensions.rb ${GEM_LIBDIR}/tests/test_ssl_methods.rb +${GEM_LIBDIR}/tests/test_ssl_protocols.rb ${GEM_LIBDIR}/tests/test_ssl_verify.rb ${GEM_LIBDIR}/tests/test_stomp.rb ${GEM_LIBDIR}/tests/test_system.rb diff --git a/devel/ruby-eventmachine/distinfo b/devel/ruby-eventmachine/distinfo index 070d39f25c5c0..dc3a651907b14 100644 --- a/devel/ruby-eventmachine/distinfo +++ b/devel/ruby-eventmachine/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.14 2016/02/16 14:57:10 taca Exp $ +$NetBSD: distinfo,v 1.15 2016/03/15 17:07:03 taca Exp $ -SHA1 (eventmachine-1.0.9.1.gem) = 18c08a4995fde24aeedde4c78e83aa74141a838d -RMD160 (eventmachine-1.0.9.1.gem) = 10b9c2a8a16ccab7c64e093b51f51942355c2458 -SHA512 (eventmachine-1.0.9.1.gem) = 5cbc178c604fe9a21850c298f7a5b6f904573f5e1db9e07fee599c5700841c52ec0311a6e50192eff9c1bb45cf30a9dd81d2150fe9d04cabd24cc7c9c32c5df0 -Size (eventmachine-1.0.9.1.gem) = 235008 bytes +SHA1 (eventmachine-1.2.0.gem) = 66dac1bde48b857e23888a487fbbe452ebfd87b5 +RMD160 (eventmachine-1.2.0.gem) = 7116fd31d2c70274f6938868d5485d6a64d4a57c +SHA512 (eventmachine-1.2.0.gem) = a6c55ccb86bc38a6c314e7d143ffedcb273ed7b54f3d7481bf9bec7fe190a0446a88947b32971c021f577ee0a5aed9083c7e0955b30987415f41b8d5ab83a1b8 +Size (eventmachine-1.2.0.gem) = 241152 bytes From 6ef38d3e5872e9a097b84a44f3ca2622ddfd9134 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 17:07:51 +0000 Subject: [PATCH 0213/2457] Note update of devel/ruby-eventmachine package to 1.2.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index be3721c0d3940..54c91d03610d4 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1222 2016/03/15 17:01:35 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1223 2016/03/15 17:07:51 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1619,3 +1619,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-raindrops to 0.16.0 [taca 2016-03-15] Updated devel/ruby-logging to 2.1.0 [taca 2016-03-15] Updated www/ruby-patron to 0.5.1 [taca 2016-03-15] + Updated devel/ruby-eventmachine to 1.2.0 [taca 2016-03-15] From df4c9cd682883bda05fe206ad38eb21c529217e2 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 17:12:18 +0000 Subject: [PATCH 0214/2457] Update ruby-ohai to 8.12.1. 8.12.1 (2016-03-14) Full Changelog Fixed bugs: * Fix gem conflicts in ruby environments that load rake 11 #774 (danielsdeleo) --- misc/ruby-ohai/Makefile | 4 ++-- misc/ruby-ohai/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/misc/ruby-ohai/Makefile b/misc/ruby-ohai/Makefile index e18dc0bc24898..7ad96cf0e1508 100644 --- a/misc/ruby-ohai/Makefile +++ b/misc/ruby-ohai/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2016/03/15 14:33:26 taca Exp $ +# $NetBSD: Makefile,v 1.14 2016/03/15 17:12:18 taca Exp $ -DISTNAME= ohai-8.12.0 +DISTNAME= ohai-8.12.1 CATEGORIES= misc MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/misc/ruby-ohai/distinfo b/misc/ruby-ohai/distinfo index f3d3e65bc373b..78510c21b39c6 100644 --- a/misc/ruby-ohai/distinfo +++ b/misc/ruby-ohai/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2016/03/15 14:33:26 taca Exp $ +$NetBSD: distinfo,v 1.10 2016/03/15 17:12:18 taca Exp $ -SHA1 (ohai-8.12.0.gem) = 5a857a820a1cbd0f63e2d08b7eecd59b91f989db -RMD160 (ohai-8.12.0.gem) = d4ca09f42391011eb6b8d6ec019d0b92548b0c7b -SHA512 (ohai-8.12.0.gem) = 85245edef21aa04cf60c79f7df557401c136da5155a92fa264af732a9bf79ba67c7569077637d07a55d85143566a2c62332690d43a450bb9fc071eefa5aff441 -Size (ohai-8.12.0.gem) = 507904 bytes +SHA1 (ohai-8.12.1.gem) = ac14e2b68fe509387b62959d7fd23f496c20477b +RMD160 (ohai-8.12.1.gem) = e03e0e789e718d64987ab8b9d963f64e19420f63 +SHA512 (ohai-8.12.1.gem) = dc70546c859f0d28a394c13d2791646f4922c8036b89f353f735ac9f2d1f79a3bf8c45eafeaef47b4afdc896011b282f57431ab132a753ab13e983174ab15e2a +Size (ohai-8.12.1.gem) = 507904 bytes From 8bb4c9b54f90413e53c3cf186d6b23227e78760d Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 15 Mar 2016 17:12:53 +0000 Subject: [PATCH 0215/2457] Note update of misc/ruby-ohai package to 8.12.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 54c91d03610d4..bb0849ad8a3ec 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1223 2016/03/15 17:07:51 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1224 2016/03/15 17:12:53 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1620,3 +1620,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/ruby-logging to 2.1.0 [taca 2016-03-15] Updated www/ruby-patron to 0.5.1 [taca 2016-03-15] Updated devel/ruby-eventmachine to 1.2.0 [taca 2016-03-15] + Updated misc/ruby-ohai to 8.12.1 [taca 2016-03-15] From 60e56b7ff92a6f238a9a8b1869dde73cda8a7003 Mon Sep 17 00:00:00 2001 From: leot Date: Tue, 15 Mar 2016 18:47:28 +0000 Subject: [PATCH 0216/2457] Update www/webkit24-{gtk,gtk3} to 2.4.10. Changes: WebKitGTK+ 2.4.10 released! This is a bug fix release in the stable 2.4 series. What's new in the WebKitGTK+ 2.4.10 release? * Fix rendering of form controls and scrollbars with GTK+ >= 3.19 * Fix crashes on PPC64. * Fix the build on powerpc 32 bits. * Add ARM64 build support. * Translation updates: German, Spanish, French, Italian, Korean, Brazilian Portuguese, Russian, Chinese. * Security fixes: CVE-2015-1120, CVE-2015-1076, CVE-2015-1071, CVE-2015-1081, CVE-2015-1122, CVE-2015-1155, CVE-2014-1748, CVE-2015-3752, CVE-2015-5809, CVE-2015-5928, CVE-2015-3749, CVE-2015-3659, CVE-2015-3748, CVE-2015-3743, CVE-2015-3731, CVE-2015-3745, CVE-2015-5822, CVE-2015-3658, CVE-2015-3741, CVE-2015-3727, CVE-2015-5801, CVE-2015-5788, CVE-2015-3747, CVE-2015-5794, CVE-2015-1127, CVE-2015-1153, CVE-2015-1083. Thanks to all the contributors who made possible this release. --- www/webkit24-gtk/Makefile | 3 +-- www/webkit24-gtk/Makefile.common | 4 ++-- www/webkit24-gtk/PLIST | 6 +++--- www/webkit24-gtk/distinfo | 10 +++++----- www/webkit24-gtk3/Makefile | 3 +-- www/webkit24-gtk3/PLIST | 4 +++- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/www/webkit24-gtk/Makefile b/www/webkit24-gtk/Makefile index 026d22ac9b0e9..853f8b21a4bc3 100644 --- a/www/webkit24-gtk/Makefile +++ b/www/webkit24-gtk/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.3 2016/01/06 10:46:50 adam Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/15 18:47:28 leot Exp $ -PKGREVISION= 3 .include "Makefile.common" PKGNAME= ${DISTNAME:S/webkitgtk/webkit24-gtk/} diff --git a/www/webkit24-gtk/Makefile.common b/www/webkit24-gtk/Makefile.common index d7ffd3fc72b3a..6cfc4c4da178d 100644 --- a/www/webkit24-gtk/Makefile.common +++ b/www/webkit24-gtk/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.3 2015/12/05 21:26:07 adam Exp $ +# $NetBSD: Makefile.common,v 1.4 2016/03/15 18:47:28 leot Exp $ # used by www/webkit24-gtk/Makefile # used by www/webkit24-gtk3/Makefile -DISTNAME= webkitgtk-2.4.9 +DISTNAME= webkitgtk-2.4.10 CATEGORIES= www MASTER_SITES= http://www.webkitgtk.org/releases/ EXTRACT_SUFX= .tar.xz diff --git a/www/webkit24-gtk/PLIST b/www/webkit24-gtk/PLIST index 8accbc6dfdacf..8e8674cf56526 100644 --- a/www/webkit24-gtk/PLIST +++ b/www/webkit24-gtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/07/12 00:37:47 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/15 18:47:28 leot Exp $ bin/jsc-1 include/webkitgtk-1.0/JavaScriptCore/JSBase.h include/webkitgtk-1.0/JavaScriptCore/JSContextRef.h @@ -422,7 +422,6 @@ share/gtk-doc/html/webkitdomgtk/ch01.html share/gtk-doc/html/webkitdomgtk/home.png share/gtk-doc/html/webkitdomgtk/index-all.html share/gtk-doc/html/webkitdomgtk/index.html -share/gtk-doc/html/webkitdomgtk/index.sgml share/gtk-doc/html/webkitdomgtk/left-insensitive.png share/gtk-doc/html/webkitdomgtk/left.png share/gtk-doc/html/webkitdomgtk/right-insensitive.png @@ -495,7 +494,6 @@ share/gtk-doc/html/webkitgtk/index-1.3.8.html share/gtk-doc/html/webkitgtk/index-all.html share/gtk-doc/html/webkitgtk/index-deprecated.html share/gtk-doc/html/webkitgtk/index.html -share/gtk-doc/html/webkitgtk/index.sgml share/gtk-doc/html/webkitgtk/left-insensitive.png share/gtk-doc/html/webkitgtk/left.png share/gtk-doc/html/webkitgtk/right-insensitive.png @@ -528,6 +526,7 @@ share/locale/hi/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/hu/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/id/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/it/LC_MESSAGES/WebKitGTK-2.0.mo +share/locale/ja/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/kn/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/ko/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/lt/LC_MESSAGES/WebKitGTK-2.0.mo @@ -552,6 +551,7 @@ share/locale/te/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/uk/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/vi/LC_MESSAGES/WebKitGTK-2.0.mo share/locale/zh_CN/LC_MESSAGES/WebKitGTK-2.0.mo +share/locale/zh_TW/LC_MESSAGES/WebKitGTK-2.0.mo share/webkitgtk-1.0/images/deleteButton.png share/webkitgtk-1.0/images/inputSpeech.png share/webkitgtk-1.0/images/missingImage.png diff --git a/www/webkit24-gtk/distinfo b/www/webkit24-gtk/distinfo index 2331c888b45b1..5a31e946b98a9 100644 --- a/www/webkit24-gtk/distinfo +++ b/www/webkit24-gtk/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2015/11/04 02:47:41 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/03/15 18:47:28 leot Exp $ -SHA1 (webkitgtk-2.4.9.tar.xz) = fbe02db8a4f01a70e7cdf0d16f8a18463e18b104 -RMD160 (webkitgtk-2.4.9.tar.xz) = 122468435539d69665d5206ae266fb36ff2d86c2 -SHA512 (webkitgtk-2.4.9.tar.xz) = 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 -Size (webkitgtk-2.4.9.tar.xz) = 9840740 bytes +SHA1 (webkitgtk-2.4.10.tar.xz) = 7fe2fe07ed21d00d8a8483d68c13a8c7ff0ff320 +RMD160 (webkitgtk-2.4.10.tar.xz) = 7af003c16c04ec6f407f4e87815086793566a8c8 +SHA512 (webkitgtk-2.4.10.tar.xz) = 09cff437dadfa6ba1b90674ef4d9db558710247559bb8c2894b54a43504428b99465aa5d35bf3323c22827b67711e8dc031d4b63361eb9906c96e2bfd8ee11a8 +Size (webkitgtk-2.4.10.tar.xz) = 9867504 bytes SHA1 (patch-Source_JavaScriptCore_ForwardingHeaders_JavaScriptCore_JSCallbackFunction.h) = 79122450435eb12a57086d18e5410eec131c33b2 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2ff343ac53b14af0692754a44059e7d2ea969b96 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 69221390dd5fdac55abf341c5ae3a03267e38ae6 diff --git a/www/webkit24-gtk3/Makefile b/www/webkit24-gtk3/Makefile index f69995f504f7f..596075dbd3a39 100644 --- a/www/webkit24-gtk3/Makefile +++ b/www/webkit24-gtk3/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.3 2016/01/06 10:46:50 adam Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/15 18:47:28 leot Exp $ -PKGREVISION= 2 .include "../../www/webkit24-gtk/Makefile.common" PKGNAME= ${DISTNAME:S/webkitgtk/webkit24-gtk3/} diff --git a/www/webkit24-gtk3/PLIST b/www/webkit24-gtk3/PLIST index fa0385d57349d..bd410cf27dfe5 100644 --- a/www/webkit24-gtk3/PLIST +++ b/www/webkit24-gtk3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/08/23 00:41:27 leot Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/15 18:47:28 leot Exp $ bin/jsc-3 include/webkitgtk-3.0/JavaScriptCore/JSBase.h include/webkitgtk-3.0/JavaScriptCore/JSContextRef.h @@ -279,6 +279,7 @@ share/locale/hi/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/hu/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/id/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/it/LC_MESSAGES/WebKitGTK-3.0.mo +share/locale/ja/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/kn/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/ko/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/lt/LC_MESSAGES/WebKitGTK-3.0.mo @@ -303,6 +304,7 @@ share/locale/te/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/uk/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/vi/LC_MESSAGES/WebKitGTK-3.0.mo share/locale/zh_CN/LC_MESSAGES/WebKitGTK-3.0.mo +share/locale/zh_TW/LC_MESSAGES/WebKitGTK-3.0.mo share/webkitgtk-3.0/images/deleteButton.png share/webkitgtk-3.0/images/inputSpeech.png share/webkitgtk-3.0/images/missingImage.png From 87fed95e669b5ce833d24defed6c5ddb455860ef Mon Sep 17 00:00:00 2001 From: leot Date: Tue, 15 Mar 2016 18:49:12 +0000 Subject: [PATCH 0217/2457] Updated www/webkit24-{gtk,gtk3} to 2.4.10. --- doc/CHANGES-2016 | 4 +++- doc/TODO | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index bb0849ad8a3ec..478002fb342d3 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1224 2016/03/15 17:12:53 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1225 2016/03/15 18:49:12 leot Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1621,3 +1621,5 @@ Changes to the packages collection and infrastructure in 2016: Updated www/ruby-patron to 0.5.1 [taca 2016-03-15] Updated devel/ruby-eventmachine to 1.2.0 [taca 2016-03-15] Updated misc/ruby-ohai to 8.12.1 [taca 2016-03-15] + Updated www/webkit24-gtk to 2.4.10 [leot 2016-03-15] + Updated www/webkit24-gtk3 to 2.4.10 [leot 2016-03-15] diff --git a/doc/TODO b/doc/TODO index f98e8236341a7..3522ac27234b2 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15599 2016/03/15 15:24:36 tez Exp $ +$NetBSD: TODO,v 1.15600 2016/03/15 18:49:12 leot Exp $ Suggested new packages ====================== @@ -1994,7 +1994,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o wcalc-2.4 o webalizer-2.23.05 o webkit-gtk-2.10.8 - o webkit24-gtk-2.4.10 [leot] o webmin-1.780 o websvn-2.3.3 o weewm-0.01 From 37a1a9c4ef376a0a12710833f11314eb5f8e1934 Mon Sep 17 00:00:00 2001 From: asau Date: Tue, 15 Mar 2016 19:49:42 +0000 Subject: [PATCH 0218/2457] Update to Racket 6.4 Changes in Racket 6.4: - We fixed a security vulnerability in the web server. The existing web server is vulnerable to a navigation attack if it is also enabled to serve files statically; that is, any file readable by the web server is accessible remotely. For more information see http://blog.racket-lang.org/2016/02/racket-web-server-security-vulnerability.html - DrRacket's scrolling is faster. - Incremental garbage-collection mode can eliminate long pauses in a program. For example, incremental mode is useful for avoiding pauses in games and animations. Programs must specifically request incremental mode with `(collect-garbage 'incremental)`, but libraries such as `2htdp/universe` include the request as part of the library's implementation. - The default package catalog is an HTTPS address instead of HTTP, and package operations properly validate server certificates when using HTTPS. - Documentation may define their own categories for the manual top- level page by using strings, rather than only symbols that name pre-defined categories. - The Racket cheat sheet is included in the main distribution. - DrRacket is available in Bulgarian, thanks to Alexander Shopov. - The contract Typed Racket generates for the `Any` type is more permissive, allowing more typed/untyped programs to work without contract errors. - Redex supports binding specifications; describe which variables bind in which expressions and your metafunctions and reduction relations automatically become scope-sensitive. Thanks to Paul Stansifer for this improvement. - All `pict` functions accept `pict-convertible`s. This allows for transparent interoperability between `pict` and libraries like `2htdp/image`. - The `raco profile` and `raco contract-profile` commands provide easy access to profiling tools, without requiring program modifications. --- lang/racket-textual/Makefile | 4 +- lang/racket-textual/PLIST | 14 +- lang/racket-textual/distinfo | 14 +- lang/racket/Makefile | 4 +- lang/racket/PLIST | 192 ++++++++++++++++-- lang/racket/distinfo | 14 +- lang/racket/patches/patch-src_configure | 10 +- .../patches/patch-src_racket_configure.ac | 10 +- 8 files changed, 215 insertions(+), 47 deletions(-) diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile index dd4d3f80402be..46ba5c8d6125f 100644 --- a/lang/racket-textual/Makefile +++ b/lang/racket-textual/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2015/12/29 04:59:19 dholland Exp $ +# $NetBSD: Makefile,v 1.26 2016/03/15 19:49:43 asau Exp $ -PKGNAME= racket-minimal-6.3 +PKGNAME= racket-minimal-6.4 DISTNAME= $(PKGNAME_NOREV)-src CATEGORIES= lang MASTER_SITES_PLT= http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/ \ diff --git a/lang/racket-textual/PLIST b/lang/racket-textual/PLIST index f05dd51f1120c..0b9de5f1b6548 100644 --- a/lang/racket-textual/PLIST +++ b/lang/racket-textual/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2015/12/12 21:49:05 asau Exp $ +@comment $NetBSD: PLIST,v 1.14 2016/03/15 19:49:43 asau Exp $ bin/racket bin/raco etc/racket/config.rktd @@ -94,6 +94,8 @@ share/racket/collects/compiler/private/compiled/winsubsys_rkt.dep share/racket/collects/compiler/private/compiled/winsubsys_rkt.zo share/racket/collects/compiler/private/compiled/winutf16_rkt.dep share/racket/collects/compiler/private/compiled/winutf16_rkt.zo +share/racket/collects/compiler/private/compiled/write-perm_rkt.dep +share/racket/collects/compiler/private/compiled/write-perm_rkt.zo share/racket/collects/compiler/private/compiled/xform_rkt.dep share/racket/collects/compiler/private/compiled/xform_rkt.zo share/racket/collects/compiler/private/configdir.rkt @@ -107,6 +109,7 @@ share/racket/collects/compiler/private/read-bstr.rkt share/racket/collects/compiler/private/windlldir.rkt share/racket/collects/compiler/private/winsubsys.rkt share/racket/collects/compiler/private/winutf16.rkt +share/racket/collects/compiler/private/write-perm.rkt share/racket/collects/compiler/private/xform.rkt share/racket/collects/data/bit-vector.rkt share/racket/collects/data/compiled/bit-vector_rkt.dep @@ -286,6 +289,8 @@ share/racket/collects/net/compiled/head_rkt.dep share/racket/collects/net/compiled/head_rkt.zo share/racket/collects/net/compiled/http-client_rkt.dep share/racket/collects/net/compiled/http-client_rkt.zo +share/racket/collects/net/compiled/osx-ssl_rkt.dep +share/racket/collects/net/compiled/osx-ssl_rkt.zo share/racket/collects/net/compiled/uri-codec_rkt.dep share/racket/collects/net/compiled/uri-codec_rkt.zo share/racket/collects/net/compiled/url-connect_rkt.dep @@ -303,6 +308,7 @@ share/racket/collects/net/compiled/win32-ssl_rkt.zo share/racket/collects/net/git-checkout.rkt share/racket/collects/net/head.rkt share/racket/collects/net/http-client.rkt +share/racket/collects/net/osx-ssl.rkt share/racket/collects/net/uri-codec.rkt share/racket/collects/net/url-connect.rkt share/racket/collects/net/url-exception.rkt @@ -805,6 +811,8 @@ share/racket/collects/racket/contract/private/compiled/struct-prop_rkt.dep share/racket/collects/racket/contract/private/compiled/struct-prop_rkt.zo share/racket/collects/racket/contract/private/compiled/top-sort_rkt.dep share/racket/collects/racket/contract/private/compiled/top-sort_rkt.zo +share/racket/collects/racket/contract/private/compiled/types_rkt.dep +share/racket/collects/racket/contract/private/compiled/types_rkt.zo share/racket/collects/racket/contract/private/compiled/vector_rkt.dep share/racket/collects/racket/contract/private/compiled/vector_rkt.zo share/racket/collects/racket/contract/private/ds-helpers.rkt @@ -832,6 +840,7 @@ share/racket/collects/racket/contract/private/rand.rkt share/racket/collects/racket/contract/private/struct-dc.rkt share/racket/collects/racket/contract/private/struct-prop.rkt share/racket/collects/racket/contract/private/top-sort.rkt +share/racket/collects/racket/contract/private/types.rkt share/racket/collects/racket/contract/private/vector.rkt share/racket/collects/racket/contract/region.rkt share/racket/collects/racket/control.rkt @@ -1432,6 +1441,8 @@ share/racket/collects/syntax/compiled/id-set_rkt.dep share/racket/collects/syntax/compiled/id-set_rkt.zo share/racket/collects/syntax/compiled/id-table_rkt.dep share/racket/collects/syntax/compiled/id-table_rkt.zo +share/racket/collects/syntax/compiled/intdef_rkt.dep +share/racket/collects/syntax/compiled/intdef_rkt.zo share/racket/collects/syntax/compiled/kerncase_rkt.dep share/racket/collects/syntax/compiled/kerncase_rkt.zo share/racket/collects/syntax/compiled/keyword_rkt.dep @@ -1495,6 +1506,7 @@ share/racket/collects/syntax/for-body.rkt share/racket/collects/syntax/free-vars.rkt share/racket/collects/syntax/id-set.rkt share/racket/collects/syntax/id-table.rkt +share/racket/collects/syntax/intdef.rkt share/racket/collects/syntax/kerncase.rkt share/racket/collects/syntax/keyword.rkt share/racket/collects/syntax/location.rkt diff --git a/lang/racket-textual/distinfo b/lang/racket-textual/distinfo index 9e276f20596cc..fe38ead01c2fd 100644 --- a/lang/racket-textual/distinfo +++ b/lang/racket-textual/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.17 2015/12/29 04:59:19 dholland Exp $ +$NetBSD: distinfo,v 1.18 2016/03/15 19:49:43 asau Exp $ -SHA1 (racket-minimal-6.3-src.tgz) = 059aaa4096f349fec4fd6db08ad76d5bfff4d25b -RMD160 (racket-minimal-6.3-src.tgz) = 3b60a27446018c3b82eaf604debaef8b792068cd -SHA512 (racket-minimal-6.3-src.tgz) = f71658002d4e727a5cd301dfa14a351575533aad3be4b78b68eebac40ea29e38148932fbe9bf636a698852a75647714e40e73cfe557c6e28f6f9f7eea1dfbc52 -Size (racket-minimal-6.3-src.tgz) = 6282843 bytes -SHA1 (patch-src_configure) = 84d54af7677a051d9277ac22180eaefcac155d3b -SHA1 (patch-src_racket_configure.ac) = 35dd7d738b9bdcac567700e43f6c5ffb583f1a13 +SHA1 (racket-minimal-6.4-src.tgz) = f4ab5626e4cfcac5b066df141a12b8bb0ac566a0 +RMD160 (racket-minimal-6.4-src.tgz) = 68cc14370e9e3a868e5bef090ef7bda2d4c80fbc +SHA512 (racket-minimal-6.4-src.tgz) = 497c2e9a742994d0e1b89f97587547e92d5c9e0efc699a6892f51a91da38463e915a662f19274887e8a310ea5332af7718710251fc84dde314ee3d84378798e3 +Size (racket-minimal-6.4-src.tgz) = 6327969 bytes +SHA1 (patch-src_configure) = d2dd93be1d5ddec7b07fee73b0da5d6ce61d69b3 +SHA1 (patch-src_racket_configure.ac) = 29e239e74a395886dc8382543ab682c6a17b5e6b diff --git a/lang/racket/Makefile b/lang/racket/Makefile index 87df4863e4b6b..b946ac8b901f0 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.46 2015/12/12 21:49:05 asau Exp $ +# $NetBSD: Makefile,v 1.47 2016/03/15 19:49:42 asau Exp $ -PKGNAME= racket-6.3 +PKGNAME= racket-6.4 DISTNAME= $(PKGNAME_NOREV)-src CATEGORIES= lang MASTER_SITES_PLT= http://download.racket-lang.org/installers/$(PKGVERSION_NOREV)/ \ diff --git a/lang/racket/PLIST b/lang/racket/PLIST index fecad92e0f586..76e11924c7494 100644 --- a/lang/racket/PLIST +++ b/lang/racket/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2015/12/12 21:49:05 asau Exp $ +@comment $NetBSD: PLIST,v 1.15 2016/03/15 19:49:42 asau Exp $ bin/drracket bin/gracket bin/gracket-text @@ -1617,6 +1617,12 @@ share/doc/racket/option-contract/index.html share/doc/racket/option-contract/out0.sxref share/doc/racket/option-contract/out1.sxref share/doc/racket/option-contract/stamp.sxref +share/doc/racket/osx-ssl/blueboxes.rktd +share/doc/racket/osx-ssl/in.sxref +share/doc/racket/osx-ssl/index.html +share/doc/racket/osx-ssl/out0.sxref +share/doc/racket/osx-ssl/out1.sxref +share/doc/racket/osx-ssl/stamp.sxref share/doc/racket/out0.sxref share/doc/racket/out1.sxref share/doc/racket/parser-tools/Context-Free_Parsers.html @@ -1706,6 +1712,7 @@ share/doc/racket/pict/pict_140.png share/doc/racket/pict/pict_141.png share/doc/racket/pict/pict_142.png share/doc/racket/pict/pict_143.png +share/doc/racket/pict/pict_144.png share/doc/racket/pict/pict_15.png share/doc/racket/pict/pict_16.png share/doc/racket/pict/pict_17.png @@ -1817,6 +1824,7 @@ share/doc/racket/pkg/catalog-protocol.html share/doc/racket/pkg/cmdline.html share/doc/racket/pkg/db.html share/doc/racket/pkg/dirs-catalog.html +share/doc/racket/pkg/envvars.html share/doc/racket/pkg/getting-started.html share/doc/racket/pkg/git-workflow.html share/doc/racket/pkg/implementation.html @@ -1830,6 +1838,7 @@ share/doc/racket/pkg/out1.sxref share/doc/racket/pkg/path.html share/doc/racket/pkg/stamp.sxref share/doc/racket/pkg/strip.html +share/doc/racket/plai/Generating_Random_Mutators.html share/doc/racket/plai/blueboxes.rktd share/doc/racket/plai/collector.html share/doc/racket/plai/gc2-collector.html @@ -2230,6 +2239,13 @@ share/doc/racket/r6rs/r6rs-std/r6rs-Z-H-9.html share/doc/racket/r6rs/r6rs-std/r6rs-Z-S.css share/doc/racket/r6rs/r6rs-std/r6rs.html share/doc/racket/r6rs/stamp.sxref +share/doc/racket/racket-cheat/blueboxes.rktd +share/doc/racket/racket-cheat/in.sxref +share/doc/racket/racket-cheat/index.html +share/doc/racket/racket-cheat/out0.sxref +share/doc/racket/racket-cheat/out1.sxref +share/doc/racket/racket-cheat/racket-cheat.css +share/doc/racket/racket-cheat/stamp.sxref share/doc/racket/racket.css share/doc/racket/racklog/Racklog_Module_Language.html share/doc/racket/racklog/and-or.html @@ -2358,7 +2374,22 @@ share/doc/racket/redex/pict_19.png share/doc/racket/redex/pict_2.png share/doc/racket/redex/pict_20.png share/doc/racket/redex/pict_21.png +share/doc/racket/redex/pict_22.png +share/doc/racket/redex/pict_23.png +share/doc/racket/redex/pict_24.png +share/doc/racket/redex/pict_25.png +share/doc/racket/redex/pict_26.png +share/doc/racket/redex/pict_27.png +share/doc/racket/redex/pict_28.png +share/doc/racket/redex/pict_29.png share/doc/racket/redex/pict_3.png +share/doc/racket/redex/pict_30.png +share/doc/racket/redex/pict_31.png +share/doc/racket/redex/pict_32.png +share/doc/racket/redex/pict_33.png +share/doc/racket/redex/pict_34.png +share/doc/racket/redex/pict_35.png +share/doc/racket/redex/pict_36.png share/doc/racket/redex/pict_4.png share/doc/racket/redex/pict_5.png share/doc/racket/redex/pict_6.png @@ -3043,6 +3074,7 @@ share/doc/racket/syntax/docprovide.html share/doc/racket/syntax/exprc.html share/doc/racket/syntax/in.sxref share/doc/racket/syntax/index.html +share/doc/racket/syntax/intdef.html share/doc/racket/syntax/macro-testing.html share/doc/racket/syntax/module-helpers.html share/doc/racket/syntax/out0.sxref @@ -3226,6 +3258,11 @@ share/doc/racket/teachpack/pict_2.png share/doc/racket/teachpack/pict_2.svg share/doc/racket/teachpack/pict_20.png share/doc/racket/teachpack/pict_20.svg +share/doc/racket/teachpack/pict_200.svg +share/doc/racket/teachpack/pict_201.svg +share/doc/racket/teachpack/pict_202.svg +share/doc/racket/teachpack/pict_203.svg +share/doc/racket/teachpack/pict_204.svg share/doc/racket/teachpack/pict_21.png share/doc/racket/teachpack/pict_21.svg share/doc/racket/teachpack/pict_22.png @@ -3312,6 +3349,7 @@ share/doc/racket/teachpack/pict_59.png share/doc/racket/teachpack/pict_59.svg share/doc/racket/teachpack/pict_6.png share/doc/racket/teachpack/pict_6.svg +share/doc/racket/teachpack/pict_60.png share/doc/racket/teachpack/pict_60.svg share/doc/racket/teachpack/pict_61.svg share/doc/racket/teachpack/pict_62.svg @@ -3607,6 +3645,8 @@ share/racket/collects/compiler/private/compiled/winsubsys_rkt.dep share/racket/collects/compiler/private/compiled/winsubsys_rkt.zo share/racket/collects/compiler/private/compiled/winutf16_rkt.dep share/racket/collects/compiler/private/compiled/winutf16_rkt.zo +share/racket/collects/compiler/private/compiled/write-perm_rkt.dep +share/racket/collects/compiler/private/compiled/write-perm_rkt.zo share/racket/collects/compiler/private/compiled/xform_rkt.dep share/racket/collects/compiler/private/compiled/xform_rkt.zo share/racket/collects/compiler/private/configdir.rkt @@ -3620,6 +3660,7 @@ share/racket/collects/compiler/private/read-bstr.rkt share/racket/collects/compiler/private/windlldir.rkt share/racket/collects/compiler/private/winsubsys.rkt share/racket/collects/compiler/private/winutf16.rkt +share/racket/collects/compiler/private/write-perm.rkt share/racket/collects/compiler/private/xform.rkt share/racket/collects/data/bit-vector.rkt share/racket/collects/data/compiled/bit-vector_rkt.dep @@ -3799,6 +3840,8 @@ share/racket/collects/net/compiled/head_rkt.dep share/racket/collects/net/compiled/head_rkt.zo share/racket/collects/net/compiled/http-client_rkt.dep share/racket/collects/net/compiled/http-client_rkt.zo +share/racket/collects/net/compiled/osx-ssl_rkt.dep +share/racket/collects/net/compiled/osx-ssl_rkt.zo share/racket/collects/net/compiled/uri-codec_rkt.dep share/racket/collects/net/compiled/uri-codec_rkt.zo share/racket/collects/net/compiled/url-connect_rkt.dep @@ -3816,6 +3859,7 @@ share/racket/collects/net/compiled/win32-ssl_rkt.zo share/racket/collects/net/git-checkout.rkt share/racket/collects/net/head.rkt share/racket/collects/net/http-client.rkt +share/racket/collects/net/osx-ssl.rkt share/racket/collects/net/uri-codec.rkt share/racket/collects/net/url-connect.rkt share/racket/collects/net/url-exception.rkt @@ -4318,6 +4362,8 @@ share/racket/collects/racket/contract/private/compiled/struct-prop_rkt.dep share/racket/collects/racket/contract/private/compiled/struct-prop_rkt.zo share/racket/collects/racket/contract/private/compiled/top-sort_rkt.dep share/racket/collects/racket/contract/private/compiled/top-sort_rkt.zo +share/racket/collects/racket/contract/private/compiled/types_rkt.dep +share/racket/collects/racket/contract/private/compiled/types_rkt.zo share/racket/collects/racket/contract/private/compiled/vector_rkt.dep share/racket/collects/racket/contract/private/compiled/vector_rkt.zo share/racket/collects/racket/contract/private/ds-helpers.rkt @@ -4345,6 +4391,7 @@ share/racket/collects/racket/contract/private/rand.rkt share/racket/collects/racket/contract/private/struct-dc.rkt share/racket/collects/racket/contract/private/struct-prop.rkt share/racket/collects/racket/contract/private/top-sort.rkt +share/racket/collects/racket/contract/private/types.rkt share/racket/collects/racket/contract/private/vector.rkt share/racket/collects/racket/contract/region.rkt share/racket/collects/racket/control.rkt @@ -4945,6 +4992,8 @@ share/racket/collects/syntax/compiled/id-set_rkt.dep share/racket/collects/syntax/compiled/id-set_rkt.zo share/racket/collects/syntax/compiled/id-table_rkt.dep share/racket/collects/syntax/compiled/id-table_rkt.zo +share/racket/collects/syntax/compiled/intdef_rkt.dep +share/racket/collects/syntax/compiled/intdef_rkt.zo share/racket/collects/syntax/compiled/kerncase_rkt.dep share/racket/collects/syntax/compiled/kerncase_rkt.zo share/racket/collects/syntax/compiled/keyword_rkt.dep @@ -5008,6 +5057,7 @@ share/racket/collects/syntax/for-body.rkt share/racket/collects/syntax/free-vars.rkt share/racket/collects/syntax/id-set.rkt share/racket/collects/syntax/id-table.rkt +share/racket/collects/syntax/intdef.rkt share/racket/collects/syntax/kerncase.rkt share/racket/collects/syntax/keyword.rkt share/racket/collects/syntax/location.rkt @@ -5939,6 +5989,10 @@ share/racket/pkgs/contract-profile/compiled/info_rkt.dep share/racket/pkgs/contract-profile/compiled/info_rkt.zo share/racket/pkgs/contract-profile/compiled/main_rkt.dep share/racket/pkgs/contract-profile/compiled/main_rkt.zo +share/racket/pkgs/contract-profile/compiled/module-graph-view_rkt.dep +share/racket/pkgs/contract-profile/compiled/module-graph-view_rkt.zo +share/racket/pkgs/contract-profile/compiled/raco_rkt.dep +share/racket/pkgs/contract-profile/compiled/raco_rkt.zo share/racket/pkgs/contract-profile/compiled/tests_rkt.dep share/racket/pkgs/contract-profile/compiled/tests_rkt.zo share/racket/pkgs/contract-profile/compiled/utils_rkt.dep @@ -5946,6 +6000,8 @@ share/racket/pkgs/contract-profile/compiled/utils_rkt.zo share/racket/pkgs/contract-profile/dot.rkt share/racket/pkgs/contract-profile/info.rkt share/racket/pkgs/contract-profile/main.rkt +share/racket/pkgs/contract-profile/module-graph-view.rkt +share/racket/pkgs/contract-profile/raco.rkt share/racket/pkgs/contract-profile/scribblings/compiled/contract-profile_scrbl.dep share/racket/pkgs/contract-profile/scribblings/compiled/contract-profile_scrbl.zo share/racket/pkgs/contract-profile/scribblings/compiled/info_rkt.dep @@ -9717,6 +9773,8 @@ share/racket/pkgs/gui-doc/scribblings/gui/compiled/snip-class_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/snip-class_scrbl.zo share/racket/pkgs/gui-doc/scribblings/gui/compiled/snip-classes_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/snip-classes_scrbl.zo +share/racket/pkgs/gui-doc/scribblings/gui/compiled/snip-example_rkt.dep +share/racket/pkgs/gui-doc/scribblings/gui/compiled/snip-example_rkt.zo share/racket/pkgs/gui-doc/scribblings/gui/compiled/snip-example_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/snip-example_scrbl.zo share/racket/pkgs/gui-doc/scribblings/gui/compiled/startup_scrbl.dep @@ -9739,6 +9797,8 @@ share/racket/pkgs/gui-doc/scribblings/gui/compiled/tab-panel-class_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/tab-panel-class_scrbl.zo share/racket/pkgs/gui-doc/scribblings/gui/compiled/tab-snip-class_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/tab-snip-class_scrbl.zo +share/racket/pkgs/gui-doc/scribblings/gui/compiled/test-snip-example_rkt.dep +share/racket/pkgs/gui-doc/scribblings/gui/compiled/test-snip-example_rkt.zo share/racket/pkgs/gui-doc/scribblings/gui/compiled/text-class_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/text-class_scrbl.zo share/racket/pkgs/gui-doc/scribblings/gui/compiled/text-field-class_scrbl.dep @@ -9763,6 +9823,8 @@ share/racket/pkgs/gui-doc/scribblings/gui/compiled/win-overview_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/win-overview_scrbl.zo share/racket/pkgs/gui-doc/scribblings/gui/compiled/window-intf_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/window-intf_scrbl.zo +share/racket/pkgs/gui-doc/scribblings/gui/compiled/wxme-circle-snip_rkt.dep +share/racket/pkgs/gui-doc/scribblings/gui/compiled/wxme-circle-snip_rkt.zo share/racket/pkgs/gui-doc/scribblings/gui/compiled/wxme_scrbl.dep share/racket/pkgs/gui-doc/scribblings/gui/compiled/wxme_scrbl.zo share/racket/pkgs/gui-doc/scribblings/gui/control-event-class.scrbl @@ -9852,6 +9914,7 @@ share/racket/pkgs/gui-doc/scribblings/gui/snip-class-class.scrbl share/racket/pkgs/gui-doc/scribblings/gui/snip-class-list-intf.scrbl share/racket/pkgs/gui-doc/scribblings/gui/snip-class.scrbl share/racket/pkgs/gui-doc/scribblings/gui/snip-classes.scrbl +share/racket/pkgs/gui-doc/scribblings/gui/snip-example.rkt share/racket/pkgs/gui-doc/scribblings/gui/snip-example.scrbl share/racket/pkgs/gui-doc/scribblings/gui/startup.scrbl share/racket/pkgs/gui-doc/scribblings/gui/string-snip-class.scrbl @@ -9863,6 +9926,7 @@ share/racket/pkgs/gui-doc/scribblings/gui/subwindow-intf.scrbl share/racket/pkgs/gui-doc/scribblings/gui/system-menu-funcs.scrbl share/racket/pkgs/gui-doc/scribblings/gui/tab-panel-class.scrbl share/racket/pkgs/gui-doc/scribblings/gui/tab-snip-class.scrbl +share/racket/pkgs/gui-doc/scribblings/gui/test-snip-example.rkt share/racket/pkgs/gui-doc/scribblings/gui/text-class.scrbl share/racket/pkgs/gui-doc/scribblings/gui/text-field-class.scrbl share/racket/pkgs/gui-doc/scribblings/gui/timer-class.scrbl @@ -9875,6 +9939,7 @@ share/racket/pkgs/gui-doc/scribblings/gui/win-classes.scrbl share/racket/pkgs/gui-doc/scribblings/gui/win-funcs.scrbl share/racket/pkgs/gui-doc/scribblings/gui/win-overview.scrbl share/racket/pkgs/gui-doc/scribblings/gui/window-intf.scrbl +share/racket/pkgs/gui-doc/scribblings/gui/wxme-circle-snip.rkt share/racket/pkgs/gui-doc/scribblings/gui/wxme.scrbl share/racket/pkgs/gui-lib/LICENSE.txt share/racket/pkgs/gui-lib/embedded-gui/compiled/embedded-gui_rkt.dep @@ -10162,6 +10227,9 @@ share/racket/pkgs/gui-lib/framework/test.rkt share/racket/pkgs/gui-lib/hierlist/compiled/hierlist_rkt.dep share/racket/pkgs/gui-lib/hierlist/compiled/hierlist_rkt.zo share/racket/pkgs/gui-lib/hierlist/hierlist.rkt +share/racket/pkgs/gui-lib/icons/plt-icon-16x16.png +share/racket/pkgs/gui-lib/icons/plt-icon-32x32.png +share/racket/pkgs/gui-lib/icons/plt-icon-48x48.png share/racket/pkgs/gui-lib/icons/turn-down-click.png share/racket/pkgs/gui-lib/icons/turn-down.png share/racket/pkgs/gui-lib/icons/turn-up-click.png @@ -12441,10 +12509,7 @@ share/racket/pkgs/images-lib/images/private/flonum.rkt share/racket/pkgs/images-lib/images/private/latent-contract.rkt share/racket/pkgs/images-lib/images/private/latent-contract/compiled/defthing_rkt.dep share/racket/pkgs/images-lib/images/private/latent-contract/compiled/defthing_rkt.zo -share/racket/pkgs/images-lib/images/private/latent-contract/compiled/serialize-syntax_rkt.dep -share/racket/pkgs/images-lib/images/private/latent-contract/compiled/serialize-syntax_rkt.zo share/racket/pkgs/images-lib/images/private/latent-contract/defthing.rkt -share/racket/pkgs/images-lib/images/private/latent-contract/serialize-syntax.rkt share/racket/pkgs/images-lib/images/private/parameter-group.rkt share/racket/pkgs/images-lib/images/private/utils.rkt share/racket/pkgs/images-lib/info.rkt @@ -13542,6 +13607,8 @@ share/racket/pkgs/net-doc/net/scribblings/compiled/net_scrbl.dep share/racket/pkgs/net-doc/net/scribblings/compiled/net_scrbl.zo share/racket/pkgs/net-doc/net/scribblings/compiled/nntp_scrbl.dep share/racket/pkgs/net-doc/net/scribblings/compiled/nntp_scrbl.zo +share/racket/pkgs/net-doc/net/scribblings/compiled/osx-ssl_scrbl.dep +share/racket/pkgs/net-doc/net/scribblings/compiled/osx-ssl_scrbl.zo share/racket/pkgs/net-doc/net/scribblings/compiled/pop3_scrbl.dep share/racket/pkgs/net-doc/net/scribblings/compiled/pop3_scrbl.zo share/racket/pkgs/net-doc/net/scribblings/compiled/qp_scrbl.dep @@ -13577,6 +13644,7 @@ share/racket/pkgs/net-doc/net/scribblings/info.rkt share/racket/pkgs/net-doc/net/scribblings/mime.scrbl share/racket/pkgs/net-doc/net/scribblings/net.scrbl share/racket/pkgs/net-doc/net/scribblings/nntp.scrbl +share/racket/pkgs/net-doc/net/scribblings/osx-ssl.scrbl share/racket/pkgs/net-doc/net/scribblings/pop3.scrbl share/racket/pkgs/net-doc/net/scribblings/qp.scrbl share/racket/pkgs/net-doc/net/scribblings/sendmail.scrbl @@ -14864,6 +14932,10 @@ share/racket/pkgs/profile-lib/compiled/info_rkt.dep share/racket/pkgs/profile-lib/compiled/info_rkt.zo share/racket/pkgs/profile-lib/compiled/main_rkt.dep share/racket/pkgs/profile-lib/compiled/main_rkt.zo +share/racket/pkgs/profile-lib/compiled/raco-utils_rkt.dep +share/racket/pkgs/profile-lib/compiled/raco-utils_rkt.zo +share/racket/pkgs/profile-lib/compiled/raco_rkt.dep +share/racket/pkgs/profile-lib/compiled/raco_rkt.zo share/racket/pkgs/profile-lib/compiled/render-graphviz_rkt.dep share/racket/pkgs/profile-lib/compiled/render-graphviz_rkt.zo share/racket/pkgs/profile-lib/compiled/render-text_rkt.dep @@ -14876,6 +14948,8 @@ share/racket/pkgs/profile-lib/compiled/utils_rkt.dep share/racket/pkgs/profile-lib/compiled/utils_rkt.zo share/racket/pkgs/profile-lib/info.rkt share/racket/pkgs/profile-lib/main.rkt +share/racket/pkgs/profile-lib/raco-utils.rkt +share/racket/pkgs/profile-lib/raco.rkt share/racket/pkgs/profile-lib/render-graphviz.rkt share/racket/pkgs/profile-lib/render-text.rkt share/racket/pkgs/profile-lib/sampler.rkt @@ -15273,6 +15347,18 @@ share/racket/pkgs/r6rs-lib/rnrs/syntax-case-6.rkt share/racket/pkgs/r6rs-lib/rnrs/unicode-6.rkt share/racket/pkgs/r6rs/LICENSE.txt share/racket/pkgs/r6rs/info.rkt +share/racket/pkgs/racket-cheat/LICENSE +share/racket/pkgs/racket-cheat/README +share/racket/pkgs/racket-cheat/compiled/info_rkt.dep +share/racket/pkgs/racket-cheat/compiled/info_rkt.zo +share/racket/pkgs/racket-cheat/compiled/racket-cheat_rkt.dep +share/racket/pkgs/racket-cheat/compiled/racket-cheat_rkt.zo +share/racket/pkgs/racket-cheat/compiled/racket-cheat_scrbl.dep +share/racket/pkgs/racket-cheat/compiled/racket-cheat_scrbl.zo +share/racket/pkgs/racket-cheat/info.rkt +share/racket/pkgs/racket-cheat/racket-cheat.css +share/racket/pkgs/racket-cheat/racket-cheat.rkt +share/racket/pkgs/racket-cheat/racket-cheat.scrbl share/racket/pkgs/racket-doc/LICENSE.txt share/racket/pkgs/racket-doc/compatibility/compiled/info_rkt.dep share/racket/pkgs/racket-doc/compatibility/compiled/info_rkt.zo @@ -15445,6 +15531,8 @@ share/racket/pkgs/racket-doc/pkg/scribblings/compiled/db_scrbl.dep share/racket/pkgs/racket-doc/pkg/scribblings/compiled/db_scrbl.zo share/racket/pkgs/racket-doc/pkg/scribblings/compiled/dirs-catalog_scrbl.dep share/racket/pkgs/racket-doc/pkg/scribblings/compiled/dirs-catalog_scrbl.zo +share/racket/pkgs/racket-doc/pkg/scribblings/compiled/envvars_scrbl.dep +share/racket/pkgs/racket-doc/pkg/scribblings/compiled/envvars_scrbl.zo share/racket/pkgs/racket-doc/pkg/scribblings/compiled/getting-started_scrbl.dep share/racket/pkgs/racket-doc/pkg/scribblings/compiled/getting-started_scrbl.zo share/racket/pkgs/racket-doc/pkg/scribblings/compiled/git-workflow_scrbl.dep @@ -15463,6 +15551,7 @@ share/racket/pkgs/racket-doc/pkg/scribblings/compiled/strip_scrbl.dep share/racket/pkgs/racket-doc/pkg/scribblings/compiled/strip_scrbl.zo share/racket/pkgs/racket-doc/pkg/scribblings/db.scrbl share/racket/pkgs/racket-doc/pkg/scribblings/dirs-catalog.scrbl +share/racket/pkgs/racket-doc/pkg/scribblings/envvars.scrbl share/racket/pkgs/racket-doc/pkg/scribblings/getting-started.scrbl share/racket/pkgs/racket-doc/pkg/scribblings/git-workflow.scrbl share/racket/pkgs/racket-doc/pkg/scribblings/implementation.scrbl @@ -16630,6 +16719,8 @@ share/racket/pkgs/racket-doc/syntax/scribblings/compiled/id-table_scrbl.dep share/racket/pkgs/racket-doc/syntax/scribblings/compiled/id-table_scrbl.zo share/racket/pkgs/racket-doc/syntax/scribblings/compiled/info_rkt.dep share/racket/pkgs/racket-doc/syntax/scribblings/compiled/info_rkt.zo +share/racket/pkgs/racket-doc/syntax/scribblings/compiled/intdef_scrbl.dep +share/racket/pkgs/racket-doc/syntax/scribblings/compiled/intdef_scrbl.zo share/racket/pkgs/racket-doc/syntax/scribblings/compiled/kerncase_scrbl.dep share/racket/pkgs/racket-doc/syntax/scribblings/compiled/kerncase_scrbl.zo share/racket/pkgs/racket-doc/syntax/scribblings/compiled/keyword_scrbl.dep @@ -16700,6 +16791,7 @@ share/racket/pkgs/racket-doc/syntax/scribblings/free-vars.scrbl share/racket/pkgs/racket-doc/syntax/scribblings/id-set.scrbl share/racket/pkgs/racket-doc/syntax/scribblings/id-table.scrbl share/racket/pkgs/racket-doc/syntax/scribblings/info.rkt +share/racket/pkgs/racket-doc/syntax/scribblings/intdef.scrbl share/racket/pkgs/racket-doc/syntax/scribblings/kerncase.scrbl share/racket/pkgs/racket-doc/syntax/scribblings/keyword.scrbl share/racket/pkgs/racket-doc/syntax/scribblings/macro-testing.scrbl @@ -17473,6 +17565,24 @@ share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stl share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-9_rkt.zo share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-info_rkt.dep share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-info_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-1_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-1_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-2_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-2_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-3_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-3_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-4_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-4_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-5_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-5_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-6_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-6_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-7_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-7_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-8_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-8_rkt.zo +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-9_rkt.dep +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/stlc-with-binding-9_rkt.zo share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/typed-info_rkt.dep share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/typed-info_rkt.zo share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/compiled/util_rkt.dep @@ -17488,6 +17598,15 @@ share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-7.rkt share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-8.rkt share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-9.rkt share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-info.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-1.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-2.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-3.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-4.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-5.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-6.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-7.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-8.rkt +share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/stlc-with-binding-9.rkt share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/typed-info.rkt share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc+lists/util.rkt share/racket/pkgs/redex-benchmark/redex/benchmark/models/stlc-subst/compiled/generators_rkt.dep @@ -17678,10 +17797,6 @@ share/racket/pkgs/redex-doc/redex/scribblings/long-tut/code/wed-aft.rkt share/racket/pkgs/redex-doc/redex/scribblings/long-tut/code/wed-mor.rkt share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-mon-aft_scrbl.dep share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-mon-aft_scrbl.zo -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-thu-aft_scrbl.dep -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-thu-aft_scrbl.zo -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-thu-mor_scrbl.dep -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-thu-mor_scrbl.zo share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-tue-aft_scrbl.dep share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-tue-aft_scrbl.zo share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/lab-tue-mor_scrbl.dep @@ -17698,10 +17813,8 @@ share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/mon-mor_scrbl.de share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/mon-mor_scrbl.zo share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/shared_rkt.dep share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/shared_rkt.zo -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/thu-aft_scrbl.dep -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/thu-aft_scrbl.zo -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/thu-mor_scrbl.dep -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/thu-mor_scrbl.zo +share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/thu_scrbl.dep +share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/thu_scrbl.zo share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/tue-aft_scrbl.dep share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/tue-aft_scrbl.zo share/racket/pkgs/redex-doc/redex/scribblings/long-tut/compiled/tue-mor_scrbl.dep @@ -17717,8 +17830,6 @@ share/racket/pkgs/redex-doc/redex/scribblings/long-tut/exercise/compiled/ex_rkt. share/racket/pkgs/redex-doc/redex/scribblings/long-tut/exercise/counter.rkt share/racket/pkgs/redex-doc/redex/scribblings/long-tut/exercise/ex.rkt share/racket/pkgs/redex-doc/redex/scribblings/long-tut/lab-mon-aft.scrbl -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/lab-thu-aft.scrbl -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/lab-thu-mor.scrbl share/racket/pkgs/redex-doc/redex/scribblings/long-tut/lab-tue-aft.scrbl share/racket/pkgs/redex-doc/redex/scribblings/long-tut/lab-tue-mor.scrbl share/racket/pkgs/redex-doc/redex/scribblings/long-tut/lab-wed-aft.scrbl @@ -17728,8 +17839,7 @@ share/racket/pkgs/redex-doc/redex/scribblings/long-tut/mon-aft.scrbl share/racket/pkgs/redex-doc/redex/scribblings/long-tut/mon-mor.scrbl share/racket/pkgs/redex-doc/redex/scribblings/long-tut/shared.rkt share/racket/pkgs/redex-doc/redex/scribblings/long-tut/subject-reduction.png -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/thu-aft.scrbl -share/racket/pkgs/redex-doc/redex/scribblings/long-tut/thu-mor.scrbl +share/racket/pkgs/redex-doc/redex/scribblings/long-tut/thu.scrbl share/racket/pkgs/redex-doc/redex/scribblings/long-tut/traces.png share/racket/pkgs/redex-doc/redex/scribblings/long-tut/tue-aft.scrbl share/racket/pkgs/redex-doc/redex/scribblings/long-tut/tue-mor.scrbl @@ -17737,7 +17847,10 @@ share/racket/pkgs/redex-doc/redex/scribblings/long-tut/wed-aft.scrbl share/racket/pkgs/redex-doc/redex/scribblings/long-tut/wed-mor.scrbl share/racket/pkgs/redex-doc/redex/scribblings/mod-fx.rkt share/racket/pkgs/redex-doc/redex/scribblings/ref.scrbl +share/racket/pkgs/redex-doc/redex/scribblings/ref/binding.scrbl share/racket/pkgs/redex-doc/redex/scribblings/ref/common.rkt +share/racket/pkgs/redex-doc/redex/scribblings/ref/compiled/binding_scrbl.dep +share/racket/pkgs/redex-doc/redex/scribblings/ref/compiled/binding_scrbl.zo share/racket/pkgs/redex-doc/redex/scribblings/ref/compiled/common_rkt.dep share/racket/pkgs/redex-doc/redex/scribblings/ref/compiled/common_rkt.zo share/racket/pkgs/redex-doc/redex/scribblings/ref/compiled/dynamic-typesetting-and-macros_scrbl.dep @@ -17795,6 +17908,8 @@ share/racket/pkgs/redex-examples/redex/examples/compiled/contracts_rkt.dep share/racket/pkgs/redex-examples/redex/examples/compiled/contracts_rkt.zo share/racket/pkgs/redex-examples/redex/examples/compiled/info_rkt.dep share/racket/pkgs/redex-examples/redex/examples/compiled/info_rkt.zo +share/racket/pkgs/redex-examples/redex/examples/compiled/lazy-with-binding_rkt.dep +share/racket/pkgs/redex-examples/redex/examples/compiled/lazy-with-binding_rkt.zo share/racket/pkgs/redex-examples/redex/examples/compiled/lazy_rkt.dep share/racket/pkgs/redex-examples/redex/examples/compiled/lazy_rkt.zo share/racket/pkgs/redex-examples/redex/examples/compiled/let-poly_rkt.dep @@ -17813,6 +17928,8 @@ share/racket/pkgs/redex-examples/redex/examples/compiled/semaphores_rkt.dep share/racket/pkgs/redex-examples/redex/examples/compiled/semaphores_rkt.zo share/racket/pkgs/redex-examples/redex/examples/compiled/stlc+lists+subst_rkt.dep share/racket/pkgs/redex-examples/redex/examples/compiled/stlc+lists+subst_rkt.zo +share/racket/pkgs/redex-examples/redex/examples/compiled/stlc+lists-with-binding_rkt.dep +share/racket/pkgs/redex-examples/redex/examples/compiled/stlc+lists-with-binding_rkt.zo share/racket/pkgs/redex-examples/redex/examples/compiled/stlc+lists_rkt.dep share/racket/pkgs/redex-examples/redex/examples/compiled/stlc+lists_rkt.zo share/racket/pkgs/redex-examples/redex/examples/compiled/stlc-tests-lib_rkt.dep @@ -17899,6 +18016,7 @@ share/racket/pkgs/redex-examples/redex/examples/delim-cont/randomized-tests.rkt share/racket/pkgs/redex-examples/redex/examples/delim-cont/reduce.rkt share/racket/pkgs/redex-examples/redex/examples/delim-cont/test.rkt share/racket/pkgs/redex-examples/redex/examples/info.rkt +share/racket/pkgs/redex-examples/redex/examples/lazy-with-binding.rkt share/racket/pkgs/redex-examples/redex/examples/lazy.rkt share/racket/pkgs/redex-examples/redex/examples/let-poly.rkt share/racket/pkgs/redex-examples/redex/examples/letrec.rkt @@ -17976,6 +18094,7 @@ share/racket/pkgs/redex-examples/redex/examples/racket-machine/verification.rkt share/racket/pkgs/redex-examples/redex/examples/rbtrees.rkt share/racket/pkgs/redex-examples/redex/examples/semaphores.rkt share/racket/pkgs/redex-examples/redex/examples/stlc+lists+subst.rkt +share/racket/pkgs/redex-examples/redex/examples/stlc+lists-with-binding.rkt share/racket/pkgs/redex-examples/redex/examples/stlc+lists.rkt share/racket/pkgs/redex-examples/redex/examples/stlc-tests-lib.rkt share/racket/pkgs/redex-examples/redex/examples/stlc.rkt @@ -18020,9 +18139,18 @@ share/racket/pkgs/redex-lib/redex/compiled/tut-subst_rkt.dep share/racket/pkgs/redex-lib/redex/compiled/tut-subst_rkt.zo share/racket/pkgs/redex-lib/redex/info.rkt share/racket/pkgs/redex-lib/redex/private/ambiguous.rkt +share/racket/pkgs/redex-lib/redex/private/binding-forms-compiler.rkt +share/racket/pkgs/redex-lib/redex/private/binding-forms-definitions.rkt +share/racket/pkgs/redex-lib/redex/private/binding-forms.rkt share/racket/pkgs/redex-lib/redex/private/build-nt-property.rkt share/racket/pkgs/redex-lib/redex/private/compiled/ambiguous_rkt.dep share/racket/pkgs/redex-lib/redex/private/compiled/ambiguous_rkt.zo +share/racket/pkgs/redex-lib/redex/private/compiled/binding-forms-compiler_rkt.dep +share/racket/pkgs/redex-lib/redex/private/compiled/binding-forms-compiler_rkt.zo +share/racket/pkgs/redex-lib/redex/private/compiled/binding-forms-definitions_rkt.dep +share/racket/pkgs/redex-lib/redex/private/compiled/binding-forms-definitions_rkt.zo +share/racket/pkgs/redex-lib/redex/private/compiled/binding-forms_rkt.dep +share/racket/pkgs/redex-lib/redex/private/compiled/binding-forms_rkt.zo share/racket/pkgs/redex-lib/redex/private/compiled/build-nt-property_rkt.dep share/racket/pkgs/redex-lib/redex/private/compiled/build-nt-property_rkt.zo share/racket/pkgs/redex-lib/redex/private/compiled/cycle-check_rkt.dep @@ -18081,6 +18209,8 @@ share/racket/pkgs/redex-lib/redex/private/compiled/term-fn_rkt.dep share/racket/pkgs/redex-lib/redex/private/compiled/term-fn_rkt.zo share/racket/pkgs/redex-lib/redex/private/compiled/term_rkt.dep share/racket/pkgs/redex-lib/redex/private/compiled/term_rkt.zo +share/racket/pkgs/redex-lib/redex/private/compiled/test_rkt.dep +share/racket/pkgs/redex-lib/redex/private/compiled/test_rkt.zo share/racket/pkgs/redex-lib/redex/private/compiled/trace-layout_rkt.dep share/racket/pkgs/redex-lib/redex/private/compiled/trace-layout_rkt.zo share/racket/pkgs/redex-lib/redex/private/compiled/underscore-allowed_rkt.dep @@ -18119,6 +18249,7 @@ share/racket/pkgs/redex-lib/redex/private/search.rkt share/racket/pkgs/redex-lib/redex/private/struct.rkt share/racket/pkgs/redex-lib/redex/private/term-fn.rkt share/racket/pkgs/redex-lib/redex/private/term.rkt +share/racket/pkgs/redex-lib/redex/private/test.rkt share/racket/pkgs/redex-lib/redex/private/trace-layout.rkt share/racket/pkgs/redex-lib/redex/private/underscore-allowed.rkt share/racket/pkgs/redex-lib/redex/reduction-semantics.rkt @@ -18441,6 +18572,8 @@ share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/docreader_scrbl.dep share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/docreader_scrbl.zo share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/eval_scrbl.dep share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/eval_scrbl.zo +share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/examples_scrbl.dep +share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/examples_scrbl.zo share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/generic_scrbl.dep share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/generic_scrbl.zo share/racket/pkgs/scribble-doc/scribblings/scribble/compiled/how-to-paper_scrbl.dep @@ -18522,6 +18655,7 @@ share/racket/pkgs/scribble-doc/scribblings/scribble/demo.scrbl share/racket/pkgs/scribble-doc/scribblings/scribble/doclang.scrbl share/racket/pkgs/scribble-doc/scribblings/scribble/docreader.scrbl share/racket/pkgs/scribble-doc/scribblings/scribble/eval.scrbl +share/racket/pkgs/scribble-doc/scribblings/scribble/examples.scrbl share/racket/pkgs/scribble-doc/scribblings/scribble/generic.scrbl share/racket/pkgs/scribble-doc/scribblings/scribble/getting-started.scrbl share/racket/pkgs/scribble-doc/scribblings/scribble/how-to-paper.scrbl @@ -18670,6 +18804,10 @@ share/racket/pkgs/scribble-lib/scribble/compiled/doclang_rkt.dep share/racket/pkgs/scribble-lib/scribble/compiled/doclang_rkt.zo share/racket/pkgs/scribble-lib/scribble/compiled/eval_rkt.dep share/racket/pkgs/scribble-lib/scribble/compiled/eval_rkt.zo +share/racket/pkgs/scribble-lib/scribble/compiled/example_rkt.dep +share/racket/pkgs/scribble-lib/scribble/compiled/example_rkt.zo +share/racket/pkgs/scribble-lib/scribble/compiled/examples_rkt.dep +share/racket/pkgs/scribble-lib/scribble/compiled/examples_rkt.zo share/racket/pkgs/scribble-lib/scribble/compiled/extract_rkt.dep share/racket/pkgs/scribble-lib/scribble/compiled/extract_rkt.zo share/racket/pkgs/scribble-lib/scribble/compiled/html-properties_rkt.dep @@ -18744,6 +18882,8 @@ share/racket/pkgs/scribble-lib/scribble/doc/reader.rkt share/racket/pkgs/scribble-lib/scribble/doclang.rkt share/racket/pkgs/scribble-lib/scribble/doclang2.rkt share/racket/pkgs/scribble-lib/scribble/eval.rkt +share/racket/pkgs/scribble-lib/scribble/example.rkt +share/racket/pkgs/scribble-lib/scribble/examples.rkt share/racket/pkgs/scribble-lib/scribble/extract.rkt share/racket/pkgs/scribble-lib/scribble/html-properties.rkt share/racket/pkgs/scribble-lib/scribble/html-render.rkt @@ -18902,6 +19042,8 @@ share/racket/pkgs/scribble-lib/scribble/report/lang/reader.rkt share/racket/pkgs/scribble-lib/scribble/run.rkt share/racket/pkgs/scribble-lib/scribble/scheme.rkt share/racket/pkgs/scribble-lib/scribble/scribble-common.js +share/racket/pkgs/scribble-lib/scribble/scribble-load-replace.tex +share/racket/pkgs/scribble-lib/scribble/scribble-load.tex share/racket/pkgs/scribble-lib/scribble/scribble-prefix.html share/racket/pkgs/scribble-lib/scribble/scribble-prefix.tex share/racket/pkgs/scribble-lib/scribble/scribble-skull.tex @@ -20073,6 +20215,9 @@ share/racket/pkgs/string-constants-lib/string-constants/compiled/string-constant share/racket/pkgs/string-constants-lib/string-constants/compiled/string-constant_rkt.zo share/racket/pkgs/string-constants-lib/string-constants/info.rkt share/racket/pkgs/string-constants-lib/string-constants/main.rkt +share/racket/pkgs/string-constants-lib/string-constants/private/bulgarian-string-constants.rkt +share/racket/pkgs/string-constants-lib/string-constants/private/compiled/bulgarian-string-constants_rkt.dep +share/racket/pkgs/string-constants-lib/string-constants/private/compiled/bulgarian-string-constants_rkt.zo share/racket/pkgs/string-constants-lib/string-constants/private/compiled/danish-string-constants_rkt.dep share/racket/pkgs/string-constants-lib/string-constants/private/compiled/danish-string-constants_rkt.zo share/racket/pkgs/string-constants-lib/string-constants/private/compiled/dutch-string-constants_rkt.dep @@ -20461,6 +20606,8 @@ share/racket/pkgs/typed-racket-lib/typed-racket/compiled/typed-reader_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/core.rkt share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/env-req_rkt.dep share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/env-req_rkt.zo +share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/env-utils_rkt.dep +share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/env-utils_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/global-env_rkt.dep share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/global-env_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/index-env_rkt.dep @@ -20490,6 +20637,7 @@ share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/type-env-structs_rk share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/type-name-env_rkt.dep share/racket/pkgs/typed-racket-lib/typed-racket/env/compiled/type-name-env_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/env/env-req.rkt +share/racket/pkgs/typed-racket-lib/typed-racket/env/env-utils.rkt share/racket/pkgs/typed-racket-lib/typed-racket/env/global-env.rkt share/racket/pkgs/typed-racket-lib/typed-racket/env/index-env.rkt share/racket/pkgs/typed-racket-lib/typed-racket/env/init-envs.rkt @@ -20603,6 +20751,8 @@ share/racket/pkgs/typed-racket-lib/typed-racket/optimizer/vector.rkt share/racket/pkgs/typed-racket-lib/typed-racket/private/class-literals.rkt share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/class-literals_rkt.dep share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/class-literals_rkt.zo +share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/oc-button_rkt.dep +share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/oc-button_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/parse-classes_rkt.dep share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/parse-classes_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/parse-type_rkt.dep @@ -20615,6 +20765,7 @@ share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/type-contract_r share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/type-contract_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/with-types_rkt.dep share/racket/pkgs/typed-racket-lib/typed-racket/private/compiled/with-types_rkt.zo +share/racket/pkgs/typed-racket-lib/typed-racket/private/oc-button.rkt share/racket/pkgs/typed-racket-lib/typed-racket/private/parse-classes.rkt share/racket/pkgs/typed-racket-lib/typed-racket/private/parse-type.rkt share/racket/pkgs/typed-racket-lib/typed-racket/private/syntax-properties.rkt @@ -20938,6 +21089,8 @@ share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/opaque-object_rkt share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/opaque-object_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/print-struct_rkt.dep share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/print-struct_rkt.zo +share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/promise-not-name-contract_rkt.dep +share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/promise-not-name-contract_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/redirect-contract_rkt.dep share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/redirect-contract_rkt.zo share/racket/pkgs/typed-racket-lib/typed-racket/utils/compiled/require-contract_rkt.dep @@ -20971,6 +21124,7 @@ share/racket/pkgs/typed-racket-lib/typed-racket/utils/literal-syntax-class.rkt share/racket/pkgs/typed-racket-lib/typed-racket/utils/mutated-vars.rkt share/racket/pkgs/typed-racket-lib/typed-racket/utils/opaque-object.rkt share/racket/pkgs/typed-racket-lib/typed-racket/utils/print-struct.rkt +share/racket/pkgs/typed-racket-lib/typed-racket/utils/promise-not-name-contract.rkt share/racket/pkgs/typed-racket-lib/typed-racket/utils/redirect-contract.rkt share/racket/pkgs/typed-racket-lib/typed-racket/utils/require-contract.rkt share/racket/pkgs/typed-racket-lib/typed-racket/utils/sealing-contract.rkt @@ -21201,6 +21355,12 @@ share/racket/pkgs/typed-racket-more/typed/syntax/compiled/stx_rkt.dep share/racket/pkgs/typed-racket-more/typed/syntax/compiled/stx_rkt.zo share/racket/pkgs/typed-racket-more/typed/syntax/stx.rkt share/racket/pkgs/typed-racket-more/typed/untyped-utils.rkt +share/racket/pkgs/typed-racket-more/typed/web-server/compiled/http_rkt.dep +share/racket/pkgs/typed-racket-more/typed/web-server/compiled/http_rkt.zo +share/racket/pkgs/typed-racket-more/typed/web-server/configuration/compiled/responders_rkt.dep +share/racket/pkgs/typed-racket-more/typed/web-server/configuration/compiled/responders_rkt.zo +share/racket/pkgs/typed-racket-more/typed/web-server/configuration/responders.rkt +share/racket/pkgs/typed-racket-more/typed/web-server/http.rkt share/racket/pkgs/typed-racket/LICENSE.txt share/racket/pkgs/typed-racket/info.rkt share/racket/pkgs/unix-socket-doc/LICENSE.txt diff --git a/lang/racket/distinfo b/lang/racket/distinfo index 7cc589aeddca9..318dc9c090310 100644 --- a/lang/racket/distinfo +++ b/lang/racket/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.18 2015/12/29 23:34:54 dholland Exp $ +$NetBSD: distinfo,v 1.19 2016/03/15 19:49:42 asau Exp $ -SHA1 (racket-6.3-src.tgz) = 6def7372bc1a92e0eb15540dc5d427219104f63e -RMD160 (racket-6.3-src.tgz) = 2389103623078aedc8e79e2e91ef769dc37ce09b -SHA512 (racket-6.3-src.tgz) = 5d17c413ff61a0edf7b26c5b4dcab32992bc974d14cdf777c86bd2c6b9232133d2a57528edf2fb5cc605806b922e2f0361d9cd2ebe3b83bd586b3fc6b9bb8deb -Size (racket-6.3-src.tgz) = 20684967 bytes -SHA1 (patch-src_configure) = fe7685515b4b7611c01e56b8e43eae072f759305 -SHA1 (patch-src_racket_configure.ac) = f99b93c5421d0953af33245e0dfcedf3cd13ea91 +SHA1 (racket-6.4-src.tgz) = daa754d9880c0e089301b20945496922dd4a5847 +RMD160 (racket-6.4-src.tgz) = bec43fd94c59fae627dcf24a77cff056a9a830e2 +SHA512 (racket-6.4-src.tgz) = fed3ebe293532621e9ede160db0c5f723cdb5c6eb4b176dbafa83574b37faac68bade70df8ed248e077470ebd224a466c01541956fff9f13dc601b8e36925492 +Size (racket-6.4-src.tgz) = 20863252 bytes +SHA1 (patch-src_configure) = d2dd93be1d5ddec7b07fee73b0da5d6ce61d69b3 +SHA1 (patch-src_racket_configure.ac) = 29e239e74a395886dc8382543ab682c6a17b5e6b diff --git a/lang/racket/patches/patch-src_configure b/lang/racket/patches/patch-src_configure index 261dd2d4591be..d48e5a72857eb 100644 --- a/lang/racket/patches/patch-src_configure +++ b/lang/racket/patches/patch-src_configure @@ -1,8 +1,6 @@ -$NetBSD: patch-src_configure,v 1.4 2015/12/29 23:34:54 dholland Exp $ +$NetBSD: patch-src_configure,v 1.5 2016/03/15 19:49:43 asau Exp $ -Remove bashisms. - ---- src/configure.orig 2015-10-20 15:10:35.000000000 +0000 +--- src/configure.orig 2016-01-11 17:07:43.000000000 +0000 +++ src/configure @@ -3098,7 +3098,7 @@ if test "${enable_sysroot}" != "" ; then fi @@ -31,8 +29,8 @@ Remove bashisms. LIBS="${LIBS} -Wl,-Bstatic -lwinpthread" fi case "$build_os" in -@@ -4793,7 +4793,7 @@ fi - try_kqueue_syscall=yes +@@ -4798,7 +4798,7 @@ fi + try_poll_syscall=yes # ".a" is typically not useful, since we always build a ".dylib": - if test "${enable_libs}" == "" ; then diff --git a/lang/racket/patches/patch-src_racket_configure.ac b/lang/racket/patches/patch-src_racket_configure.ac index c5f8b4fa736fb..436a4abcae076 100644 --- a/lang/racket/patches/patch-src_racket_configure.ac +++ b/lang/racket/patches/patch-src_racket_configure.ac @@ -1,8 +1,6 @@ -$NetBSD: patch-src_racket_configure.ac,v 1.2 2015/12/29 23:34:54 dholland Exp $ +$NetBSD: patch-src_racket_configure.ac,v 1.3 2016/03/15 19:49:43 asau Exp $ -Remove bashisms. - ---- src/racket/configure.ac.orig 2015-10-20 15:10:35.000000000 +0000 +--- src/racket/configure.ac.orig 2016-01-11 17:07:43.000000000 +0000 +++ src/racket/configure.ac @@ -369,7 +369,7 @@ if test "${enable_sysroot}" != "" ; then fi @@ -31,8 +29,8 @@ Remove bashisms. LIBS="${LIBS} -Wl,-Bstatic -lwinpthread" fi case "$build_os" in -@@ -874,7 +874,7 @@ case "$host_os" in - try_kqueue_syscall=yes +@@ -879,7 +879,7 @@ case "$host_os" in + try_poll_syscall=yes # ".a" is typically not useful, since we always build a ".dylib": - if test "${enable_libs}" == "" ; then From 56b6fa0fcb86a1764b22fd9293cbdf5169575fca Mon Sep 17 00:00:00 2001 From: bouyer Date: Tue, 15 Mar 2016 20:39:52 +0000 Subject: [PATCH 0219/2457] Update to 1.4.2.1. Changes since 1.4.0.1: Added support for 14 bit EX processors: PIC16F1777/8/9 PIC16F18857 PIC16F18877 More predefined constants in the gpasm. Added the missing DEBUG config option to many processors. Improve the check that Flex is more recent than version 2.5.4. Let "--list-chips" adapt to available screen width. The inc and lkr files are synced with MPLABX 3.15 --- devel/gputils/Makefile | 6 +- devel/gputils/PLIST | 408 ++++++++++++++++++++++++++++++++++++++++- devel/gputils/distinfo | 10 +- 3 files changed, 416 insertions(+), 8 deletions(-) diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile index 92ffa4888ff64..26de723d4b88b 100644 --- a/devel/gputils/Makefile +++ b/devel/gputils/Makefile @@ -1,8 +1,10 @@ -# $NetBSD: Makefile,v 1.20 2015/08/22 16:27:07 bouyer Exp $ +# $NetBSD: Makefile,v 1.21 2016/03/15 20:39:52 bouyer Exp $ -DISTNAME= gputils-1.4.0-1 +DISTNAME= gputils-1.4.2-1 +PKGNAME= gputils-1.4.2.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gputils/} +WRKSRC= ${WRKDIR}/gputils-1.4.2 MAINTAINER= dogcow@NetBSD.org HOMEPAGE= http://gputils.sourceforge.net/ diff --git a/devel/gputils/PLIST b/devel/gputils/PLIST index a82f35caa2dbb..5f38ac2ad7285 100644 --- a/devel/gputils/PLIST +++ b/devel/gputils/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2014/12/30 22:19:35 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/03/15 20:39:52 bouyer Exp $ bin/gpasm bin/gpdasm bin/gplib @@ -189,6 +189,10 @@ share/gputils/header/p16f1518.inc share/gputils/header/p16f1519.inc share/gputils/header/p16f1526.inc share/gputils/header/p16f1527.inc +share/gputils/header/p16f1574.inc +share/gputils/header/p16f1575.inc +share/gputils/header/p16f1578.inc +share/gputils/header/p16f1579.inc share/gputils/header/p16f1613.inc share/gputils/header/p16f1614.inc share/gputils/header/p16f1615.inc @@ -205,6 +209,15 @@ share/gputils/header/p16f1716.inc share/gputils/header/p16f1717.inc share/gputils/header/p16f1718.inc share/gputils/header/p16f1719.inc +share/gputils/header/p16f1764.inc +share/gputils/header/p16f1765.inc +share/gputils/header/p16f1768.inc +share/gputils/header/p16f1769.inc +share/gputils/header/p16f1773.inc +share/gputils/header/p16f1776.inc +share/gputils/header/p16f1777.inc +share/gputils/header/p16f1778.inc +share/gputils/header/p16f1779.inc share/gputils/header/p16f1782.inc share/gputils/header/p16f1783.inc share/gputils/header/p16f1784.inc @@ -220,7 +233,22 @@ share/gputils/header/p16f1827.inc share/gputils/header/p16f1828.inc share/gputils/header/p16f1829.inc share/gputils/header/p16f1829lin.inc +share/gputils/header/p16f18313.inc +share/gputils/header/p16f18323.inc +share/gputils/header/p16f18324.inc +share/gputils/header/p16f18325.inc +share/gputils/header/p16f18326.inc +share/gputils/header/p16f18344.inc +share/gputils/header/p16f18345.inc +share/gputils/header/p16f18346.inc share/gputils/header/p16f1847.inc +share/gputils/header/p16f18854.inc +share/gputils/header/p16f18855.inc +share/gputils/header/p16f18856.inc +share/gputils/header/p16f18857.inc +share/gputils/header/p16f18875.inc +share/gputils/header/p16f18876.inc +share/gputils/header/p16f18877.inc share/gputils/header/p16f1933.inc share/gputils/header/p16f1934.inc share/gputils/header/p16f1936.inc @@ -331,6 +359,12 @@ share/gputils/header/p16lf1526.inc share/gputils/header/p16lf1527.inc share/gputils/header/p16lf1554.inc share/gputils/header/p16lf1559.inc +share/gputils/header/p16lf1566.inc +share/gputils/header/p16lf1567.inc +share/gputils/header/p16lf1574.inc +share/gputils/header/p16lf1575.inc +share/gputils/header/p16lf1578.inc +share/gputils/header/p16lf1579.inc share/gputils/header/p16lf1613.inc share/gputils/header/p16lf1614.inc share/gputils/header/p16lf1615.inc @@ -347,6 +381,15 @@ share/gputils/header/p16lf1716.inc share/gputils/header/p16lf1717.inc share/gputils/header/p16lf1718.inc share/gputils/header/p16lf1719.inc +share/gputils/header/p16lf1764.inc +share/gputils/header/p16lf1765.inc +share/gputils/header/p16lf1768.inc +share/gputils/header/p16lf1769.inc +share/gputils/header/p16lf1773.inc +share/gputils/header/p16lf1776.inc +share/gputils/header/p16lf1777.inc +share/gputils/header/p16lf1778.inc +share/gputils/header/p16lf1779.inc share/gputils/header/p16lf1782.inc share/gputils/header/p16lf1783.inc share/gputils/header/p16lf1784.inc @@ -364,7 +407,18 @@ share/gputils/header/p16lf1828.inc share/gputils/header/p16lf1829.inc share/gputils/header/p16lf18313.inc share/gputils/header/p16lf18323.inc +share/gputils/header/p16lf18324.inc +share/gputils/header/p16lf18325.inc +share/gputils/header/p16lf18344.inc +share/gputils/header/p16lf18345.inc share/gputils/header/p16lf1847.inc +share/gputils/header/p16lf18854.inc +share/gputils/header/p16lf18855.inc +share/gputils/header/p16lf18856.inc +share/gputils/header/p16lf18857.inc +share/gputils/header/p16lf18875.inc +share/gputils/header/p16lf18876.inc +share/gputils/header/p16lf18877.inc share/gputils/header/p16lf1902.inc share/gputils/header/p16lf1903.inc share/gputils/header/p16lf1904.inc @@ -378,6 +432,11 @@ share/gputils/header/p16lf1938.inc share/gputils/header/p16lf1939.inc share/gputils/header/p16lf1946.inc share/gputils/header/p16lf1947.inc +share/gputils/header/p16lf627.inc +share/gputils/header/p16lf627a.inc +share/gputils/header/p16lf628.inc +share/gputils/header/p16lf628a.inc +share/gputils/header/p16lf648a.inc share/gputils/header/p16lf707.inc share/gputils/header/p16lf720.inc share/gputils/header/p16lf721.inc @@ -388,6 +447,30 @@ share/gputils/header/p16lf723a.inc share/gputils/header/p16lf724.inc share/gputils/header/p16lf726.inc share/gputils/header/p16lf727.inc +share/gputils/header/p16lf74.inc +share/gputils/header/p16lf747.inc +share/gputils/header/p16lf76.inc +share/gputils/header/p16lf767.inc +share/gputils/header/p16lf77.inc +share/gputils/header/p16lf777.inc +share/gputils/header/p16lf818.inc +share/gputils/header/p16lf819.inc +share/gputils/header/p16lf83.inc +share/gputils/header/p16lf84.inc +share/gputils/header/p16lf84a.inc +share/gputils/header/p16lf87.inc +share/gputils/header/p16lf870.inc +share/gputils/header/p16lf871.inc +share/gputils/header/p16lf872.inc +share/gputils/header/p16lf873.inc +share/gputils/header/p16lf873a.inc +share/gputils/header/p16lf874.inc +share/gputils/header/p16lf874a.inc +share/gputils/header/p16lf876.inc +share/gputils/header/p16lf876a.inc +share/gputils/header/p16lf877.inc +share/gputils/header/p16lf877a.inc +share/gputils/header/p16lf88.inc share/gputils/header/p17c42.inc share/gputils/header/p17c42a.inc share/gputils/header/p17c43.inc @@ -440,6 +523,7 @@ share/gputils/header/p18f24j11.inc share/gputils/header/p18f24j50.inc share/gputils/header/p18f24k20.inc share/gputils/header/p18f24k22.inc +share/gputils/header/p18f24k40.inc share/gputils/header/p18f24k50.inc share/gputils/header/p18f2510.inc share/gputils/header/p18f2515.inc @@ -458,6 +542,7 @@ share/gputils/header/p18f25j11.inc share/gputils/header/p18f25j50.inc share/gputils/header/p18f25k20.inc share/gputils/header/p18f25k22.inc +share/gputils/header/p18f25k40.inc share/gputils/header/p18f25k50.inc share/gputils/header/p18f25k80.inc share/gputils/header/p18f2610.inc @@ -471,6 +556,7 @@ share/gputils/header/p18f26j50.inc share/gputils/header/p18f26j53.inc share/gputils/header/p18f26k20.inc share/gputils/header/p18f26k22.inc +share/gputils/header/p18f26k40.inc share/gputils/header/p18f26k80.inc share/gputils/header/p18f27j13.inc share/gputils/header/p18f27j53.inc @@ -514,6 +600,7 @@ share/gputils/header/p18f45j11.inc share/gputils/header/p18f45j50.inc share/gputils/header/p18f45k20.inc share/gputils/header/p18f45k22.inc +share/gputils/header/p18f45k40.inc share/gputils/header/p18f45k50.inc share/gputils/header/p18f45k80.inc share/gputils/header/p18f4610.inc @@ -527,9 +614,11 @@ share/gputils/header/p18f46j50.inc share/gputils/header/p18f46j53.inc share/gputils/header/p18f46k20.inc share/gputils/header/p18f46k22.inc +share/gputils/header/p18f46k40.inc share/gputils/header/p18f46k80.inc share/gputils/header/p18f47j13.inc share/gputils/header/p18f47j53.inc +share/gputils/header/p18f47k40.inc share/gputils/header/p18f6310.inc share/gputils/header/p18f6390.inc share/gputils/header/p18f6393.inc @@ -649,51 +738,165 @@ share/gputils/header/p18f96j94.inc share/gputils/header/p18f96j99.inc share/gputils/header/p18f97j60.inc share/gputils/header/p18f97j94.inc +share/gputils/header/p18lf1220.inc +share/gputils/header/p18lf1230.inc +share/gputils/header/p18lf1320.inc +share/gputils/header/p18lf1330.inc share/gputils/header/p18lf13k22.inc share/gputils/header/p18lf13k50.inc share/gputils/header/p18lf14k22.inc share/gputils/header/p18lf14k50.inc +share/gputils/header/p18lf2220.inc +share/gputils/header/p18lf2221.inc +share/gputils/header/p18lf2320.inc +share/gputils/header/p18lf2321.inc +share/gputils/header/p18lf2331.inc share/gputils/header/p18lf23k22.inc +share/gputils/header/p18lf2410.inc +share/gputils/header/p18lf242.inc +share/gputils/header/p18lf2420.inc +share/gputils/header/p18lf2423.inc +share/gputils/header/p18lf2431.inc +share/gputils/header/p18lf2439.inc +share/gputils/header/p18lf2450.inc +share/gputils/header/p18lf2455.inc +share/gputils/header/p18lf2458.inc +share/gputils/header/p18lf248.inc +share/gputils/header/p18lf2480.inc share/gputils/header/p18lf24j10.inc share/gputils/header/p18lf24j11.inc share/gputils/header/p18lf24j50.inc share/gputils/header/p18lf24k22.inc +share/gputils/header/p18lf24k40.inc share/gputils/header/p18lf24k50.inc +share/gputils/header/p18lf2510.inc +share/gputils/header/p18lf2515.inc +share/gputils/header/p18lf252.inc +share/gputils/header/p18lf2520.inc +share/gputils/header/p18lf2523.inc +share/gputils/header/p18lf2525.inc +share/gputils/header/p18lf2539.inc +share/gputils/header/p18lf2550.inc +share/gputils/header/p18lf2553.inc +share/gputils/header/p18lf258.inc +share/gputils/header/p18lf2580.inc +share/gputils/header/p18lf2585.inc share/gputils/header/p18lf25j10.inc share/gputils/header/p18lf25j11.inc share/gputils/header/p18lf25j50.inc share/gputils/header/p18lf25k22.inc +share/gputils/header/p18lf25k40.inc share/gputils/header/p18lf25k50.inc share/gputils/header/p18lf25k80.inc +share/gputils/header/p18lf2610.inc +share/gputils/header/p18lf2620.inc +share/gputils/header/p18lf2680.inc +share/gputils/header/p18lf2682.inc +share/gputils/header/p18lf2685.inc share/gputils/header/p18lf26j11.inc share/gputils/header/p18lf26j13.inc share/gputils/header/p18lf26j50.inc share/gputils/header/p18lf26j53.inc share/gputils/header/p18lf26k22.inc +share/gputils/header/p18lf26k40.inc share/gputils/header/p18lf26k80.inc share/gputils/header/p18lf27j13.inc share/gputils/header/p18lf27j53.inc +share/gputils/header/p18lf4220.inc +share/gputils/header/p18lf4221.inc +share/gputils/header/p18lf4320.inc +share/gputils/header/p18lf4321.inc +share/gputils/header/p18lf4331.inc share/gputils/header/p18lf43k22.inc +share/gputils/header/p18lf4410.inc +share/gputils/header/p18lf442.inc +share/gputils/header/p18lf4420.inc +share/gputils/header/p18lf4423.inc +share/gputils/header/p18lf4431.inc +share/gputils/header/p18lf4439.inc +share/gputils/header/p18lf4450.inc +share/gputils/header/p18lf4455.inc +share/gputils/header/p18lf4458.inc +share/gputils/header/p18lf448.inc +share/gputils/header/p18lf4480.inc share/gputils/header/p18lf44j10.inc share/gputils/header/p18lf44j11.inc share/gputils/header/p18lf44j50.inc share/gputils/header/p18lf44k22.inc +share/gputils/header/p18lf4510.inc +share/gputils/header/p18lf4515.inc +share/gputils/header/p18lf452.inc +share/gputils/header/p18lf4520.inc +share/gputils/header/p18lf4523.inc +share/gputils/header/p18lf4525.inc +share/gputils/header/p18lf4539.inc +share/gputils/header/p18lf4550.inc +share/gputils/header/p18lf4553.inc +share/gputils/header/p18lf458.inc +share/gputils/header/p18lf4580.inc +share/gputils/header/p18lf4585.inc share/gputils/header/p18lf45j10.inc share/gputils/header/p18lf45j11.inc share/gputils/header/p18lf45j50.inc share/gputils/header/p18lf45k22.inc +share/gputils/header/p18lf45k40.inc share/gputils/header/p18lf45k50.inc share/gputils/header/p18lf45k80.inc +share/gputils/header/p18lf4610.inc +share/gputils/header/p18lf4620.inc +share/gputils/header/p18lf4680.inc +share/gputils/header/p18lf4682.inc +share/gputils/header/p18lf4685.inc share/gputils/header/p18lf46j11.inc share/gputils/header/p18lf46j13.inc share/gputils/header/p18lf46j50.inc share/gputils/header/p18lf46j53.inc share/gputils/header/p18lf46k22.inc +share/gputils/header/p18lf46k40.inc share/gputils/header/p18lf46k80.inc share/gputils/header/p18lf47j13.inc share/gputils/header/p18lf47j53.inc +share/gputils/header/p18lf47k40.inc +share/gputils/header/p18lf6310.inc +share/gputils/header/p18lf6390.inc +share/gputils/header/p18lf6393.inc +share/gputils/header/p18lf6410.inc +share/gputils/header/p18lf6490.inc +share/gputils/header/p18lf6493.inc +share/gputils/header/p18lf6520.inc +share/gputils/header/p18lf6525.inc +share/gputils/header/p18lf6527.inc +share/gputils/header/p18lf6585.inc share/gputils/header/p18lf65k80.inc +share/gputils/header/p18lf6620.inc +share/gputils/header/p18lf6621.inc +share/gputils/header/p18lf6622.inc +share/gputils/header/p18lf6627.inc +share/gputils/header/p18lf6628.inc +share/gputils/header/p18lf6680.inc share/gputils/header/p18lf66k80.inc +share/gputils/header/p18lf6720.inc +share/gputils/header/p18lf6722.inc +share/gputils/header/p18lf6723.inc +share/gputils/header/p18lf8310.inc +share/gputils/header/p18lf8390.inc +share/gputils/header/p18lf8393.inc +share/gputils/header/p18lf8410.inc +share/gputils/header/p18lf8490.inc +share/gputils/header/p18lf8493.inc +share/gputils/header/p18lf8520.inc +share/gputils/header/p18lf8525.inc +share/gputils/header/p18lf8527.inc +share/gputils/header/p18lf8585.inc +share/gputils/header/p18lf8620.inc +share/gputils/header/p18lf8621.inc +share/gputils/header/p18lf8622.inc +share/gputils/header/p18lf8627.inc +share/gputils/header/p18lf8628.inc +share/gputils/header/p18lf8680.inc +share/gputils/header/p18lf8720.inc +share/gputils/header/p18lf8722.inc +share/gputils/header/p18lf8723.inc share/gputils/header/p18macro.inc share/gputils/header/pmcv08a.inc share/gputils/header/pmcv14a.inc @@ -868,6 +1071,10 @@ share/gputils/lkr/16f1518_g.lkr share/gputils/lkr/16f1519_g.lkr share/gputils/lkr/16f1526_g.lkr share/gputils/lkr/16f1527_g.lkr +share/gputils/lkr/16f1574_g.lkr +share/gputils/lkr/16f1575_g.lkr +share/gputils/lkr/16f1578_g.lkr +share/gputils/lkr/16f1579_g.lkr share/gputils/lkr/16f1613_g.lkr share/gputils/lkr/16f1614_g.lkr share/gputils/lkr/16f1615_g.lkr @@ -884,6 +1091,15 @@ share/gputils/lkr/16f1716_g.lkr share/gputils/lkr/16f1717_g.lkr share/gputils/lkr/16f1718_g.lkr share/gputils/lkr/16f1719_g.lkr +share/gputils/lkr/16f1764_g.lkr +share/gputils/lkr/16f1765_g.lkr +share/gputils/lkr/16f1768_g.lkr +share/gputils/lkr/16f1769_g.lkr +share/gputils/lkr/16f1773_g.lkr +share/gputils/lkr/16f1776_g.lkr +share/gputils/lkr/16f1777_g.lkr +share/gputils/lkr/16f1778_g.lkr +share/gputils/lkr/16f1779_g.lkr share/gputils/lkr/16f1782_g.lkr share/gputils/lkr/16f1783_g.lkr share/gputils/lkr/16f1784_g.lkr @@ -899,7 +1115,22 @@ share/gputils/lkr/16f1827_g.lkr share/gputils/lkr/16f1828_g.lkr share/gputils/lkr/16f1829_g.lkr share/gputils/lkr/16f1829lin_g.lkr +share/gputils/lkr/16f18313_g.lkr +share/gputils/lkr/16f18323_g.lkr +share/gputils/lkr/16f18324_g.lkr +share/gputils/lkr/16f18325_g.lkr +share/gputils/lkr/16f18326_g.lkr +share/gputils/lkr/16f18344_g.lkr +share/gputils/lkr/16f18345_g.lkr +share/gputils/lkr/16f18346_g.lkr share/gputils/lkr/16f1847_g.lkr +share/gputils/lkr/16f18854_g.lkr +share/gputils/lkr/16f18855_g.lkr +share/gputils/lkr/16f18856_g.lkr +share/gputils/lkr/16f18857_g.lkr +share/gputils/lkr/16f18875_g.lkr +share/gputils/lkr/16f18876_g.lkr +share/gputils/lkr/16f18877_g.lkr share/gputils/lkr/16f1933_g.lkr share/gputils/lkr/16f1934_g.lkr share/gputils/lkr/16f1936_g.lkr @@ -1008,6 +1239,12 @@ share/gputils/lkr/16lf1526_g.lkr share/gputils/lkr/16lf1527_g.lkr share/gputils/lkr/16lf1554_g.lkr share/gputils/lkr/16lf1559_g.lkr +share/gputils/lkr/16lf1566_g.lkr +share/gputils/lkr/16lf1567_g.lkr +share/gputils/lkr/16lf1574_g.lkr +share/gputils/lkr/16lf1575_g.lkr +share/gputils/lkr/16lf1578_g.lkr +share/gputils/lkr/16lf1579_g.lkr share/gputils/lkr/16lf1613_g.lkr share/gputils/lkr/16lf1614_g.lkr share/gputils/lkr/16lf1615_g.lkr @@ -1024,6 +1261,15 @@ share/gputils/lkr/16lf1716_g.lkr share/gputils/lkr/16lf1717_g.lkr share/gputils/lkr/16lf1718_g.lkr share/gputils/lkr/16lf1719_g.lkr +share/gputils/lkr/16lf1764_g.lkr +share/gputils/lkr/16lf1765_g.lkr +share/gputils/lkr/16lf1768_g.lkr +share/gputils/lkr/16lf1769_g.lkr +share/gputils/lkr/16lf1773_g.lkr +share/gputils/lkr/16lf1776_g.lkr +share/gputils/lkr/16lf1777_g.lkr +share/gputils/lkr/16lf1778_g.lkr +share/gputils/lkr/16lf1779_g.lkr share/gputils/lkr/16lf1782_g.lkr share/gputils/lkr/16lf1783_g.lkr share/gputils/lkr/16lf1784_g.lkr @@ -1041,7 +1287,18 @@ share/gputils/lkr/16lf1828_g.lkr share/gputils/lkr/16lf1829_g.lkr share/gputils/lkr/16lf18313_g.lkr share/gputils/lkr/16lf18323_g.lkr +share/gputils/lkr/16lf18324_g.lkr +share/gputils/lkr/16lf18325_g.lkr +share/gputils/lkr/16lf18344_g.lkr +share/gputils/lkr/16lf18345_g.lkr share/gputils/lkr/16lf1847_g.lkr +share/gputils/lkr/16lf18854_g.lkr +share/gputils/lkr/16lf18855_g.lkr +share/gputils/lkr/16lf18856_g.lkr +share/gputils/lkr/16lf18857_g.lkr +share/gputils/lkr/16lf18875_g.lkr +share/gputils/lkr/16lf18876_g.lkr +share/gputils/lkr/16lf18877_g.lkr share/gputils/lkr/16lf1902_g.lkr share/gputils/lkr/16lf1903_g.lkr share/gputils/lkr/16lf1904_g.lkr @@ -1055,6 +1312,11 @@ share/gputils/lkr/16lf1938_g.lkr share/gputils/lkr/16lf1939_g.lkr share/gputils/lkr/16lf1946_g.lkr share/gputils/lkr/16lf1947_g.lkr +share/gputils/lkr/16lf627_g.lkr +share/gputils/lkr/16lf627a_g.lkr +share/gputils/lkr/16lf628_g.lkr +share/gputils/lkr/16lf628a_g.lkr +share/gputils/lkr/16lf648a_g.lkr share/gputils/lkr/16lf707_g.lkr share/gputils/lkr/16lf720_g.lkr share/gputils/lkr/16lf721_g.lkr @@ -1065,6 +1327,30 @@ share/gputils/lkr/16lf723a_g.lkr share/gputils/lkr/16lf724_g.lkr share/gputils/lkr/16lf726_g.lkr share/gputils/lkr/16lf727_g.lkr +share/gputils/lkr/16lf747_g.lkr +share/gputils/lkr/16lf74_g.lkr +share/gputils/lkr/16lf767_g.lkr +share/gputils/lkr/16lf76_g.lkr +share/gputils/lkr/16lf777_g.lkr +share/gputils/lkr/16lf77_g.lkr +share/gputils/lkr/16lf818_g.lkr +share/gputils/lkr/16lf819_g.lkr +share/gputils/lkr/16lf83_g.lkr +share/gputils/lkr/16lf84_g.lkr +share/gputils/lkr/16lf84a_g.lkr +share/gputils/lkr/16lf870_g.lkr +share/gputils/lkr/16lf871_g.lkr +share/gputils/lkr/16lf872_g.lkr +share/gputils/lkr/16lf873_g.lkr +share/gputils/lkr/16lf873a_g.lkr +share/gputils/lkr/16lf874_g.lkr +share/gputils/lkr/16lf874a_g.lkr +share/gputils/lkr/16lf876_g.lkr +share/gputils/lkr/16lf876a_g.lkr +share/gputils/lkr/16lf877_g.lkr +share/gputils/lkr/16lf877a_g.lkr +share/gputils/lkr/16lf87_g.lkr +share/gputils/lkr/16lf88_g.lkr share/gputils/lkr/17c42_g.lkr share/gputils/lkr/17c42a_g.lkr share/gputils/lkr/17c43_g.lkr @@ -1116,6 +1402,7 @@ share/gputils/lkr/18f24j11_g.lkr share/gputils/lkr/18f24j50_g.lkr share/gputils/lkr/18f24k20_g.lkr share/gputils/lkr/18f24k22_g.lkr +share/gputils/lkr/18f24k40_g.lkr share/gputils/lkr/18f24k50_g.lkr share/gputils/lkr/18f2510_g.lkr share/gputils/lkr/18f2515_g.lkr @@ -1134,6 +1421,7 @@ share/gputils/lkr/18f25j11_g.lkr share/gputils/lkr/18f25j50_g.lkr share/gputils/lkr/18f25k20_g.lkr share/gputils/lkr/18f25k22_g.lkr +share/gputils/lkr/18f25k40_g.lkr share/gputils/lkr/18f25k50_g.lkr share/gputils/lkr/18f25k80_g.lkr share/gputils/lkr/18f2610_g.lkr @@ -1147,6 +1435,7 @@ share/gputils/lkr/18f26j50_g.lkr share/gputils/lkr/18f26j53_g.lkr share/gputils/lkr/18f26k20_g.lkr share/gputils/lkr/18f26k22_g.lkr +share/gputils/lkr/18f26k40_g.lkr share/gputils/lkr/18f26k80_g.lkr share/gputils/lkr/18f27j13_g.lkr share/gputils/lkr/18f27j53_g.lkr @@ -1190,6 +1479,7 @@ share/gputils/lkr/18f45j11_g.lkr share/gputils/lkr/18f45j50_g.lkr share/gputils/lkr/18f45k20_g.lkr share/gputils/lkr/18f45k22_g.lkr +share/gputils/lkr/18f45k40_g.lkr share/gputils/lkr/18f45k50_g.lkr share/gputils/lkr/18f45k80_g.lkr share/gputils/lkr/18f4610_g.lkr @@ -1203,9 +1493,11 @@ share/gputils/lkr/18f46j50_g.lkr share/gputils/lkr/18f46j53_g.lkr share/gputils/lkr/18f46k20_g.lkr share/gputils/lkr/18f46k22_g.lkr +share/gputils/lkr/18f46k40_g.lkr share/gputils/lkr/18f46k80_g.lkr share/gputils/lkr/18f47j13_g.lkr share/gputils/lkr/18f47j53_g.lkr +share/gputils/lkr/18f47k40_g.lkr share/gputils/lkr/18f6310_g.lkr share/gputils/lkr/18f6390_g.lkr share/gputils/lkr/18f6393_g.lkr @@ -1325,51 +1617,165 @@ share/gputils/lkr/18f96j94_g.lkr share/gputils/lkr/18f96j99_g.lkr share/gputils/lkr/18f97j60_g.lkr share/gputils/lkr/18f97j94_g.lkr +share/gputils/lkr/18lf1220_g.lkr +share/gputils/lkr/18lf1230_g.lkr +share/gputils/lkr/18lf1320_g.lkr +share/gputils/lkr/18lf1330_g.lkr share/gputils/lkr/18lf13k22_g.lkr share/gputils/lkr/18lf13k50_g.lkr share/gputils/lkr/18lf14k22_g.lkr share/gputils/lkr/18lf14k50_g.lkr +share/gputils/lkr/18lf2220_g.lkr +share/gputils/lkr/18lf2221_g.lkr +share/gputils/lkr/18lf2320_g.lkr +share/gputils/lkr/18lf2321_g.lkr +share/gputils/lkr/18lf2331_g.lkr share/gputils/lkr/18lf23k22_g.lkr +share/gputils/lkr/18lf2410_g.lkr +share/gputils/lkr/18lf2420_g.lkr +share/gputils/lkr/18lf2423_g.lkr +share/gputils/lkr/18lf242_g.lkr +share/gputils/lkr/18lf2431_g.lkr +share/gputils/lkr/18lf2439_g.lkr +share/gputils/lkr/18lf2450_g.lkr +share/gputils/lkr/18lf2455_g.lkr +share/gputils/lkr/18lf2458_g.lkr +share/gputils/lkr/18lf2480_g.lkr +share/gputils/lkr/18lf248_g.lkr share/gputils/lkr/18lf24j10_g.lkr share/gputils/lkr/18lf24j11_g.lkr share/gputils/lkr/18lf24j50_g.lkr share/gputils/lkr/18lf24k22_g.lkr +share/gputils/lkr/18lf24k40_g.lkr share/gputils/lkr/18lf24k50_g.lkr +share/gputils/lkr/18lf2510_g.lkr +share/gputils/lkr/18lf2515_g.lkr +share/gputils/lkr/18lf2520_g.lkr +share/gputils/lkr/18lf2523_g.lkr +share/gputils/lkr/18lf2525_g.lkr +share/gputils/lkr/18lf252_g.lkr +share/gputils/lkr/18lf2539_g.lkr +share/gputils/lkr/18lf2550_g.lkr +share/gputils/lkr/18lf2553_g.lkr +share/gputils/lkr/18lf2580_g.lkr +share/gputils/lkr/18lf2585_g.lkr +share/gputils/lkr/18lf258_g.lkr share/gputils/lkr/18lf25j10_g.lkr share/gputils/lkr/18lf25j11_g.lkr share/gputils/lkr/18lf25j50_g.lkr share/gputils/lkr/18lf25k22_g.lkr +share/gputils/lkr/18lf25k40_g.lkr share/gputils/lkr/18lf25k50_g.lkr share/gputils/lkr/18lf25k80_g.lkr +share/gputils/lkr/18lf2610_g.lkr +share/gputils/lkr/18lf2620_g.lkr +share/gputils/lkr/18lf2680_g.lkr +share/gputils/lkr/18lf2682_g.lkr +share/gputils/lkr/18lf2685_g.lkr share/gputils/lkr/18lf26j11_g.lkr share/gputils/lkr/18lf26j13_g.lkr share/gputils/lkr/18lf26j50_g.lkr share/gputils/lkr/18lf26j53_g.lkr share/gputils/lkr/18lf26k22_g.lkr +share/gputils/lkr/18lf26k40_g.lkr share/gputils/lkr/18lf26k80_g.lkr share/gputils/lkr/18lf27j13_g.lkr share/gputils/lkr/18lf27j53_g.lkr +share/gputils/lkr/18lf4220_g.lkr +share/gputils/lkr/18lf4221_g.lkr +share/gputils/lkr/18lf4320_g.lkr +share/gputils/lkr/18lf4321_g.lkr +share/gputils/lkr/18lf4331_g.lkr share/gputils/lkr/18lf43k22_g.lkr +share/gputils/lkr/18lf4410_g.lkr +share/gputils/lkr/18lf4420_g.lkr +share/gputils/lkr/18lf4423_g.lkr +share/gputils/lkr/18lf442_g.lkr +share/gputils/lkr/18lf4431_g.lkr +share/gputils/lkr/18lf4439_g.lkr +share/gputils/lkr/18lf4450_g.lkr +share/gputils/lkr/18lf4455_g.lkr +share/gputils/lkr/18lf4458_g.lkr +share/gputils/lkr/18lf4480_g.lkr +share/gputils/lkr/18lf448_g.lkr share/gputils/lkr/18lf44j10_g.lkr share/gputils/lkr/18lf44j11_g.lkr share/gputils/lkr/18lf44j50_g.lkr share/gputils/lkr/18lf44k22_g.lkr +share/gputils/lkr/18lf4510_g.lkr +share/gputils/lkr/18lf4515_g.lkr +share/gputils/lkr/18lf4520_g.lkr +share/gputils/lkr/18lf4523_g.lkr +share/gputils/lkr/18lf4525_g.lkr +share/gputils/lkr/18lf452_g.lkr +share/gputils/lkr/18lf4539_g.lkr +share/gputils/lkr/18lf4550_g.lkr +share/gputils/lkr/18lf4553_g.lkr +share/gputils/lkr/18lf4580_g.lkr +share/gputils/lkr/18lf4585_g.lkr +share/gputils/lkr/18lf458_g.lkr share/gputils/lkr/18lf45j10_g.lkr share/gputils/lkr/18lf45j11_g.lkr share/gputils/lkr/18lf45j50_g.lkr share/gputils/lkr/18lf45k22_g.lkr +share/gputils/lkr/18lf45k40_g.lkr share/gputils/lkr/18lf45k50_g.lkr share/gputils/lkr/18lf45k80_g.lkr +share/gputils/lkr/18lf4610_g.lkr +share/gputils/lkr/18lf4620_g.lkr +share/gputils/lkr/18lf4680_g.lkr +share/gputils/lkr/18lf4682_g.lkr +share/gputils/lkr/18lf4685_g.lkr share/gputils/lkr/18lf46j11_g.lkr share/gputils/lkr/18lf46j13_g.lkr share/gputils/lkr/18lf46j50_g.lkr share/gputils/lkr/18lf46j53_g.lkr share/gputils/lkr/18lf46k22_g.lkr +share/gputils/lkr/18lf46k40_g.lkr share/gputils/lkr/18lf46k80_g.lkr share/gputils/lkr/18lf47j13_g.lkr share/gputils/lkr/18lf47j53_g.lkr +share/gputils/lkr/18lf47k40_g.lkr +share/gputils/lkr/18lf6310_g.lkr +share/gputils/lkr/18lf6390_g.lkr +share/gputils/lkr/18lf6393_g.lkr +share/gputils/lkr/18lf6410_g.lkr +share/gputils/lkr/18lf6490_g.lkr +share/gputils/lkr/18lf6493_g.lkr +share/gputils/lkr/18lf6520_g.lkr +share/gputils/lkr/18lf6525_g.lkr +share/gputils/lkr/18lf6527_g.lkr +share/gputils/lkr/18lf6585_g.lkr share/gputils/lkr/18lf65k80_g.lkr +share/gputils/lkr/18lf6620_g.lkr +share/gputils/lkr/18lf6621_g.lkr +share/gputils/lkr/18lf6622_g.lkr +share/gputils/lkr/18lf6627_g.lkr +share/gputils/lkr/18lf6628_g.lkr +share/gputils/lkr/18lf6680_g.lkr share/gputils/lkr/18lf66k80_g.lkr +share/gputils/lkr/18lf6720_g.lkr +share/gputils/lkr/18lf6722_g.lkr +share/gputils/lkr/18lf6723_g.lkr +share/gputils/lkr/18lf8310_g.lkr +share/gputils/lkr/18lf8390_g.lkr +share/gputils/lkr/18lf8393_g.lkr +share/gputils/lkr/18lf8410_g.lkr +share/gputils/lkr/18lf8490_g.lkr +share/gputils/lkr/18lf8493_g.lkr +share/gputils/lkr/18lf8520_g.lkr +share/gputils/lkr/18lf8525_g.lkr +share/gputils/lkr/18lf8527_g.lkr +share/gputils/lkr/18lf8585_g.lkr +share/gputils/lkr/18lf8620_g.lkr +share/gputils/lkr/18lf8621_g.lkr +share/gputils/lkr/18lf8622_g.lkr +share/gputils/lkr/18lf8627_g.lkr +share/gputils/lkr/18lf8628_g.lkr +share/gputils/lkr/18lf8680_g.lkr +share/gputils/lkr/18lf8720_g.lkr +share/gputils/lkr/18lf8722_g.lkr +share/gputils/lkr/18lf8723_g.lkr share/gputils/lkr/hcs1365_g.lkr share/gputils/lkr/hcs1370_g.lkr share/gputils/lkr/mcv08a_g.lkr diff --git a/devel/gputils/distinfo b/devel/gputils/distinfo index 0647256b045cf..b8c84b8cd4060 100644 --- a/devel/gputils/distinfo +++ b/devel/gputils/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 03:27:30 agc Exp $ +$NetBSD: distinfo,v 1.11 2016/03/15 20:39:52 bouyer Exp $ -SHA1 (gputils-1.4.0-1.tar.gz) = 26593b7237b0c436b4482d1038216b467ec660b7 -RMD160 (gputils-1.4.0-1.tar.gz) = aa400127282a37d8c2ea7164598ebf9fa1e9998a -SHA512 (gputils-1.4.0-1.tar.gz) = 1bf58603905de18f8bd00d07830186aa9a12d86e6938d1c053ce5887aadf446df6c5a7d952df8a3314185aff3ed34862abf6309dc159dba17d66cb3f14aece7b -Size (gputils-1.4.0-1.tar.gz) = 9664124 bytes +SHA1 (gputils-1.4.2-1.tar.gz) = f71ce8419b497ff8fc72aa11344919095726f40e +RMD160 (gputils-1.4.2-1.tar.gz) = 0084c8160f4c2c6fd75db7cbda37aba116e98220 +SHA512 (gputils-1.4.2-1.tar.gz) = dfa469157008b9cac486f353ac9089326d093d7daa7e4b909d018e703963ed09481e76a3afb275ed2d9ca0bf41c53de635bb55ff3dbe0509f48e801986982341 +Size (gputils-1.4.2-1.tar.gz) = 12505612 bytes From 8cd61309fd3ce0fc1494b6e778e39aed7ae19f02 Mon Sep 17 00:00:00 2001 From: bouyer Date: Tue, 15 Mar 2016 20:40:47 +0000 Subject: [PATCH 0220/2457] Updated devel/gputils to 1.4.2.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 478002fb342d3..8f6305836dc40 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1225 2016/03/15 18:49:12 leot Exp $ +$NetBSD: CHANGES-2016,v 1.1226 2016/03/15 20:40:47 bouyer Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1623,3 +1623,4 @@ Changes to the packages collection and infrastructure in 2016: Updated misc/ruby-ohai to 8.12.1 [taca 2016-03-15] Updated www/webkit24-gtk to 2.4.10 [leot 2016-03-15] Updated www/webkit24-gtk3 to 2.4.10 [leot 2016-03-15] + Updated devel/gputils to 1.4.2.1 [bouyer 2016-03-15] From 80d4375b108c9fe4e2b5ef6cc180519924e36c0a Mon Sep 17 00:00:00 2001 From: bsiegert Date: Tue, 15 Mar 2016 20:54:07 +0000 Subject: [PATCH 0221/2457] Update openssh to 7.2.2 (7.2p2). Changes since OpenSSH 7.2p1 =========================== This release fixes a security bug: * sshd(8): sanitise X11 authentication credentials to avoid xauth command injection when X11Forwarding is enabled. Full details of the vulnerability are available at: http://www.openssh.com/txt/x11fwd.adv --- security/openssh/Makefile | 7 ++- security/openssh/PLIST | 4 +- security/openssh/distinfo | 21 ++++---- security/openssh/patches/patch-clientloop.c | 18 +++---- security/openssh/patches/patch-packet.c | 16 ------- security/openssh/patches/patch-readconf.c | 25 ---------- security/openssh/patches/patch-ssh.c | 23 +++------ security/openssh/patches/patch-sshd.c | 53 ++++++++++++--------- 8 files changed, 57 insertions(+), 110 deletions(-) delete mode 100644 security/openssh/patches/patch-packet.c delete mode 100644 security/openssh/patches/patch-readconf.c diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 9a2378d521ce5..351d3932d73d1 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.242 2016/03/05 11:29:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.243 2016/03/15 20:54:07 bsiegert Exp $ -DISTNAME= openssh-7.1p1 -PKGNAME= ${DISTNAME:S/p1/.1/} -PKGREVISION= 4 +DISTNAME= openssh-7.2p2 +PKGNAME= ${DISTNAME:S/p2/.2/} CATEGORIES= security MASTER_SITES= ${MASTER_SITE_OPENBSD:=OpenSSH/portable/} diff --git a/security/openssh/PLIST b/security/openssh/PLIST index ebe150ae24d05..e18d93a97c372 100644 --- a/security/openssh/PLIST +++ b/security/openssh/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.17 2015/08/14 08:57:00 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.18 2016/03/15 20:54:07 bsiegert Exp $ bin/scp bin/sftp -bin/slogin bin/ssh bin/ssh-add bin/ssh-agent @@ -13,7 +12,6 @@ libexec/ssh-pkcs11-helper ${PLIST.prng}libexec/ssh-rand-helper man/man1/scp.1 man/man1/sftp.1 -man/man1/slogin.1 man/man1/ssh-add.1 man/man1/ssh-agent.1 man/man1/ssh-keygen.1 diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 747daee1ff387..a8f162f80e142 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,12 +1,9 @@ -$NetBSD: distinfo,v 1.99 2016/02/26 21:06:38 tez Exp $ +$NetBSD: distinfo,v 1.100 2016/03/15 20:54:07 bsiegert Exp $ -SHA1 (openssh-7.1p1-hpn-20150822.diff.bz2) = 444a2fbd80d57ff93b53ade84ec162e2a2f3aa67 -RMD160 (openssh-7.1p1-hpn-20150822.diff.bz2) = 87fb6887d9ccb4b305ff3c25fd5f67847d9996d1 -Size (openssh-7.1p1-hpn-20150822.diff.bz2) = 12173 bytes -SHA1 (openssh-7.1p1.tar.gz) = ed22af19f962262c493fcc6ed8c8826b2761d9b6 -RMD160 (openssh-7.1p1.tar.gz) = 2c97ea10099fa8658156c0351d60d715655b9b07 -SHA512 (openssh-7.1p1.tar.gz) = f1491ca5a0a733eb27ede966590642a412cb7be7178dcb7b9e5844bbdc8383032f4b00435192b95fc0365b6fe74d6c5ac8d6facbe9d51e1532d049e2f784e8f7 -Size (openssh-7.1p1.tar.gz) = 1493170 bytes +SHA1 (openssh-7.2p2.tar.gz) = 70e35d7d6386fe08abbd823b3a12a3ca44ac6d38 +RMD160 (openssh-7.2p2.tar.gz) = d18d73719ceeefa5116b5b741124f3604d7ddb99 +SHA512 (openssh-7.2p2.tar.gz) = 44f62b3a7bc50a0735d496a5aedeefb71550d8c10ad8f22b94e29fcc8084842db96e8c4ca41fced17af69e1aab09ed1182a12ad8650d9a46fd8743a0344df95b +Size (openssh-7.2p2.tar.gz) = 1499808 bytes SHA1 (patch-Makefile.in) = 98960119bda68a663214c8880484552f1207bcfc SHA1 (patch-auth-passwd.c) = 92c487cc3c092efb56f8b4ac4ca08ccd67803a83 SHA1 (patch-auth-rhosts.c) = a5e6131e63b83a7e8a06cd80f22def449d6bc2c4 @@ -14,7 +11,7 @@ SHA1 (patch-auth.c) = cd13f8b31b45d668c5e09eca098b17ec8a7c1039 SHA1 (patch-auth1.c) = cdac14ffa4008e62926526e66316b0a553435374 SHA1 (patch-auth2.c) = efc1eb6d28cb6ec2bd87723943f3e36c612d93aa SHA1 (patch-channels.c) = edcce67664bbbc30a8d10ed2fe58dcece944726c -SHA1 (patch-clientloop.c) = a99fa9ff36e0068c059ee9daa392d06c01d1761c +SHA1 (patch-clientloop.c) = 9b2db181d964b7720e1dc12724a9b9033f28d0e7 SHA1 (patch-config.h.in) = 7406f10b568d2b8237ee575922ce712658d90d59 SHA1 (patch-configure.ac) = d7ba54f34e03fd204eb1a9804fcae7fd16e285e2 SHA1 (patch-defines.h) = bd8687a9a2857f3b8d15ae94095f27f9344003c4 @@ -23,15 +20,13 @@ SHA1 (patch-loginrec.c) = 28082deb14258fe63cbecad8ac96afc016de439c SHA1 (patch-openbsd-compat_bsd-openpty.c) = eaac72830e36e307c19a7b679e6018ece9aebaac SHA1 (patch-openbsd-compat_openbsd-compat.h) = bedbede16ab2fe918419c994ba15a20167b411b4 SHA1 (patch-openbsd-compat_port-tun.c) = 690dfb1f945d186dd3de5bea70ed8fab86e590ee -SHA1 (patch-packet.c) = d302a0802861287e9a5230bbe2a1018c5dc17d28 SHA1 (patch-platform.c) = f8f211dbc5e596c0f82eb86324d18a84c6151ec5 -SHA1 (patch-readconf.c) = e1663d4d9a7ca8de8f87ba42d7b764923cdcc5db SHA1 (patch-sandbox-darwin.c) = c9a1fe2e4dbf98e929d983b4206a244e0e354b75 SHA1 (patch-scp.c) = 9c2317b0f796641903a826db355ba06595a26ea1 SHA1 (patch-session.c) = 2aa1d95a35b52519c4921494855f861dc1380f3b SHA1 (patch-sftp-common.c) = 6819aa040c8f1caa30a704cf6f0588e498df8778 -SHA1 (patch-ssh.c) = 00897c09b7d3037713c579cbc41301623d4c2ebf +SHA1 (patch-ssh.c) = 6877d8205d999906c14240d4d112b084609927ca SHA1 (patch-sshd.8) = 5bf48cd27cef8e8810b9dc7115f5180102a345d1 -SHA1 (patch-sshd.c) = 85a9f50c8b1bdcc44156e2b457a583ccdbc5821b +SHA1 (patch-sshd.c) = cd23ce269bfb48b0caa901e62fc01d35ef0618ac SHA1 (patch-sshpty.c) = cb691d4fbde808927f2fbcc12b87ad983cf21938 SHA1 (patch-uidswap.c) = 68c4f5ffab7f4c5c9c00b7443a74b2da52809b7e diff --git a/security/openssh/patches/patch-clientloop.c b/security/openssh/patches/patch-clientloop.c index a0937955e63be..e615c28f34a35 100644 --- a/security/openssh/patches/patch-clientloop.c +++ b/security/openssh/patches/patch-clientloop.c @@ -1,12 +1,12 @@ -$NetBSD: patch-clientloop.c,v 1.3 2016/01/18 12:53:26 jperkin Exp $ +$NetBSD: patch-clientloop.c,v 1.4 2016/03/15 20:54:07 bsiegert Exp $ Fix X11 forwarding under Mac OS X Yosemite. Patch taken from MacPorts. https://trac.macports.org/browser/trunk/dports/net/openssh/files/launchd.patch?rev=121205 ---- clientloop.c.orig 2015-08-21 04:49:03.000000000 +0000 +--- clientloop.c.orig 2016-03-09 18:04:48.000000000 +0000 +++ clientloop.c -@@ -315,6 +315,10 @@ client_x11_get_proto(const char *display +@@ -313,6 +313,10 @@ client_x11_get_proto(const char *display struct stat st; u_int now, x11_timeout_real; @@ -14,13 +14,13 @@ Fix X11 forwarding under Mac OS X Yosemite. Patch taken from MacPorts. + int is_path_to_socket = 0; +#endif /* __APPLE__ */ + - xauthdir = xauthfile = NULL; *_proto = proto; *_data = data; -@@ -330,6 +334,33 @@ client_x11_get_proto(const char *display - debug("x11_get_proto: DISPLAY not set"); - return; - } + proto[0] = data[0] = xauthfile[0] = xauthdir[0] = '\0'; +@@ -329,6 +333,33 @@ client_x11_get_proto(const char *display + } + + if (xauth_path != NULL) { +#if __APPLE__ + { + /* @@ -51,7 +51,7 @@ Fix X11 forwarding under Mac OS X Yosemite. Patch taken from MacPorts. /* * Handle FamilyLocal case where $DISPLAY does * not match an authorization entry. For this we -@@ -421,6 +452,9 @@ client_x11_get_proto(const char *display +@@ -438,6 +469,9 @@ client_x11_get_proto(const char *display if (!got_data) { u_int32_t rnd = 0; diff --git a/security/openssh/patches/patch-packet.c b/security/openssh/patches/patch-packet.c deleted file mode 100644 index 2c5f1a455da30..0000000000000 --- a/security/openssh/patches/patch-packet.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-packet.c,v 1.1 2016/02/26 21:06:38 tez Exp $ - -Fix for CVE-2016-1907 -from https://anongit.mindrot.org/openssh.git/commit/?id=2fecfd486bdba9f51b3a789277bb0733ca36e1c0 - - ---- packet.c.orig 2016-02-26 18:42:38.037291000 +0000 -+++ packet.c -@@ -1581,6 +1581,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u - logit("Bad packet length %u.", state->packlen); - if ((r = sshpkt_disconnect(ssh, "Packet corrupt")) != 0) - return r; -+ return SSH_ERR_CONN_CORRUPT; - } - sshbuf_reset(state->incoming_packet); - } else if (state->packlen == 0) { diff --git a/security/openssh/patches/patch-readconf.c b/security/openssh/patches/patch-readconf.c deleted file mode 100644 index 79e5a01cbdfeb..0000000000000 --- a/security/openssh/patches/patch-readconf.c +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-readconf.c,v 1.1 2016/01/18 12:53:26 jperkin Exp $ - -Disable roaming. - ---- readconf.c.orig 2015-08-21 04:49:03.000000000 +0000 -+++ readconf.c -@@ -1660,7 +1660,7 @@ initialize_options(Options * options) - options->tun_remote = -1; - options->local_command = NULL; - options->permit_local_command = -1; -- options->use_roaming = -1; -+ options->use_roaming = 0; - options->visual_host_key = -1; - options->ip_qos_interactive = -1; - options->ip_qos_bulk = -1; -@@ -1833,8 +1833,7 @@ fill_default_options(Options * options) - options->tun_remote = SSH_TUNID_ANY; - if (options->permit_local_command == -1) - options->permit_local_command = 0; -- if (options->use_roaming == -1) -- options->use_roaming = 1; -+ options->use_roaming = 0; - if (options->visual_host_key == -1) - options->visual_host_key = 0; - if (options->ip_qos_interactive == -1) diff --git a/security/openssh/patches/patch-ssh.c b/security/openssh/patches/patch-ssh.c index 32c1235f15bd6..43e615ed32ba8 100644 --- a/security/openssh/patches/patch-ssh.c +++ b/security/openssh/patches/patch-ssh.c @@ -1,26 +1,15 @@ -$NetBSD: patch-ssh.c,v 1.5 2016/01/18 12:53:26 jperkin Exp $ +$NetBSD: patch-ssh.c,v 1.6 2016/03/15 20:54:07 bsiegert Exp $ Interix support -Disable roaming ---- ssh.c.orig 2015-08-21 04:49:03.000000000 +0000 +--- ssh.c.orig 2016-03-09 18:04:48.000000000 +0000 +++ ssh.c -@@ -1084,7 +1084,7 @@ main(int ac, char **av) - "disabling"); - options.update_hostkeys = 0; +@@ -1097,7 +1097,7 @@ main(int ac, char **av) } + if (options.connection_attempts <= 0) + fatal("Invalid number of ConnectionAttempts"); -#ifndef HAVE_CYGWIN -+#if defined(HAVE_CYGWIN) || defined(HAVE_INTERIX) ++#if !defined(HAVE_CYGWIN) && !defined(HAVE_INTERIX) if (original_effective_uid != 0) options.use_privileged_port = 0; #endif -@@ -1932,9 +1932,6 @@ ssh_session2(void) - fork_postauth(); - } - -- if (options.use_roaming) -- request_roaming(); -- - return client_loop(tty_flag, tty_flag ? - options.escape_char : SSH_ESCAPECHAR_NONE, id); - } diff --git a/security/openssh/patches/patch-sshd.c b/security/openssh/patches/patch-sshd.c index 36b0419e34292..d57b45a10c463 100644 --- a/security/openssh/patches/patch-sshd.c +++ b/security/openssh/patches/patch-sshd.c @@ -1,11 +1,11 @@ -$NetBSD: patch-sshd.c,v 1.6 2016/01/18 12:53:26 jperkin Exp $ +$NetBSD: patch-sshd.c,v 1.7 2016/03/15 20:54:07 bsiegert Exp $ * Interix support * Revive tcp_wrappers support. ---- sshd.c.orig 2015-08-21 04:49:03.000000000 +0000 +--- sshd.c.orig 2016-03-09 18:04:48.000000000 +0000 +++ sshd.c -@@ -126,6 +126,13 @@ +@@ -125,6 +125,13 @@ #include "version.h" #include "ssherr.h" @@ -19,7 +19,7 @@ #ifndef O_NOCTTY #define O_NOCTTY 0 #endif -@@ -237,7 +244,11 @@ int *startup_pipes = NULL; +@@ -236,7 +243,11 @@ int *startup_pipes = NULL; int startup_pipe; /* in child */ /* variables used for privilege separation */ @@ -31,34 +31,41 @@ struct monitor *pmonitor = NULL; int privsep_is_preauth = 1; -@@ -644,10 +655,15 @@ privsep_preauth_child(void) - /* XXX not ready, too heavy after chroot */ - do_setusercontext(privsep_pw); - #else +@@ -632,7 +643,7 @@ privsep_preauth_child(void) + demote_sensitive_data(); + + /* Demote the child */ +- if (getuid() == 0 || geteuid() == 0) { ++ if (getuid() == ROOTUID || geteuid() == ROOTUID) { + /* Change our root directory */ + if (chroot(_PATH_PRIVSEP_CHROOT_DIR) == -1) + fatal("chroot(\"%s\"): %s", _PATH_PRIVSEP_CHROOT_DIR, +@@ -643,10 +654,15 @@ privsep_preauth_child(void) + /* Drop our privileges */ + debug3("privsep user:group %u:%u", (u_int)privsep_pw->pw_uid, + (u_int)privsep_pw->pw_gid); +#ifdef HAVE_INTERIX + if (setuser(privsep_pw->pw_name, NULL, SU_COMPLETE)) + fatal("setuser: %.100s", strerror(errno)); +#else - gidset[0] = privsep_pw->pw_gid; - if (setgroups(1, gidset) < 0) - fatal("setgroups: %.100s", strerror(errno)); - permanently_set_uid(privsep_pw); + gidset[0] = privsep_pw->pw_gid; + if (setgroups(1, gidset) < 0) + fatal("setgroups: %.100s", strerror(errno)); + permanently_set_uid(privsep_pw); +#endif /* HAVE_INTERIX */ - #endif + } } -@@ -715,11 +731,18 @@ privsep_preauth(Authctxt *authctxt) +@@ -713,10 +729,17 @@ privsep_preauth(Authctxt *authctxt) + /* Arrange for logging to be sent to the monitor */ set_log_handler(mm_log_handler, pmonitor); - /* Demote the child */ -- if (getuid() == 0 || geteuid() == 0) +#ifdef __APPLE_SANDBOX_NAMED_EXTERNAL__ + /* We need to do this before we chroot() so we can read sshd.sb */ + if (box != NULL) + ssh_sandbox_child(box); +#endif -+ if (getuid() == ROOTUID || geteuid() == ROOTUID) - privsep_preauth_child(); + privsep_preauth_child(); setproctitle("%s", "[net]"); +#ifndef __APPLE_SANDBOX_NAMED_EXTERNAL__ if (box != NULL) @@ -67,7 +74,7 @@ return 0; } -@@ -733,7 +756,7 @@ privsep_postauth(Authctxt *authctxt) +@@ -730,7 +753,7 @@ privsep_postauth(Authctxt *authctxt) #ifdef DISABLE_FD_PASSING if (1) { #else @@ -76,7 +83,7 @@ #endif /* File descriptor passing is broken or root login */ use_privsep = 0; -@@ -1489,8 +1512,10 @@ main(int ac, char **av) +@@ -1497,8 +1520,10 @@ main(int ac, char **av) av = saved_argv; #endif @@ -88,7 +95,7 @@ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ sanitise_stdfd(); -@@ -1919,7 +1944,7 @@ main(int ac, char **av) +@@ -1925,7 +1950,7 @@ main(int ac, char **av) (st.st_uid != getuid () || (st.st_mode & (S_IWGRP|S_IWOTH)) != 0)) #else @@ -97,7 +104,7 @@ #endif fatal("%s must be owned by root and not group or " "world-writable.", _PATH_PRIVSEP_CHROOT_DIR); -@@ -1942,8 +1967,10 @@ main(int ac, char **av) +@@ -1948,8 +1973,10 @@ main(int ac, char **av) * to create a file, and we can't control the code in every * module which might be used). */ @@ -108,7 +115,7 @@ if (rexec_flag) { rexec_argv = xcalloc(rexec_argc + 2, sizeof(char *)); -@@ -2139,6 +2166,25 @@ main(int ac, char **av) +@@ -2145,6 +2172,25 @@ main(int ac, char **av) audit_connection_from(remote_ip, remote_port); #endif From 91d436fefb4a8e0ae5d2a7ffb345376df4aef393 Mon Sep 17 00:00:00 2001 From: bsiegert Date: Tue, 15 Mar 2016 20:54:51 +0000 Subject: [PATCH 0222/2457] openssh update --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 8f6305836dc40..184703a80d872 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1226 2016/03/15 20:40:47 bouyer Exp $ +$NetBSD: CHANGES-2016,v 1.1227 2016/03/15 20:54:51 bsiegert Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1624,3 +1624,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/webkit24-gtk to 2.4.10 [leot 2016-03-15] Updated www/webkit24-gtk3 to 2.4.10 [leot 2016-03-15] Updated devel/gputils to 1.4.2.1 [bouyer 2016-03-15] + Updated security/openssh to 7.2.2 [bsiegert 2016-03-15] From 13d81377a2f830ada1f0d78aad7be8a05d2393d4 Mon Sep 17 00:00:00 2001 From: asau Date: Wed, 16 Mar 2016 00:25:20 +0000 Subject: [PATCH 0223/2457] Updated lang/racket to 6.4 --- doc/CHANGES-2016 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 184703a80d872..3173d0f9584f2 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1227 2016/03/15 20:54:51 bsiegert Exp $ +$NetBSD: CHANGES-2016,v 1.1228 2016/03/16 00:25:20 asau Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1625,3 +1625,5 @@ Changes to the packages collection and infrastructure in 2016: Updated www/webkit24-gtk3 to 2.4.10 [leot 2016-03-15] Updated devel/gputils to 1.4.2.1 [bouyer 2016-03-15] Updated security/openssh to 7.2.2 [bsiegert 2016-03-15] + Updated lang/racket-textual to 6.4 [asau 2016-03-16] + Updated lang/racket to 6.4 [asau 2016-03-16] From 4d0efc00280f7928a66da76cc2da91f170e15f54 Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 16 Mar 2016 04:46:24 +0000 Subject: [PATCH 0224/2457] update to pgadmin3-1.22.0 reset maintainer (ok by joerg@) Recent changes: Date Dev Ver Change details ---------- --- ------ -------------- 2016-01-04 AV 1.22.0 Resolved an issue related to check options selection in the view properties dialog with the check option. [Reported by: Sebastian Albert, Patched by: Neel Patel] 2015-12-08 AV 1.22.0 Merged the libssh2 to the latest version. [Akshay Joshi] 2015-11-19 DP 1.22.0 Properly detect serial columns as such when identifiers have been truncated. 2015-10-23 AV 1.22.0 Fixes an issue related to the column inheritance information properly, when one (or, more) common columns are inherited from multiple tables. [Reported by: Liu Yuanyuan, Patched by: Akshay Joshi] 2015-10-12 AV 1.22.0 Ensure the correct syntax used for moving the objects from one tablespace to another. [Sanket Mehta] 2015-10-07 DP 1.22.0 Ensure the correct line endings are used when copying from the SQL Pane [Nikolai Zhubr] 2015-09-25 AV 1.22.0 Toolbar icons, and menu items for Commit and Rollback actions. [John Obaterspok] 2015-09-24 DP 1.22.0 Display the connection details for the current browser object in the status bar [Adam Scott] 2015-09-21 AV 1.22.0 Fixed an issue related to different menus enabling in the Query Tool on Ubunutu unity. [Reported by: Vahdet Mert] 2015-09-21 AV 1.22.0 Reset the position (x, y) for dialog(s), and frame(s) to 0 (if found negative), while saving its position and size. [Reported By: Mark, Patch: Sanket Mehta, Reworked, and Reviewed: Ashesh] 2015-09-21 AV 1.22.0 Fixes an issue identifying the return type to TABLE in some cases, using pg_get_function_result(..) for the same instead of format_type(..) [Reported By: Guillermo E. Villanueva, PATCH:Sanket Mehta] 2015-09-21 AV 1.22.0 Honour PGPASSFILE environment variable for saving, retrieving the password instead of always works with pgpass.conf (on windows)/.pgpass (on non-windows) [PATCH: Prasad Somwanshi, Reworked by: Sanket Mehta, Reviewed by: Ashesh Vashi, Sanket Mehta] 2015-09-14 AV 1.22.0 Fix a segfault occurs while detecting transaction section requirement, when autocommit has been disabled. [Reported by John Obaterspok, Patch by Sanket Mehta] 2015-09-14 AV 1.22.0 Format execution time in a more readable manner [John Obaterspok] 2015-07-27 AV 1.22.0 Improve sorting in Data editor [J. F. Oster, Reviewed by Sanket Mehta] 2015-07-27 AV 1.22.0 Allow to format the selecte SQL using external tools in Query Editor [J. F. Oster] 2015-05-22 AV 1.22.0 Allow to set auto-commit mode to on/off in the query editor [Sanket Mehta] --- databases/pgadmin3/Makefile | 7 +++---- databases/pgadmin3/PLIST | 5 ++++- databases/pgadmin3/distinfo | 11 +++++------ .../patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp | 14 -------------- 4 files changed, 12 insertions(+), 25 deletions(-) delete mode 100644 databases/pgadmin3/patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile index 59ec3cae7d754..d256d22c66fe1 100644 --- a/databases/pgadmin3/Makefile +++ b/databases/pgadmin3/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.52 2016/03/05 11:28:12 jperkin Exp $ +# $NetBSD: Makefile,v 1.53 2016/03/16 04:46:24 richard Exp $ -DISTNAME= pgadmin3-1.20.0 -PKGREVISION= 1 +DISTNAME= pgadmin3-1.22.0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=pgadmin3/release/v${PKGVERSION_NOREV}/src/} -MAINTAINER= joerg@NetBSD.org +MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.pgadmin.org/ COMMENT= Graphical PostgreSQL client and administration tool LICENSE= postgresql-license diff --git a/databases/pgadmin3/PLIST b/databases/pgadmin3/PLIST index f10ef3a241afd..d37b88f6a9431 100644 --- a/databases/pgadmin3/PLIST +++ b/databases/pgadmin3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2013/10/13 12:06:30 richard Exp $ +@comment $NetBSD: PLIST,v 1.12 2016/03/16 04:46:24 richard Exp $ bin/pgadmin3 share/pgadmin3/branding/branding.ini share/pgadmin3/docs/cs_CZ/hints/autovacuum.html @@ -108,6 +108,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-3.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup-4.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/backup.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/basic.css +${PLIST.doc}share/pgadmin3/docs/en_US/_static/classic.css ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-bright.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment-close.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/comment.png @@ -126,6 +127,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-filter.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/gridopt-sort.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/guru-connect.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery.js +${PLIST.doc}share/pgadmin3/docs/en_US/_static/jquery-1.11.1.js ${PLIST.doc}share/pgadmin3/docs/en_US/_static/locks.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/logfile.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/main.png @@ -191,6 +193,7 @@ ${PLIST.doc}share/pgadmin3/docs/en_US/_static/slony-upgrade.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/status.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/transaction.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore.js +${PLIST.doc}share/pgadmin3/docs/en_US/_static/underscore-1.3.1.js ${PLIST.doc}share/pgadmin3/docs/en_US/_static/up-pressed.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/up.png ${PLIST.doc}share/pgadmin3/docs/en_US/_static/websupport.js diff --git a/databases/pgadmin3/distinfo b/databases/pgadmin3/distinfo index 0f26eda8b39b1..7cd3bda494741 100644 --- a/databases/pgadmin3/distinfo +++ b/databases/pgadmin3/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.14 2016/02/16 03:45:18 dbj Exp $ +$NetBSD: distinfo,v 1.15 2016/03/16 04:46:24 richard Exp $ -SHA1 (pgadmin3-1.20.0.tar.gz) = 70ade343c286ef4413961317d41477b47aac675a -RMD160 (pgadmin3-1.20.0.tar.gz) = 3f2902b68a915d88bc93c10b897f4c163459b03e -SHA512 (pgadmin3-1.20.0.tar.gz) = 83521a16d60bf8c9cffb03e4fb401a31e28f764c31608c0b223f7c88a14a09f665c976f3472debd4ad8b6cd54f0fbd2b8de352c296180e6ea6f8088cb45447bc -Size (pgadmin3-1.20.0.tar.gz) = 14394997 bytes +SHA1 (pgadmin3-1.22.0.tar.gz) = 3091b0bdc5156e54197f157a86240e47af9becc2 +RMD160 (pgadmin3-1.22.0.tar.gz) = 6c5c8c28c0aaa7cd9720a6089fafe770210f002c +SHA512 (pgadmin3-1.22.0.tar.gz) = db16ac1b92e95a6da51be973b6833e53aed4c1d8740c8bccbfd778b0c3d3a4158fb13107761e0a39227aea87360be3b297ebc8809ac8ca5102d673935a33727c +Size (pgadmin3-1.22.0.tar.gz) = 14668096 bytes SHA1 (patch-configure) = 52be492c191e3a249bcbf88075f0f2a2f1a0f76a -SHA1 (patch-pgadmin_ctl_ctlMenuToolbar.cpp) = c3c2ed84d9cd2d06bb1f63af86008c24b2c39d3f diff --git a/databases/pgadmin3/patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp b/databases/pgadmin3/patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp deleted file mode 100644 index b7ec48ce8c72a..0000000000000 --- a/databases/pgadmin3/patches/patch-pgadmin_ctl_ctlMenuToolbar.cpp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-pgadmin_ctl_ctlMenuToolbar.cpp,v 1.1 2015/08/05 15:29:00 richard Exp $ -Resolved an assertion error opening the plugin popup menu -for wxWidgets 3.0 (upstream commit b75c57f69e4799507622b8d2f9820cda2bf154a3) ---- pgadmin/ctl/ctlMenuToolbar.cpp.orig 2014-01-27 12:11:43.000000000 +0000 -+++ pgadmin/ctl/ctlMenuToolbar.cpp -@@ -109,7 +109,7 @@ void ctlMenuButton::DoProcessLeftClick(w - menu_pos.y = button_size.GetHeight(); - } - -- PopupMenu(m_menu, menu_pos); -+ DoPopupMenu(m_menu, menu_pos.x, menu_pos.y); - } - - From 0c941aef8ccce34064003c2ec42838a09033f120 Mon Sep 17 00:00:00 2001 From: richard Date: Wed, 16 Mar 2016 04:47:20 +0000 Subject: [PATCH 0225/2457] update to pgadmin3-1.22.0 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 3173d0f9584f2..fe017dcebdb39 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1228 2016/03/16 00:25:20 asau Exp $ +$NetBSD: CHANGES-2016,v 1.1229 2016/03/16 04:47:20 richard Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1627,3 +1627,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/openssh to 7.2.2 [bsiegert 2016-03-15] Updated lang/racket-textual to 6.4 [asau 2016-03-16] Updated lang/racket to 6.4 [asau 2016-03-16] + Updated databases/pgadmin3 to 1.22.0 [richard 2016-03-16] From 79970432c65e1917419001c131f5b461ef32c44f Mon Sep 17 00:00:00 2001 From: mef Date: Wed, 16 Mar 2016 12:43:22 +0000 Subject: [PATCH 0226/2457] (cad/klayout/Makefile) Update HOMEPAGE --- cad/klayout/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile index 79aa4bcf5a53a..6455a8d8a87ce 100644 --- a/cad/klayout/Makefile +++ b/cad/klayout/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2016/03/15 15:15:59 mef Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/16 12:43:22 mef Exp $ DISTNAME= klayout-0.24.5 CATEGORIES= cad MASTER_SITES= http://www.klayout.org/downloads/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.klayout.org/downloads/ +HOMEPAGE= http://www.klayout.de/ COMMENT= Simple GDS and OASIS file viewer and Editor LICENSE= gnu-gpl-v2 From e4c6dbdb76fa0a4fd55052f560ab2593ee09aed0 Mon Sep 17 00:00:00 2001 From: taca Date: Wed, 16 Mar 2016 13:00:57 +0000 Subject: [PATCH 0227/2457] Update ruby-tzinfo-data to 1.2016.2. * Add a CONTRIBUTING.md file. * Allow any characters to be used in alternate style formats. * Update to tzdata version 2016b. --- time/ruby-tzinfo-data/Makefile | 4 ++-- time/ruby-tzinfo-data/PLIST | 6 +++++- time/ruby-tzinfo-data/distinfo | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/time/ruby-tzinfo-data/Makefile b/time/ruby-tzinfo-data/Makefile index 05003f9219a5b..ef214ee60254f 100644 --- a/time/ruby-tzinfo-data/Makefile +++ b/time/ruby-tzinfo-data/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2016/02/17 14:58:19 taca Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/16 13:00:57 taca Exp $ -DISTNAME= tzinfo-data-1.2016.1 +DISTNAME= tzinfo-data-1.2016.2 CATEGORIES= time MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/time/ruby-tzinfo-data/PLIST b/time/ruby-tzinfo-data/PLIST index cf0d5d13175f8..091235779bfba 100644 --- a/time/ruby-tzinfo-data/PLIST +++ b/time/ruby-tzinfo-data/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1 2016/01/03 10:02:48 taca Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/16 13:00:57 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.yardopts +${GEM_LIBDIR}/CONTRIBUTING.md ${GEM_LIBDIR}/LICENSE ${GEM_LIBDIR}/README.md ${GEM_LIBDIR}/lib/tzinfo/data.rb @@ -248,6 +249,7 @@ ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Asia/Baghdad.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Asia/Bahrain.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Asia/Baku.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Asia/Bangkok.rb +${GEM_LIBDIR}/lib/tzinfo/data/definitions/Asia/Barnaul.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Asia/Beirut.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Asia/Bishkek.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Asia/Brunei.rb @@ -424,6 +426,7 @@ ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Etc/Universal.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Etc/Zulu.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Amsterdam.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Andorra.rb +${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Astrakhan.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Athens.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Belfast.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Belgrade.rb @@ -471,6 +474,7 @@ ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Stockholm.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Tallinn.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Tirane.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Tiraspol.rb +${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Ulyanovsk.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Uzhgorod.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Vaduz.rb ${GEM_LIBDIR}/lib/tzinfo/data/definitions/Europe/Vatican.rb diff --git a/time/ruby-tzinfo-data/distinfo b/time/ruby-tzinfo-data/distinfo index 9ec5f67cf46ea..7cdf4bb757654 100644 --- a/time/ruby-tzinfo-data/distinfo +++ b/time/ruby-tzinfo-data/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2016/02/17 14:58:19 taca Exp $ +$NetBSD: distinfo,v 1.3 2016/03/16 13:00:57 taca Exp $ -SHA1 (tzinfo-data-1.2016.1.gem) = e344ca7c35ed6016dfb657ebd5dad950acde7e8d -RMD160 (tzinfo-data-1.2016.1.gem) = 3c78db126aeaa29b34a08de3c86ef28736fa9a3f -SHA512 (tzinfo-data-1.2016.1.gem) = 4a036b474dfd4c8843ad653faf026cb629bd5cdad788d9fb8698443e7a1c0cb8b75ee4d41929622095d00b07a5280006c2fd86280b713b4b0aec0d6c32f95a26 -Size (tzinfo-data-1.2016.1.gem) = 311296 bytes +SHA1 (tzinfo-data-1.2016.2.gem) = daddc9a9ea8778ec4d7702ffeba5353fe72719f8 +RMD160 (tzinfo-data-1.2016.2.gem) = d65f39e4b7d576520f325aab6bf79a84d58ee76e +SHA512 (tzinfo-data-1.2016.2.gem) = 8fd8e1cdde640474fac9e9862d18f6f8cea20b0ac933f2af9fea513faeb83acc1e55b93b4f37aece2278ff0ee31551a1342c287652045efb910d47e2a22fa3cd +Size (tzinfo-data-1.2016.2.gem) = 312320 bytes From 158fd7acd453545de1aaf670ec64d8116f3da6de Mon Sep 17 00:00:00 2001 From: taca Date: Wed, 16 Mar 2016 13:01:39 +0000 Subject: [PATCH 0228/2457] Updated time/ruby-tzinfo-data to 1.2016.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index fe017dcebdb39..1f0d2adac6ec3 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1229 2016/03/16 04:47:20 richard Exp $ +$NetBSD: CHANGES-2016,v 1.1230 2016/03/16 13:01:39 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1628,3 +1628,4 @@ Changes to the packages collection and infrastructure in 2016: Updated lang/racket-textual to 6.4 [asau 2016-03-16] Updated lang/racket to 6.4 [asau 2016-03-16] Updated databases/pgadmin3 to 1.22.0 [richard 2016-03-16] + Updated time/ruby-tzinfo-data to 1.2016.2 [taca 2016-03-16] From ff993031acd92b817a25a352f5d492a1f247375d Mon Sep 17 00:00:00 2001 From: taca Date: Wed, 16 Mar 2016 13:04:18 +0000 Subject: [PATCH 0229/2457] Update ruby-eventmachine to 1.2.0.1. ## 1.2.0.1 (March 15, 2016) * Fix crash when accepting IPv6 connections due to struct sockaddr_in [#698, #699] --- devel/ruby-eventmachine/Makefile | 4 ++-- devel/ruby-eventmachine/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devel/ruby-eventmachine/Makefile b/devel/ruby-eventmachine/Makefile index a0bfe1593d277..d628cccdb427e 100644 --- a/devel/ruby-eventmachine/Makefile +++ b/devel/ruby-eventmachine/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2016/03/15 17:07:03 taca Exp $ +# $NetBSD: Makefile,v 1.20 2016/03/16 13:04:18 taca Exp $ -DISTNAME= eventmachine-1.2.0 +DISTNAME= eventmachine-1.2.0.1 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/ruby-eventmachine/distinfo b/devel/ruby-eventmachine/distinfo index dc3a651907b14..f1e6e510127be 100644 --- a/devel/ruby-eventmachine/distinfo +++ b/devel/ruby-eventmachine/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.15 2016/03/15 17:07:03 taca Exp $ +$NetBSD: distinfo,v 1.16 2016/03/16 13:04:18 taca Exp $ -SHA1 (eventmachine-1.2.0.gem) = 66dac1bde48b857e23888a487fbbe452ebfd87b5 -RMD160 (eventmachine-1.2.0.gem) = 7116fd31d2c70274f6938868d5485d6a64d4a57c -SHA512 (eventmachine-1.2.0.gem) = a6c55ccb86bc38a6c314e7d143ffedcb273ed7b54f3d7481bf9bec7fe190a0446a88947b32971c021f577ee0a5aed9083c7e0955b30987415f41b8d5ab83a1b8 -Size (eventmachine-1.2.0.gem) = 241152 bytes +SHA1 (eventmachine-1.2.0.1.gem) = 60b6f1d8391cd374c6a2ef3977cb1397ed89055a +RMD160 (eventmachine-1.2.0.1.gem) = 9068f407ecd9946fbd5839891ad80e9fa15ad5ce +SHA512 (eventmachine-1.2.0.1.gem) = a861a2c5172b7cf2720bdb54f52ea96c311c10efdb2f54970054901674e044a72307a5b32210efbbdb78d0472a9b3fb6e898640e1c0b406bdad8b581970e30aa +Size (eventmachine-1.2.0.1.gem) = 241152 bytes From dc5167e5035f7c2fb5f945282d2b7f974ec7aca1 Mon Sep 17 00:00:00 2001 From: taca Date: Wed, 16 Mar 2016 13:04:49 +0000 Subject: [PATCH 0230/2457] Note update of devel/ruby-eventmachine package to 1.2.0.1. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 1f0d2adac6ec3..9dc549e079e16 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1230 2016/03/16 13:01:39 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1231 2016/03/16 13:04:49 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1629,3 +1629,4 @@ Changes to the packages collection and infrastructure in 2016: Updated lang/racket to 6.4 [asau 2016-03-16] Updated databases/pgadmin3 to 1.22.0 [richard 2016-03-16] Updated time/ruby-tzinfo-data to 1.2016.2 [taca 2016-03-16] + Updated devel/ruby-eventmachine to 1.2.0.1 [taca 2016-03-16] From 9e1b7f2b359ef8c2a726c5f21abaa98051c17dbd Mon Sep 17 00:00:00 2001 From: taca Date: Wed, 16 Mar 2016 13:07:31 +0000 Subject: [PATCH 0231/2457] Update ruby-curses-gem to 1.0.2. ### 1.0.2 / 2016-03-15 Bug fixes: * Fix ncursesw support. Pull request #16 by peter50216, patch by eTM. Issue #6 by Jean Lazarou. --- devel/ruby-curses-gem/Makefile | 5 ++--- devel/ruby-curses-gem/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/devel/ruby-curses-gem/Makefile b/devel/ruby-curses-gem/Makefile index 942a1e4ef5249..1edd320f7311b 100644 --- a/devel/ruby-curses-gem/Makefile +++ b/devel/ruby-curses-gem/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2015/12/30 15:49:10 taca Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/16 13:07:31 taca Exp $ -DISTNAME= curses-1.0.1 -PKGREVISION= 1 +DISTNAME= curses-1.0.2 CATEGORIES= devel MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/devel/ruby-curses-gem/distinfo b/devel/ruby-curses-gem/distinfo index 1b60d167e4c28..f2b274e71c11f 100644 --- a/devel/ruby-curses-gem/distinfo +++ b/devel/ruby-curses-gem/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 03:29:21 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/03/16 13:07:31 taca Exp $ -SHA1 (curses-1.0.1.gem) = 7bd16b9f7198e73cea7ec74c228c09d247bb9ac8 -RMD160 (curses-1.0.1.gem) = a1d946a1ca0a718f63af8ed52846749ea77f40dc -SHA512 (curses-1.0.1.gem) = bc28a57046740e74b26f986c83a398d4f8bd96476658b14c226b94086beffb56d0f6a7a6fb21747bb3f81a8b6c9cd027ae0870468a32fddcf58143d940c94a79 -Size (curses-1.0.1.gem) = 34304 bytes +SHA1 (curses-1.0.2.gem) = 27f6cd667a0384724ff5d6b1f99b69886266fbb6 +RMD160 (curses-1.0.2.gem) = 8ca5382b4054679c0fd01ebf79740126c8a2ca98 +SHA512 (curses-1.0.2.gem) = 5c448359106604ccf99d804bf3f2a6c3e62c23fc9e5926198cfdb83f5a108445cd780f1a7cba76a9929cee499d2c9e8ed1a14bcd9b72f9bf2dfde94c685f625d +Size (curses-1.0.2.gem) = 34304 bytes From 4e3412c2c2772d26d229b6d24bee51ae7cf21ec1 Mon Sep 17 00:00:00 2001 From: taca Date: Wed, 16 Mar 2016 13:08:00 +0000 Subject: [PATCH 0232/2457] Note update of devel/ruby-curses-gem package to 1.0.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 9dc549e079e16..05252206e8421 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1231 2016/03/16 13:04:49 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1232 2016/03/16 13:08:00 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1630,3 +1630,4 @@ Changes to the packages collection and infrastructure in 2016: Updated databases/pgadmin3 to 1.22.0 [richard 2016-03-16] Updated time/ruby-tzinfo-data to 1.2016.2 [taca 2016-03-16] Updated devel/ruby-eventmachine to 1.2.0.1 [taca 2016-03-16] + Updated devel/ruby-curses-gem to 1.0.2 [taca 2016-03-16] From 77cb73e5b28cc4719dd86224e1679892e39da664 Mon Sep 17 00:00:00 2001 From: taca Date: Wed, 16 Mar 2016 13:36:52 +0000 Subject: [PATCH 0233/2457] Prefix PKGNAME with PHP_PKG_PREFIX. --- mail/roundcube/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile index 85bd5d2ed3720..5b02a2a824c66 100644 --- a/mail/roundcube/Makefile +++ b/mail/roundcube/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.79 2015/12/30 14:34:42 taca Exp $ +# $NetBSD: Makefile,v 1.80 2016/03/16 13:36:52 taca Exp $ DISTNAME= roundcubemail-1.1.4 -PKGNAME= ${DISTNAME:S/mail-/-/} +PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME:S/mail-/-/} CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=roundcubemail/} From f731fb950c7b0c29fd842160d9b6f07bfc1c1ebe Mon Sep 17 00:00:00 2001 From: mef Date: Wed, 16 Mar 2016 14:22:01 +0000 Subject: [PATCH 0234/2457] Update 2.1.3 to 2.2.1 (tested both with wxGTK28 and wxGTK30) ----------------------------------------------------------------- Following is not for explicit 2.2.1 release but for 2.2, (attached to mail from Rick Murphy on 2015/12/31 as Subject: TrustedQSL 2.2 final release is available for download) ----------------------------------------------------------------- Trusted QSL V2.2 Release Notes This version of Trusted QSL (TQSL) has corrections for defects found since TQSL 2.1 was released (including the updates made for TQSL 2.1.1, 2.1.2, and 2.1.3) as well as improvements to permit TQSL and Logbook of the World to support the National Parks on the Air competition. TQSL 2.2 can be installed to upgrade any older version of TQSL. Downgrade to TQSL 2.1.3 can be seamlessly performed by uninstalling TQSL 2.2 and reinstalling TQSL 2.1.3. On all three supported platforms (Windows, MacOS, and Linux), installing TQSL 2.2 will replace older versions of Trusted QSL while preserving your Callsign Certificates, Station Locations, and preferences. On Windows, simply run the TQSL 2.2 installer, which will automatically uninstall older versions of TQSL (and, if installed, TQSLCert). On Mac OS X, open the disk image (.dmg) file and drag the "Trusted QSL" folder to your Applications folder. Direct the installer to "Replace All", which will uninstall old files. For Linux systems, unpack the tar file and read the INSTALL file for directions. The following list describes the major changes in the v2.2 release of Trusted QSL. TQSL changes Defects Corrected: Fix a defect that could cause saving of Calllsign Certificate private keys to be suppressed. When renewing a Callsign Certificate, entering an invalid password would display an incorrect "Invalid Argument" error versus displaying the proper "Invalid password" error. Under some circumstances, this could cause the related Callsign Certificate to be lost. Accept C7 and 4Y as valid callsign prefixes. When installing a Callsign Certificate fails, display the callsign and serial number to facilitate troubleshooting. When deleting Callsign Certificates and Station Locations, save a copy to allow those to be restored. Reject QSOs that do not specify at least mode, band, date, and time. Correct the TQSL ADIF editor to not use the local decimal point separator for frequencies, as ADIF requires a period(.). Major feature Additions: Use Portuguese (Portugal) translations contributed by Nuno, CT2IRY. Allow multiple dependent fields on a station location screen. This allows both a county and a park entry to be modified when the US state changes for a US Station Location. --- ham/trustedQSL/Makefile | 7 +-- ham/trustedQSL/PLIST | 5 +- ham/trustedQSL/distinfo | 14 ++--- .../patches/patch-apps_CMakeLists.txt | 18 ++---- ham/trustedQSL/patches/patch-apps_tqsl_cpp | 62 +++++++++++++------ 5 files changed, 60 insertions(+), 46 deletions(-) diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile index 962de91e77cdd..43ef9bfd67151 100644 --- a/ham/trustedQSL/Makefile +++ b/ham/trustedQSL/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2016/03/05 11:28:42 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2016/03/16 14:22:01 mef Exp $ -DISTNAME= tqsl-2.1.3 -PKGREVISION= 1 +DISTNAME= tqsl-2.2.1 CATEGORIES= ham MASTER_SITES= http://sourceforge.net/projects/trustedqsl/files/TrustedQSL/v${PKGVERSION_NOREV}/ @@ -40,7 +39,7 @@ post-install: ${INSTALL_DATA} LICENSE.txt ${DESTDIR}${PREFIX}/share/TrustedQSL/ \ ) # Conflicting PLIST with wxGTK28-2.8.12nb8: - ${RM} ${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/wxstd.mo + ${RM} -f ${DESTDIR}${PREFIX}/share/locale/*/LC_MESSAGES/wxstd.mo .include "../../textproc/expat/buildlink3.mk" .include "../../databases/db5/buildlink3.mk" diff --git a/ham/trustedQSL/PLIST b/ham/trustedQSL/PLIST index c40957fc14d2f..86e3e5062b1d5 100644 --- a/ham/trustedQSL/PLIST +++ b/ham/trustedQSL/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2015/10/11 02:59:07 mef Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/03/16 14:22:01 mef Exp $ bin/tqsl include/adif.h include/cabrillo.h @@ -12,6 +12,8 @@ share/TrustedQSL/config.xml share/TrustedQSL/help/tqslapp/CertProp.bmp share/TrustedQSL/help/tqslapp/EnterPassword.bmp share/TrustedQSL/help/tqslapp/LoTWCerts.bmp +share/TrustedQSL/help/tqslapp/MainNoStatusTab.bmp +share/TrustedQSL/help/tqslapp/MainWithStatusTab.bmp share/TrustedQSL/help/tqslapp/P12.bmp share/TrustedQSL/help/tqslapp/Pending.bmp share/TrustedQSL/help/tqslapp/RenewUpload.bmp @@ -109,6 +111,7 @@ share/TrustedQSL/help/tqslapp/stnloc1.bmp share/TrustedQSL/help/tqslapp/stnloc1.htm share/TrustedQSL/help/tqslapp/stnloc2.bmp share/TrustedQSL/help/tqslapp/stnloc2.htm +share/TrustedQSL/help/tqslapp/stnloc2park.bmp share/TrustedQSL/help/tqslapp/stnloc3.bmp share/TrustedQSL/help/tqslapp/stnloc4.bmp share/TrustedQSL/help/tqslapp/stnloc5.bmp diff --git a/ham/trustedQSL/distinfo b/ham/trustedQSL/distinfo index 4a9c62037b7af..af3b84fb6c4f5 100644 --- a/ham/trustedQSL/distinfo +++ b/ham/trustedQSL/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.13 2015/12/13 02:56:23 mef Exp $ +$NetBSD: distinfo,v 1.14 2016/03/16 14:22:01 mef Exp $ -SHA1 (tqsl-2.1.3.tar.gz) = 2297c3dc6384dde9db58d2e40d866f8383a703b0 -RMD160 (tqsl-2.1.3.tar.gz) = 526fed3b655facf685c92f90575d43d9d905f63d -SHA512 (tqsl-2.1.3.tar.gz) = 76c83f11aca6425b78399dec1a9617ed10ac150892a28392f25ddc04cc1c6441935522c1c7a267b60a0c167aad32d154ee0c9dee097d83950984029cd11fa4a5 -Size (tqsl-2.1.3.tar.gz) = 3443675 bytes -SHA1 (patch-apps_CMakeLists.txt) = e685f6dba817c783dfe18796b714785923c42982 -SHA1 (patch-apps_tqsl_cpp) = 6ef2ba4a5cae2cb35efd80493e8f11c475d54047 +SHA1 (tqsl-2.2.1.tar.gz) = c0bcfc9a7e5a9e53fd9c5e3debb98d1f3b8fb309 +RMD160 (tqsl-2.2.1.tar.gz) = 7e2b3f01564e48cfbee48c9e380382bba888b69e +SHA512 (tqsl-2.2.1.tar.gz) = 8aa2577f449b20ce0f53cb7725b246ac79e5581ec9694f1189b3469883087b33d9e6262da862e537f63cdf751a77625302a06deedb70b798680aea496c7b3947 +Size (tqsl-2.2.1.tar.gz) = 3782449 bytes +SHA1 (patch-apps_CMakeLists.txt) = e2a44d076c2e2804a45d8fc98937543105fb4d0f +SHA1 (patch-apps_tqsl_cpp) = a21e3264051feb8230af7e031688ba98f51db1df SHA1 (patch-openssl__cert.cpp) = 158c7086014f9cef05835beb1fb9aa52f091343f SHA1 (patch-src_tqslconvert_cpp) = 212530497270d7354d2081f2a985e266e8569896 diff --git a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt index ec5b162b0c402..8128ec0298a28 100644 --- a/ham/trustedQSL/patches/patch-apps_CMakeLists.txt +++ b/ham/trustedQSL/patches/patch-apps_CMakeLists.txt @@ -1,11 +1,10 @@ -$NetBSD: patch-apps_CMakeLists.txt,v 1.4 2015/10/11 02:59:07 mef Exp $ +$NetBSD: patch-apps_CMakeLists.txt,v 1.5 2016/03/16 14:22:01 mef Exp $ (1) Avoid ${WRKSRC} included in RPATH. -(2) WARN: PLIST:105: Man pages should be installed into man/, not share/man/. ---- apps/CMakeLists.txt.orig 2015-09-20 09:15:24.000000000 +0900 -+++ apps/CMakeLists.txt 2015-10-11 00:57:52.000000000 +0900 -@@ -120,8 +120,8 @@ if(APPLE) +--- apps/CMakeLists.txt.orig 2016-03-12 14:49:01.000000000 +0900 ++++ apps/CMakeLists.txt 2016-03-16 21:42:51.000000000 +0900 +@@ -120,8 +120,8 @@ endif() if(NOT WIN32) #rpath setup @@ -16,12 +15,3 @@ $NetBSD: patch-apps_CMakeLists.txt,v 1.4 2015/10/11 02:59:07 mef Exp $ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") endif() -@@ -148,7 +148,7 @@ if(NOT APPLE AND NOT WIN32) - add_definitions("-DCONFDIR=\"${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/\"") - install(TARGETS tqsl DESTINATION bin) - install(DIRECTORY help DESTINATION share/TrustedQSL) -- install(FILES tqsl.5 DESTINATION share/man/man5) -+ install(FILES tqsl.5 DESTINATION man/man5) - install(FILES icons/key48.png DESTINATION share/pixmaps RENAME TrustedQSL.png) - install(FILES lang/de/tqslapp.mo DESTINATION share/locale/de/LC_MESSAGES) - install(FILES lang/de/wxstd.mo DESTINATION share/locale/de/LC_MESSAGES) diff --git a/ham/trustedQSL/patches/patch-apps_tqsl_cpp b/ham/trustedQSL/patches/patch-apps_tqsl_cpp index 98e3f04ec9c36..35261049d89cd 100644 --- a/ham/trustedQSL/patches/patch-apps_tqsl_cpp +++ b/ham/trustedQSL/patches/patch-apps_tqsl_cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-apps_tqsl_cpp,v 1.4 2015/11/22 09:52:55 mef Exp $ +$NetBSD: patch-apps_tqsl_cpp,v 1.5 2016/03/16 14:22:01 mef Exp $ (1) Avoid following error (interim, only valid with db5) @@ -12,8 +12,11 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi (3) Trial code for wxGTK30 ---- apps/tqsl.cpp.orig 2015-09-20 09:15:24.000000000 +0900 -+++ apps/tqsl.cpp 2015-11-17 23:08:20.000000000 +0900 +(4) Avoid error with wxGTK30 + error: cannot pass objects of non-trivially-copyable type 'class wxCStrData' through '...' + +--- apps/tqsl.cpp.orig 2016-03-12 14:49:01.000000000 +0900 ++++ apps/tqsl.cpp 2016-03-16 22:49:15.000000000 +0900 @@ -64,7 +64,7 @@ #endif #include @@ -23,30 +26,49 @@ tqsl-2.0.1/apps/tqsl.cpp:2967:10: error: #pragma GCC diagnostic not allowed insi #include #include -@@ -3428,7 +3428,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven +@@ -3145,7 +3145,7 @@ void MyFrame::UpdateConfigFile() { + FILE *configFile = fopen(filename.ToUTF8(), "wb"); + #endif + if (!configFile) { +- tqslTrace("UpdateConfigFile", "Can't open new file %s: %hs", filename.c_str(), strerror(errno)); ++ tqslTrace("UpdateConfigFile", "Can't open new file %s: %hs", ((const wxChar*) filename), strerror(errno)); + wxMessageBox(wxString::Format(_("Can't open new configuration file %s: %hs"), filename.c_str(), strerror(errno)), _("Error"), wxOK | wxICON_ERROR, this); + return; + } +@@ -3153,15 +3153,15 @@ void MyFrame::UpdateConfigFile() { + while (left > 0) { + size_t written = fwrite(newconfig, 1, left, configFile); + if (written == 0) { +- tqslTrace("UpdateConfigFile", "Can't write new file %s: %hs", filename.c_str(), strerror(errno)); +- wxMessageBox(wxString::Format(_("Can't write new configuration file %s: %hs"), filename.c_str(), strerror(errno)), _("Error"), wxOK | wxICON_ERROR, this); ++ tqslTrace("UpdateConfigFile", "Can't write new file %s: %hs", ((const wxChar*) filename), strerror(errno)); ++ wxMessageBox(wxString::Format(_("Can't write new configuration file %s: %hs"), ((const wxChar*) filename), strerror(errno)), _("Error"), wxOK | wxICON_ERROR, this); + if (configFile) fclose(configFile); + return; + } + left -= written; + } + if (fclose(configFile)) { +- tqslTrace("UpdateConfigFile", "Error writing new file %s: %hs", filename.c_str(), strerror(errno)); ++ tqslTrace("UpdateConfigFile", "Error writing new file %s: %hs", ((const wxChar*) filename), strerror(errno)); + wxMessageBox(wxString::Format(_("Error writing new configuration file %s: %hs"), filename.c_str(), strerror(errno)), _("Error"), wxOK | wxICON_ERROR, this); + return; + } +@@ -3489,7 +3489,7 @@ MyFrame::OnUpdateCheckDone(wxCommandEven // The macro for declaring a hash map defines a couple of typedefs // that it never uses. Current GCC warns about those. The pragma // below suppresses those warnings for those. --#if !defined(__APPLE__) && !defined(_WIN32) -+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__) +-#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__clang__) ++#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__clang__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__) #pragma GCC diagnostic ignored "-Wunused-local-typedefs" #endif void -@@ -3632,7 +3632,7 @@ MyFrame::DoCheckForUpdates(bool silent, - DoCheckExpiringCerts(noGUI); - return; - } --#if !defined(__APPLE__) && !defined(_WIN32) -+#if !defined(__APPLE__) && !defined(_WIN32) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__FreeBSD__) - #pragma GCC diagnostic warning "-Wunused-local-typedefs" - #endif - -@@ -4676,7 +4676,11 @@ QSLApp::OnInit() { - for (int i = 1; i < argc; i++) { - origCommandLine += wxT(" "); - origCommandLine += argv[i]; +@@ -4770,7 +4770,11 @@ QSLApp::OnInit() { + // Well, if it's a pointer and it might be null but it's also not a pointer + // and can't be null, then it's not possible to compile this without warning. + // Warnings ahoy! +#if defined (wxABI_VERSION) && (wxABI_VERSION < 30000 ) - if (argv[i] && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/'))) + if (argv[i][0] == wxT('-') || argv[i][0] == wxT('/')) +#else + if (!argv[i].empty() && (argv[i][0] == wxT('-') || argv[i][0] == wxT('/'))) +#endif From 091115aaa6b2e943fe6560d06e37383db06a99a1 Mon Sep 17 00:00:00 2001 From: mef Date: Wed, 16 Mar 2016 14:22:56 +0000 Subject: [PATCH 0235/2457] Updated ham/trustedQSL to 2.2.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 05252206e8421..d863a6135cc2b 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1232 2016/03/16 13:08:00 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1233 2016/03/16 14:22:56 mef Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1631,3 +1631,4 @@ Changes to the packages collection and infrastructure in 2016: Updated time/ruby-tzinfo-data to 1.2016.2 [taca 2016-03-16] Updated devel/ruby-eventmachine to 1.2.0.1 [taca 2016-03-16] Updated devel/ruby-curses-gem to 1.0.2 [taca 2016-03-16] + Updated ham/trustedQSL to 2.2.1 [mef 2016-03-16] From 16a2931ebd7d88091dcf0bb78a9dccada982e875 Mon Sep 17 00:00:00 2001 From: Aleksej Lebedev Date: Wed, 16 Mar 2016 15:27:06 +0100 Subject: [PATCH 0236/2457] Added geography/mapcode --- geography/mapcode/DESCR | 4 ++++ geography/mapcode/Makefile | 30 ++++++++++++++++++++++++++++++ geography/mapcode/PLIST | 4 ++++ geography/mapcode/distinfo | 6 ++++++ 4 files changed, 44 insertions(+) create mode 100644 geography/mapcode/DESCR create mode 100644 geography/mapcode/Makefile create mode 100644 geography/mapcode/PLIST create mode 100644 geography/mapcode/distinfo diff --git a/geography/mapcode/DESCR b/geography/mapcode/DESCR new file mode 100644 index 0000000000000..761e82eaabab2 --- /dev/null +++ b/geography/mapcode/DESCR @@ -0,0 +1,4 @@ +A mapcode represents a location. Every location on Earth can be represented +by a mapcode. Mapcodes were designed to be short, easy to recognise, remember +and communicate. They are precise to a few meters, which is good enough for +every-day use. diff --git a/geography/mapcode/Makefile b/geography/mapcode/Makefile new file mode 100644 index 0000000000000..1891669718704 --- /dev/null +++ b/geography/mapcode/Makefile @@ -0,0 +1,30 @@ +# $NetBSD$ + +VERSION= 2.2.1 +GITHUB_PROJECT= mapcode-cpp +DISTNAME= v${VERSION} +PKGNAME= mapcode-${VERSION} +CATEGORIES= geography +MASTER_SITES= ${MASTER_SITE_GITHUB:=mapcode-foundation/} +DIST_SUBDIR= ${GITHUB_PROJECT} + +MAINTAINER= root@zta.lk +HOMEPAGE= http://www.mapcode.com/ +COMMENT= Utility to convert mapcodes to lon:lat and back +LICENSE= apache-2.0 + +WRKSRC= ${WRKDIR}/mapcode-cpp-2.2.1 +USE_LANGUAGES= c c++ + +INSTALLATION_DIRS=bin lib include + +do-build: + cd ${WRKSRC}/mapcodelib && ${SETENV} ${MAKE_ENV} ${CC} -fPIC -shared mapcoder.c -o libmapcode.so + cd ${WRKSRC}/utility && ${SETENV} ${MAKE_ENV} ${CXX} mapcode.cpp -o mapcode + +do-install: + ${INSTALL_DATA} ${WRKSRC}/mapcodelib/mapcoder.h ${DESTDIR}/${PREFIX}/include/mapcode.h + ${INSTALL_LIB} ${WRKSRC}/mapcodelib/libmapcode.so ${DESTDIR}/${PREFIX}/lib + ${INSTALL_PROGRAM} ${WRKSRC}/utility/mapcode ${DESTDIR}/${PREFIX}/bin + +.include "../../mk/bsd.pkg.mk" diff --git a/geography/mapcode/PLIST b/geography/mapcode/PLIST new file mode 100644 index 0000000000000..afa45e48cbb1d --- /dev/null +++ b/geography/mapcode/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD$ +bin/mapcode +include/mapcode.h +lib/libmapcode.so diff --git a/geography/mapcode/distinfo b/geography/mapcode/distinfo new file mode 100644 index 0000000000000..0cb83b8248de3 --- /dev/null +++ b/geography/mapcode/distinfo @@ -0,0 +1,6 @@ +$NetBSD$ + +SHA1 (mapcode-cpp/v2.2.1.tar.gz) = 7665b61e95ef5fffb04d5329d69108d862fe7ffa +RMD160 (mapcode-cpp/v2.2.1.tar.gz) = 670ad9dbd3ef3f21c477ebf11187b2f7fb3a780b +SHA512 (mapcode-cpp/v2.2.1.tar.gz) = 7bccdf9d74817551108ed7ac459fb730b548f5c40a0388b54619c415b8b6896546f02fae9325c18cbdfdc346216e55b46a0a4afb665df80702bd446897370ecd +Size (mapcode-cpp/v2.2.1.tar.gz) = 624990 bytes From e07cbf3679cd4ffc1e427789757525eb7338a260 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Wed, 16 Mar 2016 15:15:18 +0000 Subject: [PATCH 0237/2457] Set OVERRIDE_GEMSPEC to allow using the latest hashie gem. It looks there is no particular compat issue at least on ruby-tw package. Bump PKGREVISION. --- net/ruby-userstream/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/ruby-userstream/Makefile b/net/ruby-userstream/Makefile index b78ef705f1f32..e5fe523511a6c 100644 --- a/net/ruby-userstream/Makefile +++ b/net/ruby-userstream/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2015/09/27 04:11:36 taca Exp $ +# $NetBSD: Makefile,v 1.7 2016/03/16 15:15:18 tsutsui Exp $ DISTNAME= userstream-1.4.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= net MAINTAINER= tsutsui@NetBSD.org @@ -9,10 +9,11 @@ HOMEPAGE= https://github.com/mitukiii/userstream COMMENT= Simple twitter userstream library LICENSE= mit -DEPENDS+= ${RUBY_PKGPREFIX}-hashie1>=1.2.0<2.0.0:../../misc/ruby-hashie1 +DEPENDS+= ${RUBY_PKGPREFIX}-hashie>=1.2.0:../../misc/ruby-hashie DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.4.7:../../security/ruby-oauth DEPENDS+= ${RUBY_PKGPREFIX}-yajl>=1.1.0:../../textproc/ruby-yajl +OVERRIDE_GEMSPEC+= hashie>=1.2.0 OVERRIDE_GEMSPEC+= yajl-ruby>=1.1.0 .include "../../lang/ruby/gem.mk" From e28f737ff8ff56e77e580e8344f3cc9cdc34d63b Mon Sep 17 00:00:00 2001 From: Aleksej Lebedev Date: Wed, 16 Mar 2016 16:32:20 +0100 Subject: [PATCH 0238/2457] Added textproc/py-tablib --- textproc/py-tablib/DESCR | 11 + textproc/py-tablib/Makefile | 16 + textproc/py-tablib/PLIST | 757 ++++++++++++++++++++++++++++++++++++ textproc/py-tablib/distinfo | 6 + 4 files changed, 790 insertions(+) create mode 100644 textproc/py-tablib/DESCR create mode 100644 textproc/py-tablib/Makefile create mode 100644 textproc/py-tablib/PLIST create mode 100644 textproc/py-tablib/distinfo diff --git a/textproc/py-tablib/DESCR b/textproc/py-tablib/DESCR new file mode 100644 index 0000000000000..1e00704d661be --- /dev/null +++ b/textproc/py-tablib/DESCR @@ -0,0 +1,11 @@ +Tablib is a format-agnostic tabular dataset library, written in Python. + +Output formats supported: + Excel (Sets + Books) + JSON (Sets + Books) + YAML (Sets + Books) + HTML (Sets) + TSV (Sets) + OSD (Sets) + CSV (Sets) + DBF (Sets) diff --git a/textproc/py-tablib/Makefile b/textproc/py-tablib/Makefile new file mode 100644 index 0000000000000..22b36aab41c3f --- /dev/null +++ b/textproc/py-tablib/Makefile @@ -0,0 +1,16 @@ +# $NetBSD$ + +DISTNAME= tablib-0.11.2 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= textproc +MASTER_SITES= ${MASTER_SITE_PYPI:=t/tablib/} + +MAINTAINER= root@zta.lk +HOMEPAGE= https://pypi.python.org/packages/source/t/tablib/ +COMMENT= Format agnostic tabular data library (XLS, JSON, YAML, CSV) +LICENSE= mit + +USE_LANGUAGES= # none + +.include "../../lang/python/egg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-tablib/PLIST b/textproc/py-tablib/PLIST new file mode 100644 index 0000000000000..325d993b42abe --- /dev/null +++ b/textproc/py-tablib/PLIST @@ -0,0 +1,757 @@ +@comment $NetBSD$ +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/pbr.json +${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/tablib/__init__.py +${PYSITELIB}/tablib/__init__.pyc +${PYSITELIB}/tablib/__init__.pyo +${PYSITELIB}/tablib/compat.py +${PYSITELIB}/tablib/compat.pyc +${PYSITELIB}/tablib/compat.pyo +${PYSITELIB}/tablib/core.py +${PYSITELIB}/tablib/core.pyc +${PYSITELIB}/tablib/core.pyo +${PYSITELIB}/tablib/formats/__init__.py +${PYSITELIB}/tablib/formats/__init__.pyc +${PYSITELIB}/tablib/formats/__init__.pyo +${PYSITELIB}/tablib/formats/_csv.py +${PYSITELIB}/tablib/formats/_csv.pyc +${PYSITELIB}/tablib/formats/_csv.pyo +${PYSITELIB}/tablib/formats/_dbf.py +${PYSITELIB}/tablib/formats/_dbf.pyc +${PYSITELIB}/tablib/formats/_dbf.pyo +${PYSITELIB}/tablib/formats/_html.py +${PYSITELIB}/tablib/formats/_html.pyc +${PYSITELIB}/tablib/formats/_html.pyo +${PYSITELIB}/tablib/formats/_json.py +${PYSITELIB}/tablib/formats/_json.pyc +${PYSITELIB}/tablib/formats/_json.pyo +${PYSITELIB}/tablib/formats/_latex.py +${PYSITELIB}/tablib/formats/_latex.pyc +${PYSITELIB}/tablib/formats/_latex.pyo +${PYSITELIB}/tablib/formats/_ods.py +${PYSITELIB}/tablib/formats/_ods.pyc +${PYSITELIB}/tablib/formats/_ods.pyo +${PYSITELIB}/tablib/formats/_tsv.py +${PYSITELIB}/tablib/formats/_tsv.pyc +${PYSITELIB}/tablib/formats/_tsv.pyo +${PYSITELIB}/tablib/formats/_xls.py +${PYSITELIB}/tablib/formats/_xls.pyc +${PYSITELIB}/tablib/formats/_xls.pyo +${PYSITELIB}/tablib/formats/_xlsx.py +${PYSITELIB}/tablib/formats/_xlsx.pyc +${PYSITELIB}/tablib/formats/_xlsx.pyo +${PYSITELIB}/tablib/formats/_yaml.py +${PYSITELIB}/tablib/formats/_yaml.pyc +${PYSITELIB}/tablib/formats/_yaml.pyo +${PYSITELIB}/tablib/packages/__init__.py +${PYSITELIB}/tablib/packages/__init__.pyc +${PYSITELIB}/tablib/packages/__init__.pyo +${PYSITELIB}/tablib/packages/dbfpy/__init__.py +${PYSITELIB}/tablib/packages/dbfpy/__init__.pyc +${PYSITELIB}/tablib/packages/dbfpy/__init__.pyo +${PYSITELIB}/tablib/packages/dbfpy/dbf.py +${PYSITELIB}/tablib/packages/dbfpy/dbf.pyc +${PYSITELIB}/tablib/packages/dbfpy/dbf.pyo +${PYSITELIB}/tablib/packages/dbfpy/dbfnew.py +${PYSITELIB}/tablib/packages/dbfpy/dbfnew.pyc +${PYSITELIB}/tablib/packages/dbfpy/dbfnew.pyo +${PYSITELIB}/tablib/packages/dbfpy/fields.py +${PYSITELIB}/tablib/packages/dbfpy/fields.pyc +${PYSITELIB}/tablib/packages/dbfpy/fields.pyo +${PYSITELIB}/tablib/packages/dbfpy/header.py +${PYSITELIB}/tablib/packages/dbfpy/header.pyc +${PYSITELIB}/tablib/packages/dbfpy/header.pyo +${PYSITELIB}/tablib/packages/dbfpy/record.py +${PYSITELIB}/tablib/packages/dbfpy/record.pyc +${PYSITELIB}/tablib/packages/dbfpy/record.pyo +${PYSITELIB}/tablib/packages/dbfpy/utils.py +${PYSITELIB}/tablib/packages/dbfpy/utils.pyc +${PYSITELIB}/tablib/packages/dbfpy/utils.pyo +${PYSITELIB}/tablib/packages/dbfpy3/__init__.py +${PYSITELIB}/tablib/packages/dbfpy3/__init__.pyc +${PYSITELIB}/tablib/packages/dbfpy3/__init__.pyo +${PYSITELIB}/tablib/packages/dbfpy3/dbf.py +${PYSITELIB}/tablib/packages/dbfpy3/dbf.pyc +${PYSITELIB}/tablib/packages/dbfpy3/dbf.pyo +${PYSITELIB}/tablib/packages/dbfpy3/dbfnew.py +${PYSITELIB}/tablib/packages/dbfpy3/dbfnew.pyc +${PYSITELIB}/tablib/packages/dbfpy3/dbfnew.pyo +${PYSITELIB}/tablib/packages/dbfpy3/fields.py +${PYSITELIB}/tablib/packages/dbfpy3/fields.pyc +${PYSITELIB}/tablib/packages/dbfpy3/fields.pyo +${PYSITELIB}/tablib/packages/dbfpy3/header.py +${PYSITELIB}/tablib/packages/dbfpy3/header.pyc +${PYSITELIB}/tablib/packages/dbfpy3/header.pyo +${PYSITELIB}/tablib/packages/dbfpy3/record.py +${PYSITELIB}/tablib/packages/dbfpy3/record.pyc +${PYSITELIB}/tablib/packages/dbfpy3/record.pyo +${PYSITELIB}/tablib/packages/dbfpy3/utils.py +${PYSITELIB}/tablib/packages/dbfpy3/utils.pyc +${PYSITELIB}/tablib/packages/dbfpy3/utils.pyo +${PYSITELIB}/tablib/packages/markup.py +${PYSITELIB}/tablib/packages/markup.pyc +${PYSITELIB}/tablib/packages/markup.pyo +${PYSITELIB}/tablib/packages/markup3.py +${PYSITELIB}/tablib/packages/markup3.pyc +${PYSITELIB}/tablib/packages/markup3.pyo +${PYSITELIB}/tablib/packages/odf/__init__.py +${PYSITELIB}/tablib/packages/odf/__init__.pyc +${PYSITELIB}/tablib/packages/odf/__init__.pyo +${PYSITELIB}/tablib/packages/odf/anim.py +${PYSITELIB}/tablib/packages/odf/anim.pyc +${PYSITELIB}/tablib/packages/odf/anim.pyo +${PYSITELIB}/tablib/packages/odf/attrconverters.py +${PYSITELIB}/tablib/packages/odf/attrconverters.pyc +${PYSITELIB}/tablib/packages/odf/attrconverters.pyo +${PYSITELIB}/tablib/packages/odf/chart.py +${PYSITELIB}/tablib/packages/odf/chart.pyc +${PYSITELIB}/tablib/packages/odf/chart.pyo +${PYSITELIB}/tablib/packages/odf/config.py +${PYSITELIB}/tablib/packages/odf/config.pyc +${PYSITELIB}/tablib/packages/odf/config.pyo +${PYSITELIB}/tablib/packages/odf/dc.py +${PYSITELIB}/tablib/packages/odf/dc.pyc +${PYSITELIB}/tablib/packages/odf/dc.pyo +${PYSITELIB}/tablib/packages/odf/dr3d.py +${PYSITELIB}/tablib/packages/odf/dr3d.pyc +${PYSITELIB}/tablib/packages/odf/dr3d.pyo +${PYSITELIB}/tablib/packages/odf/draw.py +${PYSITELIB}/tablib/packages/odf/draw.pyc +${PYSITELIB}/tablib/packages/odf/draw.pyo +${PYSITELIB}/tablib/packages/odf/easyliststyle.py +${PYSITELIB}/tablib/packages/odf/easyliststyle.pyc +${PYSITELIB}/tablib/packages/odf/easyliststyle.pyo +${PYSITELIB}/tablib/packages/odf/element.py +${PYSITELIB}/tablib/packages/odf/element.pyc +${PYSITELIB}/tablib/packages/odf/element.pyo +${PYSITELIB}/tablib/packages/odf/elementtypes.py +${PYSITELIB}/tablib/packages/odf/elementtypes.pyc +${PYSITELIB}/tablib/packages/odf/elementtypes.pyo +${PYSITELIB}/tablib/packages/odf/form.py +${PYSITELIB}/tablib/packages/odf/form.pyc +${PYSITELIB}/tablib/packages/odf/form.pyo +${PYSITELIB}/tablib/packages/odf/grammar.py +${PYSITELIB}/tablib/packages/odf/grammar.pyc +${PYSITELIB}/tablib/packages/odf/grammar.pyo +${PYSITELIB}/tablib/packages/odf/load.py +${PYSITELIB}/tablib/packages/odf/load.pyc +${PYSITELIB}/tablib/packages/odf/load.pyo +${PYSITELIB}/tablib/packages/odf/manifest.py +${PYSITELIB}/tablib/packages/odf/manifest.pyc +${PYSITELIB}/tablib/packages/odf/manifest.pyo +${PYSITELIB}/tablib/packages/odf/math.py +${PYSITELIB}/tablib/packages/odf/math.pyc +${PYSITELIB}/tablib/packages/odf/math.pyo +${PYSITELIB}/tablib/packages/odf/meta.py +${PYSITELIB}/tablib/packages/odf/meta.pyc +${PYSITELIB}/tablib/packages/odf/meta.pyo +${PYSITELIB}/tablib/packages/odf/namespaces.py +${PYSITELIB}/tablib/packages/odf/namespaces.pyc +${PYSITELIB}/tablib/packages/odf/namespaces.pyo +${PYSITELIB}/tablib/packages/odf/number.py +${PYSITELIB}/tablib/packages/odf/number.pyc +${PYSITELIB}/tablib/packages/odf/number.pyo +${PYSITELIB}/tablib/packages/odf/odf2moinmoin.py +${PYSITELIB}/tablib/packages/odf/odf2moinmoin.pyc +${PYSITELIB}/tablib/packages/odf/odf2moinmoin.pyo +${PYSITELIB}/tablib/packages/odf/odf2xhtml.py +${PYSITELIB}/tablib/packages/odf/odf2xhtml.pyc +${PYSITELIB}/tablib/packages/odf/odf2xhtml.pyo +${PYSITELIB}/tablib/packages/odf/odfmanifest.py +${PYSITELIB}/tablib/packages/odf/odfmanifest.pyc +${PYSITELIB}/tablib/packages/odf/odfmanifest.pyo +${PYSITELIB}/tablib/packages/odf/office.py +${PYSITELIB}/tablib/packages/odf/office.pyc +${PYSITELIB}/tablib/packages/odf/office.pyo +${PYSITELIB}/tablib/packages/odf/opendocument.py +${PYSITELIB}/tablib/packages/odf/opendocument.pyc +${PYSITELIB}/tablib/packages/odf/opendocument.pyo +${PYSITELIB}/tablib/packages/odf/presentation.py +${PYSITELIB}/tablib/packages/odf/presentation.pyc +${PYSITELIB}/tablib/packages/odf/presentation.pyo +${PYSITELIB}/tablib/packages/odf/script.py +${PYSITELIB}/tablib/packages/odf/script.pyc +${PYSITELIB}/tablib/packages/odf/script.pyo +${PYSITELIB}/tablib/packages/odf/style.py +${PYSITELIB}/tablib/packages/odf/style.pyc +${PYSITELIB}/tablib/packages/odf/style.pyo +${PYSITELIB}/tablib/packages/odf/svg.py +${PYSITELIB}/tablib/packages/odf/svg.pyc +${PYSITELIB}/tablib/packages/odf/svg.pyo +${PYSITELIB}/tablib/packages/odf/table.py +${PYSITELIB}/tablib/packages/odf/table.pyc +${PYSITELIB}/tablib/packages/odf/table.pyo +${PYSITELIB}/tablib/packages/odf/teletype.py +${PYSITELIB}/tablib/packages/odf/teletype.pyc +${PYSITELIB}/tablib/packages/odf/teletype.pyo +${PYSITELIB}/tablib/packages/odf/text.py +${PYSITELIB}/tablib/packages/odf/text.pyc +${PYSITELIB}/tablib/packages/odf/text.pyo +${PYSITELIB}/tablib/packages/odf/thumbnail.py +${PYSITELIB}/tablib/packages/odf/thumbnail.pyc +${PYSITELIB}/tablib/packages/odf/thumbnail.pyo +${PYSITELIB}/tablib/packages/odf/userfield.py +${PYSITELIB}/tablib/packages/odf/userfield.pyc +${PYSITELIB}/tablib/packages/odf/userfield.pyo +${PYSITELIB}/tablib/packages/odf/xforms.py +${PYSITELIB}/tablib/packages/odf/xforms.pyc +${PYSITELIB}/tablib/packages/odf/xforms.pyo +${PYSITELIB}/tablib/packages/odf3/__init__.py +${PYSITELIB}/tablib/packages/odf3/__init__.pyc +${PYSITELIB}/tablib/packages/odf3/__init__.pyo +${PYSITELIB}/tablib/packages/odf3/anim.py +${PYSITELIB}/tablib/packages/odf3/anim.pyc +${PYSITELIB}/tablib/packages/odf3/anim.pyo +${PYSITELIB}/tablib/packages/odf3/attrconverters.py +${PYSITELIB}/tablib/packages/odf3/attrconverters.pyc +${PYSITELIB}/tablib/packages/odf3/attrconverters.pyo +${PYSITELIB}/tablib/packages/odf3/chart.py +${PYSITELIB}/tablib/packages/odf3/chart.pyc +${PYSITELIB}/tablib/packages/odf3/chart.pyo +${PYSITELIB}/tablib/packages/odf3/config.py +${PYSITELIB}/tablib/packages/odf3/config.pyc +${PYSITELIB}/tablib/packages/odf3/config.pyo +${PYSITELIB}/tablib/packages/odf3/dc.py +${PYSITELIB}/tablib/packages/odf3/dc.pyc +${PYSITELIB}/tablib/packages/odf3/dc.pyo +${PYSITELIB}/tablib/packages/odf3/dr3d.py +${PYSITELIB}/tablib/packages/odf3/dr3d.pyc +${PYSITELIB}/tablib/packages/odf3/dr3d.pyo +${PYSITELIB}/tablib/packages/odf3/draw.py +${PYSITELIB}/tablib/packages/odf3/draw.pyc +${PYSITELIB}/tablib/packages/odf3/draw.pyo +${PYSITELIB}/tablib/packages/odf3/easyliststyle.py +${PYSITELIB}/tablib/packages/odf3/easyliststyle.pyc +${PYSITELIB}/tablib/packages/odf3/easyliststyle.pyo +${PYSITELIB}/tablib/packages/odf3/element.py +${PYSITELIB}/tablib/packages/odf3/element.pyc +${PYSITELIB}/tablib/packages/odf3/element.pyo +${PYSITELIB}/tablib/packages/odf3/elementtypes.py +${PYSITELIB}/tablib/packages/odf3/elementtypes.pyc +${PYSITELIB}/tablib/packages/odf3/elementtypes.pyo +${PYSITELIB}/tablib/packages/odf3/form.py +${PYSITELIB}/tablib/packages/odf3/form.pyc +${PYSITELIB}/tablib/packages/odf3/form.pyo +${PYSITELIB}/tablib/packages/odf3/grammar.py +${PYSITELIB}/tablib/packages/odf3/grammar.pyc +${PYSITELIB}/tablib/packages/odf3/grammar.pyo +${PYSITELIB}/tablib/packages/odf3/load.py +${PYSITELIB}/tablib/packages/odf3/load.pyc +${PYSITELIB}/tablib/packages/odf3/load.pyo +${PYSITELIB}/tablib/packages/odf3/manifest.py +${PYSITELIB}/tablib/packages/odf3/manifest.pyc +${PYSITELIB}/tablib/packages/odf3/manifest.pyo +${PYSITELIB}/tablib/packages/odf3/math.py +${PYSITELIB}/tablib/packages/odf3/math.pyc +${PYSITELIB}/tablib/packages/odf3/math.pyo +${PYSITELIB}/tablib/packages/odf3/meta.py +${PYSITELIB}/tablib/packages/odf3/meta.pyc +${PYSITELIB}/tablib/packages/odf3/meta.pyo +${PYSITELIB}/tablib/packages/odf3/namespaces.py +${PYSITELIB}/tablib/packages/odf3/namespaces.pyc +${PYSITELIB}/tablib/packages/odf3/namespaces.pyo +${PYSITELIB}/tablib/packages/odf3/number.py +${PYSITELIB}/tablib/packages/odf3/number.pyc +${PYSITELIB}/tablib/packages/odf3/number.pyo +${PYSITELIB}/tablib/packages/odf3/odf2moinmoin.py +${PYSITELIB}/tablib/packages/odf3/odf2moinmoin.pyc +${PYSITELIB}/tablib/packages/odf3/odf2moinmoin.pyo +${PYSITELIB}/tablib/packages/odf3/odf2xhtml.py +${PYSITELIB}/tablib/packages/odf3/odf2xhtml.pyc +${PYSITELIB}/tablib/packages/odf3/odf2xhtml.pyo +${PYSITELIB}/tablib/packages/odf3/odfmanifest.py +${PYSITELIB}/tablib/packages/odf3/odfmanifest.pyc +${PYSITELIB}/tablib/packages/odf3/odfmanifest.pyo +${PYSITELIB}/tablib/packages/odf3/office.py +${PYSITELIB}/tablib/packages/odf3/office.pyc +${PYSITELIB}/tablib/packages/odf3/office.pyo +${PYSITELIB}/tablib/packages/odf3/opendocument.py +${PYSITELIB}/tablib/packages/odf3/opendocument.pyc +${PYSITELIB}/tablib/packages/odf3/opendocument.pyo +${PYSITELIB}/tablib/packages/odf3/presentation.py +${PYSITELIB}/tablib/packages/odf3/presentation.pyc +${PYSITELIB}/tablib/packages/odf3/presentation.pyo +${PYSITELIB}/tablib/packages/odf3/script.py +${PYSITELIB}/tablib/packages/odf3/script.pyc +${PYSITELIB}/tablib/packages/odf3/script.pyo +${PYSITELIB}/tablib/packages/odf3/style.py +${PYSITELIB}/tablib/packages/odf3/style.pyc +${PYSITELIB}/tablib/packages/odf3/style.pyo +${PYSITELIB}/tablib/packages/odf3/svg.py +${PYSITELIB}/tablib/packages/odf3/svg.pyc +${PYSITELIB}/tablib/packages/odf3/svg.pyo +${PYSITELIB}/tablib/packages/odf3/table.py +${PYSITELIB}/tablib/packages/odf3/table.pyc +${PYSITELIB}/tablib/packages/odf3/table.pyo +${PYSITELIB}/tablib/packages/odf3/teletype.py +${PYSITELIB}/tablib/packages/odf3/teletype.pyc +${PYSITELIB}/tablib/packages/odf3/teletype.pyo +${PYSITELIB}/tablib/packages/odf3/text.py +${PYSITELIB}/tablib/packages/odf3/text.pyc +${PYSITELIB}/tablib/packages/odf3/text.pyo +${PYSITELIB}/tablib/packages/odf3/thumbnail.py +${PYSITELIB}/tablib/packages/odf3/thumbnail.pyc +${PYSITELIB}/tablib/packages/odf3/thumbnail.pyo +${PYSITELIB}/tablib/packages/odf3/userfield.py +${PYSITELIB}/tablib/packages/odf3/userfield.pyc +${PYSITELIB}/tablib/packages/odf3/userfield.pyo +${PYSITELIB}/tablib/packages/odf3/xforms.py +${PYSITELIB}/tablib/packages/odf3/xforms.pyc +${PYSITELIB}/tablib/packages/odf3/xforms.pyo +${PYSITELIB}/tablib/packages/omnijson/__init__.py +${PYSITELIB}/tablib/packages/omnijson/__init__.pyc +${PYSITELIB}/tablib/packages/omnijson/__init__.pyo +${PYSITELIB}/tablib/packages/omnijson/core.py +${PYSITELIB}/tablib/packages/omnijson/core.pyc +${PYSITELIB}/tablib/packages/omnijson/core.pyo +${PYSITELIB}/tablib/packages/openpyxl/__init__.py +${PYSITELIB}/tablib/packages/openpyxl/__init__.pyc +${PYSITELIB}/tablib/packages/openpyxl/__init__.pyo +${PYSITELIB}/tablib/packages/openpyxl/cell.py +${PYSITELIB}/tablib/packages/openpyxl/cell.pyc +${PYSITELIB}/tablib/packages/openpyxl/cell.pyo +${PYSITELIB}/tablib/packages/openpyxl/chart.py +${PYSITELIB}/tablib/packages/openpyxl/chart.pyc +${PYSITELIB}/tablib/packages/openpyxl/chart.pyo +${PYSITELIB}/tablib/packages/openpyxl/drawing.py +${PYSITELIB}/tablib/packages/openpyxl/drawing.pyc +${PYSITELIB}/tablib/packages/openpyxl/drawing.pyo +${PYSITELIB}/tablib/packages/openpyxl/namedrange.py +${PYSITELIB}/tablib/packages/openpyxl/namedrange.pyc +${PYSITELIB}/tablib/packages/openpyxl/namedrange.pyo +${PYSITELIB}/tablib/packages/openpyxl/reader/__init__.py +${PYSITELIB}/tablib/packages/openpyxl/reader/__init__.pyc +${PYSITELIB}/tablib/packages/openpyxl/reader/__init__.pyo +${PYSITELIB}/tablib/packages/openpyxl/reader/excel.py +${PYSITELIB}/tablib/packages/openpyxl/reader/excel.pyc +${PYSITELIB}/tablib/packages/openpyxl/reader/excel.pyo +${PYSITELIB}/tablib/packages/openpyxl/reader/iter_worksheet.py +${PYSITELIB}/tablib/packages/openpyxl/reader/iter_worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl/reader/iter_worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl/reader/strings.py +${PYSITELIB}/tablib/packages/openpyxl/reader/strings.pyc +${PYSITELIB}/tablib/packages/openpyxl/reader/strings.pyo +${PYSITELIB}/tablib/packages/openpyxl/reader/style.py +${PYSITELIB}/tablib/packages/openpyxl/reader/style.pyc +${PYSITELIB}/tablib/packages/openpyxl/reader/style.pyo +${PYSITELIB}/tablib/packages/openpyxl/reader/workbook.py +${PYSITELIB}/tablib/packages/openpyxl/reader/workbook.pyc +${PYSITELIB}/tablib/packages/openpyxl/reader/workbook.pyo +${PYSITELIB}/tablib/packages/openpyxl/reader/worksheet.py +${PYSITELIB}/tablib/packages/openpyxl/reader/worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl/reader/worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl/shared/__init__.py +${PYSITELIB}/tablib/packages/openpyxl/shared/__init__.pyc +${PYSITELIB}/tablib/packages/openpyxl/shared/__init__.pyo +${PYSITELIB}/tablib/packages/openpyxl/shared/date_time.py +${PYSITELIB}/tablib/packages/openpyxl/shared/date_time.pyc +${PYSITELIB}/tablib/packages/openpyxl/shared/date_time.pyo +${PYSITELIB}/tablib/packages/openpyxl/shared/exc.py +${PYSITELIB}/tablib/packages/openpyxl/shared/exc.pyc +${PYSITELIB}/tablib/packages/openpyxl/shared/exc.pyo +${PYSITELIB}/tablib/packages/openpyxl/shared/ooxml.py +${PYSITELIB}/tablib/packages/openpyxl/shared/ooxml.pyc +${PYSITELIB}/tablib/packages/openpyxl/shared/ooxml.pyo +${PYSITELIB}/tablib/packages/openpyxl/shared/password_hasher.py +${PYSITELIB}/tablib/packages/openpyxl/shared/password_hasher.pyc +${PYSITELIB}/tablib/packages/openpyxl/shared/password_hasher.pyo +${PYSITELIB}/tablib/packages/openpyxl/shared/units.py +${PYSITELIB}/tablib/packages/openpyxl/shared/units.pyc +${PYSITELIB}/tablib/packages/openpyxl/shared/units.pyo +${PYSITELIB}/tablib/packages/openpyxl/shared/xmltools.py +${PYSITELIB}/tablib/packages/openpyxl/shared/xmltools.pyc +${PYSITELIB}/tablib/packages/openpyxl/shared/xmltools.pyo +${PYSITELIB}/tablib/packages/openpyxl/style.py +${PYSITELIB}/tablib/packages/openpyxl/style.pyc +${PYSITELIB}/tablib/packages/openpyxl/style.pyo +${PYSITELIB}/tablib/packages/openpyxl/workbook.py +${PYSITELIB}/tablib/packages/openpyxl/workbook.pyc +${PYSITELIB}/tablib/packages/openpyxl/workbook.pyo +${PYSITELIB}/tablib/packages/openpyxl/worksheet.py +${PYSITELIB}/tablib/packages/openpyxl/worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl/worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/__init__.py +${PYSITELIB}/tablib/packages/openpyxl/writer/__init__.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/__init__.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/charts.py +${PYSITELIB}/tablib/packages/openpyxl/writer/charts.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/charts.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/drawings.py +${PYSITELIB}/tablib/packages/openpyxl/writer/drawings.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/drawings.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/dump_worksheet.py +${PYSITELIB}/tablib/packages/openpyxl/writer/dump_worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/dump_worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/excel.py +${PYSITELIB}/tablib/packages/openpyxl/writer/excel.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/excel.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/strings.py +${PYSITELIB}/tablib/packages/openpyxl/writer/strings.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/strings.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/styles.py +${PYSITELIB}/tablib/packages/openpyxl/writer/styles.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/styles.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/theme.py +${PYSITELIB}/tablib/packages/openpyxl/writer/theme.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/theme.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/workbook.py +${PYSITELIB}/tablib/packages/openpyxl/writer/workbook.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/workbook.pyo +${PYSITELIB}/tablib/packages/openpyxl/writer/worksheet.py +${PYSITELIB}/tablib/packages/openpyxl/writer/worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl/writer/worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl3/__init__.py +${PYSITELIB}/tablib/packages/openpyxl3/__init__.pyc +${PYSITELIB}/tablib/packages/openpyxl3/__init__.pyo +${PYSITELIB}/tablib/packages/openpyxl3/cell.py +${PYSITELIB}/tablib/packages/openpyxl3/cell.pyc +${PYSITELIB}/tablib/packages/openpyxl3/cell.pyo +${PYSITELIB}/tablib/packages/openpyxl3/chart.py +${PYSITELIB}/tablib/packages/openpyxl3/chart.pyc +${PYSITELIB}/tablib/packages/openpyxl3/chart.pyo +${PYSITELIB}/tablib/packages/openpyxl3/drawing.py +${PYSITELIB}/tablib/packages/openpyxl3/drawing.pyc +${PYSITELIB}/tablib/packages/openpyxl3/drawing.pyo +${PYSITELIB}/tablib/packages/openpyxl3/namedrange.py +${PYSITELIB}/tablib/packages/openpyxl3/namedrange.pyc +${PYSITELIB}/tablib/packages/openpyxl3/namedrange.pyo +${PYSITELIB}/tablib/packages/openpyxl3/reader/__init__.py +${PYSITELIB}/tablib/packages/openpyxl3/reader/__init__.pyc +${PYSITELIB}/tablib/packages/openpyxl3/reader/__init__.pyo +${PYSITELIB}/tablib/packages/openpyxl3/reader/excel.py +${PYSITELIB}/tablib/packages/openpyxl3/reader/excel.pyc +${PYSITELIB}/tablib/packages/openpyxl3/reader/excel.pyo +${PYSITELIB}/tablib/packages/openpyxl3/reader/iter_worksheet.py +${PYSITELIB}/tablib/packages/openpyxl3/reader/iter_worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl3/reader/iter_worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl3/reader/strings.py +${PYSITELIB}/tablib/packages/openpyxl3/reader/strings.pyc +${PYSITELIB}/tablib/packages/openpyxl3/reader/strings.pyo +${PYSITELIB}/tablib/packages/openpyxl3/reader/style.py +${PYSITELIB}/tablib/packages/openpyxl3/reader/style.pyc +${PYSITELIB}/tablib/packages/openpyxl3/reader/style.pyo +${PYSITELIB}/tablib/packages/openpyxl3/reader/workbook.py +${PYSITELIB}/tablib/packages/openpyxl3/reader/workbook.pyc +${PYSITELIB}/tablib/packages/openpyxl3/reader/workbook.pyo +${PYSITELIB}/tablib/packages/openpyxl3/reader/worksheet.py +${PYSITELIB}/tablib/packages/openpyxl3/reader/worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl3/reader/worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl3/shared/__init__.py +${PYSITELIB}/tablib/packages/openpyxl3/shared/__init__.pyc +${PYSITELIB}/tablib/packages/openpyxl3/shared/__init__.pyo +${PYSITELIB}/tablib/packages/openpyxl3/shared/date_time.py +${PYSITELIB}/tablib/packages/openpyxl3/shared/date_time.pyc +${PYSITELIB}/tablib/packages/openpyxl3/shared/date_time.pyo +${PYSITELIB}/tablib/packages/openpyxl3/shared/exc.py +${PYSITELIB}/tablib/packages/openpyxl3/shared/exc.pyc +${PYSITELIB}/tablib/packages/openpyxl3/shared/exc.pyo +${PYSITELIB}/tablib/packages/openpyxl3/shared/ooxml.py +${PYSITELIB}/tablib/packages/openpyxl3/shared/ooxml.pyc +${PYSITELIB}/tablib/packages/openpyxl3/shared/ooxml.pyo +${PYSITELIB}/tablib/packages/openpyxl3/shared/password_hasher.py +${PYSITELIB}/tablib/packages/openpyxl3/shared/password_hasher.pyc +${PYSITELIB}/tablib/packages/openpyxl3/shared/password_hasher.pyo +${PYSITELIB}/tablib/packages/openpyxl3/shared/units.py +${PYSITELIB}/tablib/packages/openpyxl3/shared/units.pyc +${PYSITELIB}/tablib/packages/openpyxl3/shared/units.pyo +${PYSITELIB}/tablib/packages/openpyxl3/shared/xmltools.py +${PYSITELIB}/tablib/packages/openpyxl3/shared/xmltools.pyc +${PYSITELIB}/tablib/packages/openpyxl3/shared/xmltools.pyo +${PYSITELIB}/tablib/packages/openpyxl3/style.py +${PYSITELIB}/tablib/packages/openpyxl3/style.pyc +${PYSITELIB}/tablib/packages/openpyxl3/style.pyo +${PYSITELIB}/tablib/packages/openpyxl3/workbook.py +${PYSITELIB}/tablib/packages/openpyxl3/workbook.pyc +${PYSITELIB}/tablib/packages/openpyxl3/workbook.pyo +${PYSITELIB}/tablib/packages/openpyxl3/worksheet.py +${PYSITELIB}/tablib/packages/openpyxl3/worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl3/worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/__init__.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/__init__.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/__init__.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/charts.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/charts.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/charts.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/drawings.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/drawings.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/drawings.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/dump_worksheet.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/dump_worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/dump_worksheet.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/excel.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/excel.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/excel.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/strings.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/strings.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/strings.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/styles.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/styles.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/styles.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/theme.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/theme.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/theme.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/workbook.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/workbook.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/workbook.pyo +${PYSITELIB}/tablib/packages/openpyxl3/writer/worksheet.py +${PYSITELIB}/tablib/packages/openpyxl3/writer/worksheet.pyc +${PYSITELIB}/tablib/packages/openpyxl3/writer/worksheet.pyo +${PYSITELIB}/tablib/packages/ordereddict.py +${PYSITELIB}/tablib/packages/ordereddict.pyc +${PYSITELIB}/tablib/packages/ordereddict.pyo +${PYSITELIB}/tablib/packages/unicodecsv/__init__.py +${PYSITELIB}/tablib/packages/unicodecsv/__init__.pyc +${PYSITELIB}/tablib/packages/unicodecsv/__init__.pyo +${PYSITELIB}/tablib/packages/xlrd/__init__.py +${PYSITELIB}/tablib/packages/xlrd/__init__.pyc +${PYSITELIB}/tablib/packages/xlrd/__init__.pyo +${PYSITELIB}/tablib/packages/xlrd/biffh.py +${PYSITELIB}/tablib/packages/xlrd/biffh.pyc +${PYSITELIB}/tablib/packages/xlrd/biffh.pyo +${PYSITELIB}/tablib/packages/xlrd/compdoc.py +${PYSITELIB}/tablib/packages/xlrd/compdoc.pyc +${PYSITELIB}/tablib/packages/xlrd/compdoc.pyo +${PYSITELIB}/tablib/packages/xlrd/formatting.py +${PYSITELIB}/tablib/packages/xlrd/formatting.pyc +${PYSITELIB}/tablib/packages/xlrd/formatting.pyo +${PYSITELIB}/tablib/packages/xlrd/formula.py +${PYSITELIB}/tablib/packages/xlrd/formula.pyc +${PYSITELIB}/tablib/packages/xlrd/formula.pyo +${PYSITELIB}/tablib/packages/xlrd/licences.py +${PYSITELIB}/tablib/packages/xlrd/licences.pyc +${PYSITELIB}/tablib/packages/xlrd/licences.pyo +${PYSITELIB}/tablib/packages/xlrd/sheet.py +${PYSITELIB}/tablib/packages/xlrd/sheet.pyc +${PYSITELIB}/tablib/packages/xlrd/sheet.pyo +${PYSITELIB}/tablib/packages/xlrd/timemachine.py +${PYSITELIB}/tablib/packages/xlrd/timemachine.pyc +${PYSITELIB}/tablib/packages/xlrd/timemachine.pyo +${PYSITELIB}/tablib/packages/xlrd/xldate.py +${PYSITELIB}/tablib/packages/xlrd/xldate.pyc +${PYSITELIB}/tablib/packages/xlrd/xldate.pyo +${PYSITELIB}/tablib/packages/xlrd3/__init__.py +${PYSITELIB}/tablib/packages/xlrd3/biffh.py +${PYSITELIB}/tablib/packages/xlrd3/compdoc.py +${PYSITELIB}/tablib/packages/xlrd3/formatting.py +${PYSITELIB}/tablib/packages/xlrd3/formula.py +${PYSITELIB}/tablib/packages/xlrd3/sheet.py +${PYSITELIB}/tablib/packages/xlrd3/xfcell.py +${PYSITELIB}/tablib/packages/xlrd3/xfcell.pyc +${PYSITELIB}/tablib/packages/xlrd3/xfcell.pyo +${PYSITELIB}/tablib/packages/xlrd3/xfconst.py +${PYSITELIB}/tablib/packages/xlrd3/xfconst.pyc +${PYSITELIB}/tablib/packages/xlrd3/xfconst.pyo +${PYSITELIB}/tablib/packages/xlrd3/xldate.py +${PYSITELIB}/tablib/packages/xlrd3/xldate.pyc +${PYSITELIB}/tablib/packages/xlrd3/xldate.pyo +${PYSITELIB}/tablib/packages/xlwt/BIFFRecords.py +${PYSITELIB}/tablib/packages/xlwt/BIFFRecords.pyc +${PYSITELIB}/tablib/packages/xlwt/BIFFRecords.pyo +${PYSITELIB}/tablib/packages/xlwt/Bitmap.py +${PYSITELIB}/tablib/packages/xlwt/Bitmap.pyc +${PYSITELIB}/tablib/packages/xlwt/Bitmap.pyo +${PYSITELIB}/tablib/packages/xlwt/Cell.py +${PYSITELIB}/tablib/packages/xlwt/Cell.pyc +${PYSITELIB}/tablib/packages/xlwt/Cell.pyo +${PYSITELIB}/tablib/packages/xlwt/Column.py +${PYSITELIB}/tablib/packages/xlwt/Column.pyc +${PYSITELIB}/tablib/packages/xlwt/Column.pyo +${PYSITELIB}/tablib/packages/xlwt/CompoundDoc.py +${PYSITELIB}/tablib/packages/xlwt/CompoundDoc.pyc +${PYSITELIB}/tablib/packages/xlwt/CompoundDoc.pyo +${PYSITELIB}/tablib/packages/xlwt/ExcelFormula.py +${PYSITELIB}/tablib/packages/xlwt/ExcelFormula.pyc +${PYSITELIB}/tablib/packages/xlwt/ExcelFormula.pyo +${PYSITELIB}/tablib/packages/xlwt/ExcelFormulaLexer.py +${PYSITELIB}/tablib/packages/xlwt/ExcelFormulaLexer.pyc +${PYSITELIB}/tablib/packages/xlwt/ExcelFormulaLexer.pyo +${PYSITELIB}/tablib/packages/xlwt/ExcelFormulaParser.py +${PYSITELIB}/tablib/packages/xlwt/ExcelFormulaParser.pyc +${PYSITELIB}/tablib/packages/xlwt/ExcelFormulaParser.pyo +${PYSITELIB}/tablib/packages/xlwt/ExcelMagic.py +${PYSITELIB}/tablib/packages/xlwt/ExcelMagic.pyc +${PYSITELIB}/tablib/packages/xlwt/ExcelMagic.pyo +${PYSITELIB}/tablib/packages/xlwt/Formatting.py +${PYSITELIB}/tablib/packages/xlwt/Formatting.pyc +${PYSITELIB}/tablib/packages/xlwt/Formatting.pyo +${PYSITELIB}/tablib/packages/xlwt/Row.py +${PYSITELIB}/tablib/packages/xlwt/Row.pyc +${PYSITELIB}/tablib/packages/xlwt/Row.pyo +${PYSITELIB}/tablib/packages/xlwt/Style.py +${PYSITELIB}/tablib/packages/xlwt/Style.pyc +${PYSITELIB}/tablib/packages/xlwt/Style.pyo +${PYSITELIB}/tablib/packages/xlwt/UnicodeUtils.py +${PYSITELIB}/tablib/packages/xlwt/UnicodeUtils.pyc +${PYSITELIB}/tablib/packages/xlwt/UnicodeUtils.pyo +${PYSITELIB}/tablib/packages/xlwt/Utils.py +${PYSITELIB}/tablib/packages/xlwt/Utils.pyc +${PYSITELIB}/tablib/packages/xlwt/Utils.pyo +${PYSITELIB}/tablib/packages/xlwt/Workbook.py +${PYSITELIB}/tablib/packages/xlwt/Workbook.pyc +${PYSITELIB}/tablib/packages/xlwt/Workbook.pyo +${PYSITELIB}/tablib/packages/xlwt/Worksheet.py +${PYSITELIB}/tablib/packages/xlwt/Worksheet.pyc +${PYSITELIB}/tablib/packages/xlwt/Worksheet.pyo +${PYSITELIB}/tablib/packages/xlwt/__init__.py +${PYSITELIB}/tablib/packages/xlwt/__init__.pyc +${PYSITELIB}/tablib/packages/xlwt/__init__.pyo +${PYSITELIB}/tablib/packages/xlwt/antlr.py +${PYSITELIB}/tablib/packages/xlwt/antlr.pyc +${PYSITELIB}/tablib/packages/xlwt/antlr.pyo +${PYSITELIB}/tablib/packages/xlwt3/BIFFRecords.py +${PYSITELIB}/tablib/packages/xlwt3/BIFFRecords.pyc +${PYSITELIB}/tablib/packages/xlwt3/BIFFRecords.pyo +${PYSITELIB}/tablib/packages/xlwt3/Bitmap.py +${PYSITELIB}/tablib/packages/xlwt3/Bitmap.pyc +${PYSITELIB}/tablib/packages/xlwt3/Bitmap.pyo +${PYSITELIB}/tablib/packages/xlwt3/Cell.py +${PYSITELIB}/tablib/packages/xlwt3/Cell.pyc +${PYSITELIB}/tablib/packages/xlwt3/Cell.pyo +${PYSITELIB}/tablib/packages/xlwt3/Column.py +${PYSITELIB}/tablib/packages/xlwt3/Column.pyc +${PYSITELIB}/tablib/packages/xlwt3/Column.pyo +${PYSITELIB}/tablib/packages/xlwt3/CompoundDoc.py +${PYSITELIB}/tablib/packages/xlwt3/CompoundDoc.pyc +${PYSITELIB}/tablib/packages/xlwt3/CompoundDoc.pyo +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormula.py +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormula.pyc +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormula.pyo +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormulaLexer.py +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormulaLexer.pyc +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormulaLexer.pyo +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormulaParser.py +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormulaParser.pyc +${PYSITELIB}/tablib/packages/xlwt3/ExcelFormulaParser.pyo +${PYSITELIB}/tablib/packages/xlwt3/ExcelMagic.py +${PYSITELIB}/tablib/packages/xlwt3/ExcelMagic.pyc +${PYSITELIB}/tablib/packages/xlwt3/ExcelMagic.pyo +${PYSITELIB}/tablib/packages/xlwt3/Formatting.py +${PYSITELIB}/tablib/packages/xlwt3/Formatting.pyc +${PYSITELIB}/tablib/packages/xlwt3/Formatting.pyo +${PYSITELIB}/tablib/packages/xlwt3/Row.py +${PYSITELIB}/tablib/packages/xlwt3/Row.pyc +${PYSITELIB}/tablib/packages/xlwt3/Row.pyo +${PYSITELIB}/tablib/packages/xlwt3/Style.py +${PYSITELIB}/tablib/packages/xlwt3/Style.pyc +${PYSITELIB}/tablib/packages/xlwt3/Style.pyo +${PYSITELIB}/tablib/packages/xlwt3/UnicodeUtils.py +${PYSITELIB}/tablib/packages/xlwt3/UnicodeUtils.pyc +${PYSITELIB}/tablib/packages/xlwt3/UnicodeUtils.pyo +${PYSITELIB}/tablib/packages/xlwt3/Utils.py +${PYSITELIB}/tablib/packages/xlwt3/Utils.pyc +${PYSITELIB}/tablib/packages/xlwt3/Utils.pyo +${PYSITELIB}/tablib/packages/xlwt3/Workbook.py +${PYSITELIB}/tablib/packages/xlwt3/Workbook.pyc +${PYSITELIB}/tablib/packages/xlwt3/Workbook.pyo +${PYSITELIB}/tablib/packages/xlwt3/Worksheet.py +${PYSITELIB}/tablib/packages/xlwt3/Worksheet.pyc +${PYSITELIB}/tablib/packages/xlwt3/Worksheet.pyo +${PYSITELIB}/tablib/packages/xlwt3/__init__.py +${PYSITELIB}/tablib/packages/xlwt3/__init__.pyc +${PYSITELIB}/tablib/packages/xlwt3/__init__.pyo +${PYSITELIB}/tablib/packages/xlwt3/antlr.py +${PYSITELIB}/tablib/packages/yaml/__init__.py +${PYSITELIB}/tablib/packages/yaml/__init__.pyc +${PYSITELIB}/tablib/packages/yaml/__init__.pyo +${PYSITELIB}/tablib/packages/yaml/composer.py +${PYSITELIB}/tablib/packages/yaml/composer.pyc +${PYSITELIB}/tablib/packages/yaml/composer.pyo +${PYSITELIB}/tablib/packages/yaml/constructor.py +${PYSITELIB}/tablib/packages/yaml/constructor.pyc +${PYSITELIB}/tablib/packages/yaml/constructor.pyo +${PYSITELIB}/tablib/packages/yaml/cyaml.py +${PYSITELIB}/tablib/packages/yaml/cyaml.pyc +${PYSITELIB}/tablib/packages/yaml/cyaml.pyo +${PYSITELIB}/tablib/packages/yaml/dumper.py +${PYSITELIB}/tablib/packages/yaml/dumper.pyc +${PYSITELIB}/tablib/packages/yaml/dumper.pyo +${PYSITELIB}/tablib/packages/yaml/emitter.py +${PYSITELIB}/tablib/packages/yaml/emitter.pyc +${PYSITELIB}/tablib/packages/yaml/emitter.pyo +${PYSITELIB}/tablib/packages/yaml/error.py +${PYSITELIB}/tablib/packages/yaml/error.pyc +${PYSITELIB}/tablib/packages/yaml/error.pyo +${PYSITELIB}/tablib/packages/yaml/events.py +${PYSITELIB}/tablib/packages/yaml/events.pyc +${PYSITELIB}/tablib/packages/yaml/events.pyo +${PYSITELIB}/tablib/packages/yaml/loader.py +${PYSITELIB}/tablib/packages/yaml/loader.pyc +${PYSITELIB}/tablib/packages/yaml/loader.pyo +${PYSITELIB}/tablib/packages/yaml/nodes.py +${PYSITELIB}/tablib/packages/yaml/nodes.pyc +${PYSITELIB}/tablib/packages/yaml/nodes.pyo +${PYSITELIB}/tablib/packages/yaml/parser.py +${PYSITELIB}/tablib/packages/yaml/parser.pyc +${PYSITELIB}/tablib/packages/yaml/parser.pyo +${PYSITELIB}/tablib/packages/yaml/reader.py +${PYSITELIB}/tablib/packages/yaml/reader.pyc +${PYSITELIB}/tablib/packages/yaml/reader.pyo +${PYSITELIB}/tablib/packages/yaml/representer.py +${PYSITELIB}/tablib/packages/yaml/representer.pyc +${PYSITELIB}/tablib/packages/yaml/representer.pyo +${PYSITELIB}/tablib/packages/yaml/resolver.py +${PYSITELIB}/tablib/packages/yaml/resolver.pyc +${PYSITELIB}/tablib/packages/yaml/resolver.pyo +${PYSITELIB}/tablib/packages/yaml/scanner.py +${PYSITELIB}/tablib/packages/yaml/scanner.pyc +${PYSITELIB}/tablib/packages/yaml/scanner.pyo +${PYSITELIB}/tablib/packages/yaml/serializer.py +${PYSITELIB}/tablib/packages/yaml/serializer.pyc +${PYSITELIB}/tablib/packages/yaml/serializer.pyo +${PYSITELIB}/tablib/packages/yaml/tokens.py +${PYSITELIB}/tablib/packages/yaml/tokens.pyc +${PYSITELIB}/tablib/packages/yaml/tokens.pyo +${PYSITELIB}/tablib/packages/yaml3/__init__.py +${PYSITELIB}/tablib/packages/yaml3/__init__.pyc +${PYSITELIB}/tablib/packages/yaml3/__init__.pyo +${PYSITELIB}/tablib/packages/yaml3/composer.py +${PYSITELIB}/tablib/packages/yaml3/composer.pyc +${PYSITELIB}/tablib/packages/yaml3/composer.pyo +${PYSITELIB}/tablib/packages/yaml3/constructor.py +${PYSITELIB}/tablib/packages/yaml3/constructor.pyc +${PYSITELIB}/tablib/packages/yaml3/constructor.pyo +${PYSITELIB}/tablib/packages/yaml3/cyaml.py +${PYSITELIB}/tablib/packages/yaml3/cyaml.pyc +${PYSITELIB}/tablib/packages/yaml3/cyaml.pyo +${PYSITELIB}/tablib/packages/yaml3/dumper.py +${PYSITELIB}/tablib/packages/yaml3/dumper.pyc +${PYSITELIB}/tablib/packages/yaml3/dumper.pyo +${PYSITELIB}/tablib/packages/yaml3/emitter.py +${PYSITELIB}/tablib/packages/yaml3/emitter.pyc +${PYSITELIB}/tablib/packages/yaml3/emitter.pyo +${PYSITELIB}/tablib/packages/yaml3/error.py +${PYSITELIB}/tablib/packages/yaml3/error.pyc +${PYSITELIB}/tablib/packages/yaml3/error.pyo +${PYSITELIB}/tablib/packages/yaml3/events.py +${PYSITELIB}/tablib/packages/yaml3/events.pyc +${PYSITELIB}/tablib/packages/yaml3/events.pyo +${PYSITELIB}/tablib/packages/yaml3/loader.py +${PYSITELIB}/tablib/packages/yaml3/loader.pyc +${PYSITELIB}/tablib/packages/yaml3/loader.pyo +${PYSITELIB}/tablib/packages/yaml3/nodes.py +${PYSITELIB}/tablib/packages/yaml3/nodes.pyc +${PYSITELIB}/tablib/packages/yaml3/nodes.pyo +${PYSITELIB}/tablib/packages/yaml3/parser.py +${PYSITELIB}/tablib/packages/yaml3/parser.pyc +${PYSITELIB}/tablib/packages/yaml3/parser.pyo +${PYSITELIB}/tablib/packages/yaml3/reader.py +${PYSITELIB}/tablib/packages/yaml3/reader.pyc +${PYSITELIB}/tablib/packages/yaml3/reader.pyo +${PYSITELIB}/tablib/packages/yaml3/representer.py +${PYSITELIB}/tablib/packages/yaml3/representer.pyc +${PYSITELIB}/tablib/packages/yaml3/representer.pyo +${PYSITELIB}/tablib/packages/yaml3/resolver.py +${PYSITELIB}/tablib/packages/yaml3/resolver.pyc +${PYSITELIB}/tablib/packages/yaml3/resolver.pyo +${PYSITELIB}/tablib/packages/yaml3/scanner.py +${PYSITELIB}/tablib/packages/yaml3/scanner.pyc +${PYSITELIB}/tablib/packages/yaml3/scanner.pyo +${PYSITELIB}/tablib/packages/yaml3/serializer.py +${PYSITELIB}/tablib/packages/yaml3/serializer.pyc +${PYSITELIB}/tablib/packages/yaml3/serializer.pyo +${PYSITELIB}/tablib/packages/yaml3/tokens.py +${PYSITELIB}/tablib/packages/yaml3/tokens.pyc +${PYSITELIB}/tablib/packages/yaml3/tokens.pyo diff --git a/textproc/py-tablib/distinfo b/textproc/py-tablib/distinfo new file mode 100644 index 0000000000000..d33fcd2074cba --- /dev/null +++ b/textproc/py-tablib/distinfo @@ -0,0 +1,6 @@ +$NetBSD$ + +SHA1 (tablib-0.11.2.tar.gz) = 591452840c6738bad722d7be5c4c99d660289307 +RMD160 (tablib-0.11.2.tar.gz) = f6c61d0d423d2f91a58fb932c57e74d4eb7b551f +SHA512 (tablib-0.11.2.tar.gz) = 356bf308df7c3d7d20800814a945c83fc64e98fb859d180cf5d9455ec2634e0a20f0c6ed788a75117c7c3d7bd4cda319c2049ce760109d102b2cb9a0707fa4f2 +Size (tablib-0.11.2.tar.gz) = 758287 bytes From f127bcee115a8363f2d8ebbd8ac0df244ff6a6e9 Mon Sep 17 00:00:00 2001 From: Aleksej Lebedev Date: Wed, 16 Mar 2016 16:33:12 +0100 Subject: [PATCH 0239/2457] Added textproc/py-records --- databases/py-records/DESCR | 2 ++ databases/py-records/Makefile | 21 +++++++++++++++++++++ databases/py-records/PLIST | 12 ++++++++++++ databases/py-records/distinfo | 6 ++++++ 4 files changed, 41 insertions(+) create mode 100644 databases/py-records/DESCR create mode 100644 databases/py-records/Makefile create mode 100644 databases/py-records/PLIST create mode 100644 databases/py-records/distinfo diff --git a/databases/py-records/DESCR b/databases/py-records/DESCR new file mode 100644 index 0000000000000..c57b4ebcc5820 --- /dev/null +++ b/databases/py-records/DESCR @@ -0,0 +1,2 @@ +Records is a very simple, but powerful, library for making raw SQL queries +to most relational databases. diff --git a/databases/py-records/Makefile b/databases/py-records/Makefile new file mode 100644 index 0000000000000..86f4c98b30c0b --- /dev/null +++ b/databases/py-records/Makefile @@ -0,0 +1,21 @@ +# $NetBSD$ + +DISTNAME= records-0.4.3 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= databases +MASTER_SITES= ${MASTER_SITE_PYPI:=r/records/} + +MAINTAINER= root@zta.lk +HOMEPAGE= https://pypi.python.org/pypi/records/ +COMMENT= SQL for Humans +LICENSE= isc + +WRKSRC= ${WRKDIR}/records-0.4.3 +USE_LANGUAGES= # none + +DEPENDS+= ${PYPKGPREFIX}-tablib>=0.10.0:../../textproc/py-tablib +DEPENDS+= ${PYPKGPREFIX}-sqlalchemy>=1.0.9:../../databases/py-sqlalchemy +DEPENDS+= ${PYPKGPREFIX}-docopt>=0.6.2:../../devel/py-docopt + +.include "../../lang/python/egg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/databases/py-records/PLIST b/databases/py-records/PLIST new file mode 100644 index 0000000000000..649110d73cb42 --- /dev/null +++ b/databases/py-records/PLIST @@ -0,0 +1,12 @@ +@comment $NetBSD$ +bin/records +${PYSITELIB}/records-0.4.3-py2.7.egg-info/PKG-INFO +${PYSITELIB}/records-0.4.3-py2.7.egg-info/SOURCES.txt +${PYSITELIB}/records-0.4.3-py2.7.egg-info/dependency_links.txt +${PYSITELIB}/records-0.4.3-py2.7.egg-info/entry_points.txt +${PYSITELIB}/records-0.4.3-py2.7.egg-info/not-zip-safe +${PYSITELIB}/records-0.4.3-py2.7.egg-info/requires.txt +${PYSITELIB}/records-0.4.3-py2.7.egg-info/top_level.txt +${PYSITELIB}/records.py +${PYSITELIB}/records.pyc +${PYSITELIB}/records.pyo diff --git a/databases/py-records/distinfo b/databases/py-records/distinfo new file mode 100644 index 0000000000000..2671e616560ca --- /dev/null +++ b/databases/py-records/distinfo @@ -0,0 +1,6 @@ +$NetBSD$ + +SHA1 (records-0.4.3.tar.gz) = 9eeaf9e0b71644b5034889d9811a35bde708cca3 +RMD160 (records-0.4.3.tar.gz) = 4767afbba4eedca4f0b2317221a004f3f7d105d9 +SHA512 (records-0.4.3.tar.gz) = 776283730ad2278460107fff1c10e30be852b6529e9144e5c62d5a986bbf0ba2b024ebec5a156a69a69840078b7e4562e1ca6ee85c59f3bf3dc10c77d99deb22 +Size (records-0.4.3.tar.gz) = 8455 bytes From b08afe6fd1b9feb42e04de1e68c625070fb6df2e Mon Sep 17 00:00:00 2001 From: tsutsui Date: Wed, 16 Mar 2016 15:34:01 +0000 Subject: [PATCH 0240/2457] Remove ruby-hashie1 package. The only user ruby-userstream just wants Hashie::Mash.new and works with the latest ruby-hashie, and there is no other user of this package. --- misc/Makefile | 3 +-- misc/ruby-hashie1/DESCR | 2 -- misc/ruby-hashie1/Makefile | 18 ------------------ misc/ruby-hashie1/PLIST | 29 ----------------------------- misc/ruby-hashie1/distinfo | 6 ------ 5 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 misc/ruby-hashie1/DESCR delete mode 100644 misc/ruby-hashie1/Makefile delete mode 100644 misc/ruby-hashie1/PLIST delete mode 100644 misc/ruby-hashie1/distinfo diff --git a/misc/Makefile b/misc/Makefile index 8d2f999a9d1e6..a6480c206f91b 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.465 2016/01/10 11:52:05 tsutsui Exp $ +# $NetBSD: Makefile,v 1.466 2016/03/16 15:34:01 tsutsui Exp $ # COMMENT= Miscellaneous utilities @@ -280,7 +280,6 @@ SUBDIR+= ruby-descendants_tracker SUBDIR+= ruby-equalizer SUBDIR+= ruby-gem_plugin SUBDIR+= ruby-hashie -SUBDIR+= ruby-hashie1 SUBDIR+= ruby-hashie2 SUBDIR+= ruby-launchy SUBDIR+= ruby-memoizable diff --git a/misc/ruby-hashie1/DESCR b/misc/ruby-hashie1/DESCR deleted file mode 100644 index 2f774cbeed194..0000000000000 --- a/misc/ruby-hashie1/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -Hashie is a small collection of tools that make hashes more powerful. -Currently includes Mash (Mocking Hash) and Dash (Discrete Hash). diff --git a/misc/ruby-hashie1/Makefile b/misc/ruby-hashie1/Makefile deleted file mode 100644 index 18fc16375a7b9..0000000000000 --- a/misc/ruby-hashie1/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: Makefile,v 1.1 2015/02/04 14:02:40 taca Exp $ -# - -DISTNAME= hashie-1.2.0 -PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/hashie/hashie1/} -CATEGORIES= misc - -MAINTAINER= tsutsui@NetBSD.org -HOMEPAGE= https://github.com/intridea/hashie -COMMENT= Small collection of tools that make hashes more powerful - - -LICENSE= mit - -USE_LANGUAGES= # none - -.include "../../lang/ruby/gem.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/misc/ruby-hashie1/PLIST b/misc/ruby-hashie1/PLIST deleted file mode 100644 index 122ecfb2eb3c5..0000000000000 --- a/misc/ruby-hashie1/PLIST +++ /dev/null @@ -1,29 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2015/02/04 14:02:40 taca Exp $ -${GEM_HOME}/cache/${GEM_NAME}.gem -${GEM_LIBDIR}/.document -${GEM_LIBDIR}/.gitignore -${GEM_LIBDIR}/.rspec -${GEM_LIBDIR}/.travis.yml -${GEM_LIBDIR}/Gemfile -${GEM_LIBDIR}/Gemfile.lock -${GEM_LIBDIR}/Guardfile -${GEM_LIBDIR}/LICENSE -${GEM_LIBDIR}/README.rdoc -${GEM_LIBDIR}/Rakefile -${GEM_LIBDIR}/hashie.gemspec -${GEM_LIBDIR}/lib/hashie.rb -${GEM_LIBDIR}/lib/hashie/clash.rb -${GEM_LIBDIR}/lib/hashie/dash.rb -${GEM_LIBDIR}/lib/hashie/hash.rb -${GEM_LIBDIR}/lib/hashie/hash_extensions.rb -${GEM_LIBDIR}/lib/hashie/mash.rb -${GEM_LIBDIR}/lib/hashie/trash.rb -${GEM_LIBDIR}/lib/hashie/version.rb -${GEM_LIBDIR}/spec/hashie/clash_spec.rb -${GEM_LIBDIR}/spec/hashie/dash_spec.rb -${GEM_LIBDIR}/spec/hashie/hash_spec.rb -${GEM_LIBDIR}/spec/hashie/mash_spec.rb -${GEM_LIBDIR}/spec/hashie/trash_spec.rb -${GEM_LIBDIR}/spec/spec.opts -${GEM_LIBDIR}/spec/spec_helper.rb -${GEM_HOME}/specifications/${GEM_NAME}.gemspec diff --git a/misc/ruby-hashie1/distinfo b/misc/ruby-hashie1/distinfo deleted file mode 100644 index 9748f332bde3f..0000000000000 --- a/misc/ruby-hashie1/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 23:49:50 agc Exp $ - -SHA1 (hashie-1.2.0.gem) = 0c716b850926cfedf018eef0b7ad6b35c8c9af9b -RMD160 (hashie-1.2.0.gem) = e3ada67027f7195dc60ce06956bcc1e0d574cc32 -SHA512 (hashie-1.2.0.gem) = d036833d098813e2135a4c7936ec1a983c74760852570c8ed45dd82ef1460c1ddb3f743477071ecd1e3f44d64546947328a5a98901694fde5d98d9f18f969ddf -Size (hashie-1.2.0.gem) = 15872 bytes From e6bab73f24c93543212efc7e7c5fc601634b6c05 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Wed, 16 Mar 2016 15:35:15 +0000 Subject: [PATCH 0241/2457] Removed misc/ruby-hashie1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index d863a6135cc2b..dd41eac8931b5 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1233 2016/03/16 14:22:56 mef Exp $ +$NetBSD: CHANGES-2016,v 1.1234 2016/03/16 15:35:15 tsutsui Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1632,3 +1632,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/ruby-eventmachine to 1.2.0.1 [taca 2016-03-16] Updated devel/ruby-curses-gem to 1.0.2 [taca 2016-03-16] Updated ham/trustedQSL to 2.2.1 [mef 2016-03-16] + Removed misc/ruby-hashie1 [tsutsui 2016-03-16] From 89cbbe41a85d3aa9a3854ccf185a2679ed5e04d4 Mon Sep 17 00:00:00 2001 From: Aleksej Lebedev Date: Wed, 16 Mar 2016 16:54:24 +0100 Subject: [PATCH 0242/2457] Added devel/proplib --- devel/proplib/DESCR | 4 +++ devel/proplib/Makefile | 25 +++++++++++++++++++ devel/proplib/PLIST | 23 +++++++++++++++++ devel/proplib/distinfo | 7 ++++++ devel/proplib/patches/patch-configure | 16 ++++++++++++ devel/proplib/patches/patch-src_prop_object.c | 17 +++++++++++++ 6 files changed, 92 insertions(+) create mode 100644 devel/proplib/DESCR create mode 100644 devel/proplib/Makefile create mode 100644 devel/proplib/PLIST create mode 100644 devel/proplib/distinfo create mode 100644 devel/proplib/patches/patch-configure create mode 100644 devel/proplib/patches/patch-src_prop_object.c diff --git a/devel/proplib/DESCR b/devel/proplib/DESCR new file mode 100644 index 0000000000000..07381f5ab08cb --- /dev/null +++ b/devel/proplib/DESCR @@ -0,0 +1,4 @@ +The proplib library provides an abstract interface for creating and +manipulating property lists in C. Property lists have object types for boolean +values, opaque data, numbers, and strings. Structure is provided by the array +and dictionary collection types. diff --git a/devel/proplib/Makefile b/devel/proplib/Makefile new file mode 100644 index 0000000000000..ad02ca95e2db2 --- /dev/null +++ b/devel/proplib/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.2 2015/06/28 14:53:16 kirussel Exp $ + +DISTNAME= proplib-0.6.4 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GITHUB:=xtraeme/} +GITHUB_PROJECT= portableproplib +GITHUB_TAG= 0.6.4 + +MAINTAINER= root@zta.lk +HOMEPAGE= https://github.com/xtraeme/portableproplib/ +COMMENT= Portable Property container object library +LICENSE= modified-bsd + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= autoconf automake autoreconf pkg-config + +PKGCONFIG_OVERRIDE+= proplib.pc.in + +pre-configure: + cd ${WRKSRC} && autoreconf -fi + +BUILDLINK_ABI_DEPENDS.zlib+= zlib>=1.2.3 +.include "../../devel/zlib/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/proplib/PLIST b/devel/proplib/PLIST new file mode 100644 index 0000000000000..61d64cd3cf7a4 --- /dev/null +++ b/devel/proplib/PLIST @@ -0,0 +1,23 @@ +@comment $NetBSD: PLIST,v 1.1 2015/04/19 17:56:54 realzhtw Exp $ +include/prop/prop_array.h +include/prop/prop_bool.h +include/prop/prop_data.h +include/prop/prop_dictionary.h +include/prop/prop_ingest.h +include/prop/prop_number.h +include/prop/prop_object.h +include/prop/prop_string.h +include/prop/proplib.h +lib/libprop.la +lib/pkgconfig/proplib.pc +man/man3/prop_array.3 +man/man3/prop_array_util.3 +man/man3/prop_bool.3 +man/man3/prop_data.3 +man/man3/prop_dictionary.3 +man/man3/prop_dictionary_util.3 +man/man3/prop_ingest.3 +man/man3/prop_number.3 +man/man3/prop_object.3 +man/man3/prop_string.3 +man/man3/proplib.3 diff --git a/devel/proplib/distinfo b/devel/proplib/distinfo new file mode 100644 index 0000000000000..5af7a7997d089 --- /dev/null +++ b/devel/proplib/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.2 2015/06/28 14:53:16 kirussel Exp $ + +SHA1 (proplib-0.6.4.tar.gz) = d115cf16d1e2545d63db20a9d3f2233c3839f48c +RMD160 (proplib-0.6.4.tar.gz) = a3cc221feacbb11d1b194ba54ca1ccc800ad00eb +Size (proplib-0.6.4.tar.gz) = 76263 bytes +SHA1 (patch-configure) = 708be1b61702b2106ee3def5e66d940dab40beea +SHA1 (patch-src_prop_object.c) = e201e838d42090a485686663ee0f333a0e34d95c diff --git a/devel/proplib/patches/patch-configure b/devel/proplib/patches/patch-configure new file mode 100644 index 0000000000000..ee5371a996704 --- /dev/null +++ b/devel/proplib/patches/patch-configure @@ -0,0 +1,16 @@ +$NetBSD: patch-configure,v 1.1 2015/06/28 14:53:16 kirussel Exp $ + +Add a check for the presence of fdatasync() in the header files. This change +has already been pushed upstream: + https://github.com/xtraeme/portableproplib/pull/1 + +--- configure.ac.orig 2014-05-17 18:15:13.000000000 +0000 ++++ configure.ac +@@ -52,6 +52,7 @@ AC_CONFIG_MACRO_DIR([m4]) + + AC_CHECK_HEADERS(limits.h stddef.h fcntl.h) + AC_CHECK_FUNCS(memmove memset munmap strchr strtoul stroull strlcat fdatasync) ++AC_CHECK_DECLS(fdatasync, [], [], [#include ]) + AC_CHECK_LIB(pthread, pthread_mutex_init, , + AC_MSG_ERROR(*** A POSIX threads library is required, aborting ***)) + AC_CHECK_LIB(z, inflate, , diff --git a/devel/proplib/patches/patch-src_prop_object.c b/devel/proplib/patches/patch-src_prop_object.c new file mode 100644 index 0000000000000..97f7ba3fe725c --- /dev/null +++ b/devel/proplib/patches/patch-src_prop_object.c @@ -0,0 +1,17 @@ +$NetBSD: patch-src_prop_object.c,v 1.1 2015/06/28 14:53:16 kirussel Exp $ + +Only use fdatasync() if it is in the header files and you can link with it. +This change has alreay been pushed upstream: + https://github.com/xtraeme/portableproplib/pull/1 + +--- src/prop_object.c.orig 2014-05-17 18:15:13.000000000 +0000 ++++ src/prop_object.c +@@ -859,7 +859,7 @@ _prop_object_externalize_write_file(cons + goto bad; + } + +-#ifdef HAVE_FDATASYNC ++#if defined(HAVE_FDATASYNC) && HAVE_DECL_FDATASYNC + if (fdatasync(fd) == -1) + #else + if (fsync(fd) == -1) From 6f05863a3b1a8ab44a19c35c835cc21f95054eb6 Mon Sep 17 00:00:00 2001 From: khorben Date: Wed, 16 Mar 2016 17:21:45 +0000 Subject: [PATCH 0243/2457] Add support for CFLAGS and LDFLAGS This fixes building with PKGSRC_MKPIE. --- net/tightvncviewer/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile index 74804107ad71e..14280e971c6cc 100644 --- a/net/tightvncviewer/Makefile +++ b/net/tightvncviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2012/10/23 17:19:13 asau Exp $ +# $NetBSD: Makefile,v 1.34 2016/03/16 17:21:45 khorben Exp $ DISTNAME= tightvnc-1.3.10 PKGNAME= ${DISTNAME:S/tightvnc/tightvncviewer/} @@ -17,6 +17,9 @@ WRKSRC= ${WRKDIR}/vnc_unixsrc CRYPTO= yes USE_IMAKE= yes +MAKE_FLAGS+= CCOPTIONS=${CFLAGS:Q} +MAKE_FLAGS+= LOCAL_LDFLAGS=${LDFLAGS:Q} + CONFIGURE_DIRS= libvncauth CONFIGURE_DIRS+= vncviewer BUILD_DIRS= ${CONFIGURE_DIRS} From 1ef4a48a3a13ba2ef12f5e71eb6a4ecbf50089d5 Mon Sep 17 00:00:00 2001 From: sevan Date: Wed, 16 Mar 2016 19:38:52 +0000 Subject: [PATCH 0244/2457] Patch for CVE-2016-2324 Obtained via Debian Security Tracker https://security-tracker.debian.org/tracker/CVE-2016-2324 https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d Bump pkgrev --- devel/git-base/Makefile | 3 +- devel/git-base/distinfo | 12 +- .../patches/patch-builtin_pack-objects.c | 41 ++++++ .../git-base/patches/patch-builtin_rev-list.c | 38 ++++++ devel/git-base/patches/patch-http-push.c | 82 ++++++++++++ devel/git-base/patches/patch-list-objects.c | 126 ++++++++++++++++++ devel/git-base/patches/patch-list-objects.h | 17 +++ .../patches/patch-pack-bitmap-write.c | 18 +++ devel/git-base/patches/patch-pack-bitmap.c | 42 ++++++ devel/git-base/patches/patch-reachable.c | 26 ++++ devel/git-base/patches/patch-revision.c | 82 ++++++++++++ devel/git-base/patches/patch-revision.h | 27 ++++ 12 files changed, 512 insertions(+), 2 deletions(-) create mode 100644 devel/git-base/patches/patch-builtin_pack-objects.c create mode 100644 devel/git-base/patches/patch-builtin_rev-list.c create mode 100644 devel/git-base/patches/patch-http-push.c create mode 100644 devel/git-base/patches/patch-list-objects.c create mode 100644 devel/git-base/patches/patch-list-objects.h create mode 100644 devel/git-base/patches/patch-pack-bitmap-write.c create mode 100644 devel/git-base/patches/patch-pack-bitmap.c create mode 100644 devel/git-base/patches/patch-reachable.c create mode 100644 devel/git-base/patches/patch-revision.c create mode 100644 devel/git-base/patches/patch-revision.h diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile index 3c87beb40bd80..969ab74377531 100644 --- a/devel/git-base/Makefile +++ b/devel/git-base/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2016/03/12 11:33:32 adam Exp $ +# $NetBSD: Makefile,v 1.23 2016/03/16 19:38:52 sevan Exp $ +PKGREVISION= 1 .include "../../devel/git/Makefile.common" PKGNAME= git-base-${GIT_VERSION} diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo index 3eccff1bd4272..9e437e298a9e0 100644 --- a/devel/git-base/distinfo +++ b/devel/git-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.45 2016/03/12 11:33:32 adam Exp $ +$NetBSD: distinfo,v 1.46 2016/03/16 19:38:52 sevan Exp $ SHA1 (git-2.7.3.tar.xz) = d7be9af73cc56c606e0744beb0091b612b416909 RMD160 (git-2.7.3.tar.xz) = 5111811158362bbc6d4e0a97ec8df8e56c1bd674 @@ -11,5 +11,15 @@ SHA1 (patch-af) = 06460f220b4703a1ff98809006ec1aed5017bb23 SHA1 (patch-ag) = 4f0b9a5745203ea7ef369c8272b3ea7c644762f0 SHA1 (patch-ah) = f22a2160631fb624e9e20616c68ad1a4aa2bebc7 SHA1 (patch-ai) = 56b63d4790a11f5eb128186ad5efdd1bcf102f2e +SHA1 (patch-builtin_pack-objects.c) = 8038e9fca76f465c87d6e4265cb657965fca5fee +SHA1 (patch-builtin_rev-list.c) = 52605a6e05e62e45a161e09dba5cf0ae448d642c SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886 +SHA1 (patch-http-push.c) = ff931b9043ca8ddedc336d27efe8102e5372b66a +SHA1 (patch-list-objects.c) = 0250fb74b635d27694dc8e7c99f48a0ba1f23ab7 +SHA1 (patch-list-objects.h) = e341343431e6b64bb6bf4463d632f50107110f37 +SHA1 (patch-pack-bitmap-write.c) = 31492718f3812a9229d33ebe4b8bfcebce0e5805 +SHA1 (patch-pack-bitmap.c) = 76c23b6b328a6b113b58ef026231623d73d1f088 +SHA1 (patch-reachable.c) = b58b59073662b74bbae02f83a5e05c29dee76185 +SHA1 (patch-revision.c) = d9b372b3930578817f5517cc76639fce832a0c58 +SHA1 (patch-revision.h) = 3258d405f6d2d3e5103d1e34cbcefec3da767298 SHA1 (patch-wrapper.c) = 1fb629ec301d0431cb5bebd716b1c3a7ae45577f diff --git a/devel/git-base/patches/patch-builtin_pack-objects.c b/devel/git-base/patches/patch-builtin_pack-objects.c new file mode 100644 index 0000000000000..184b0587f5de3 --- /dev/null +++ b/devel/git-base/patches/patch-builtin_pack-objects.c @@ -0,0 +1,41 @@ +$NetBSD: patch-builtin_pack-objects.c,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- builtin/pack-objects.c.orig 2016-03-10 22:11:15.000000000 +0000 ++++ builtin/pack-objects.c +@@ -2285,21 +2285,11 @@ static void show_commit(struct commit *c + index_commit_for_bitmap(commit); + } + +-static void show_object(struct object *obj, +- const struct name_path *path, const char *last, +- void *data) ++static void show_object(struct object *obj, const char *name, void *data) + { +- char *name = path_name(path, last); +- + add_preferred_base_object(name); + add_object_entry(obj->oid.hash, obj->type, name, 0); + obj->flags |= OBJECT_ADDED; +- +- /* +- * We will have generated the hash from the name, +- * but not saved a pointer to it - we can free it +- */ +- free((char *)name); + } + + static void show_edge(struct commit *commit) +@@ -2481,8 +2471,7 @@ static int get_object_list_from_bitmap(s + } + + static void record_recent_object(struct object *obj, +- const struct name_path *path, +- const char *last, ++ const char *name, + void *data) + { + sha1_array_append(&recent_objects, obj->oid.hash); diff --git a/devel/git-base/patches/patch-builtin_rev-list.c b/devel/git-base/patches/patch-builtin_rev-list.c new file mode 100644 index 0000000000000..7d81551c85f3e --- /dev/null +++ b/devel/git-base/patches/patch-builtin_rev-list.c @@ -0,0 +1,38 @@ +$NetBSD: patch-builtin_rev-list.c,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- builtin/rev-list.c.orig 2016-03-10 22:11:15.000000000 +0000 ++++ builtin/rev-list.c +@@ -177,9 +177,7 @@ static void finish_commit(struct commit + free_commit_buffer(commit); + } + +-static void finish_object(struct object *obj, +- const struct name_path *path, const char *name, +- void *cb_data) ++static void finish_object(struct object *obj, const char *name, void *cb_data) + { + struct rev_list_info *info = cb_data; + if (obj->type == OBJ_BLOB && !has_object_file(&obj->oid)) +@@ -188,15 +186,13 @@ static void finish_object(struct object + parse_object(obj->oid.hash); + } + +-static void show_object(struct object *obj, +- const struct name_path *path, const char *component, +- void *cb_data) ++static void show_object(struct object *obj, const char *name, void *cb_data) + { + struct rev_list_info *info = cb_data; +- finish_object(obj, path, component, cb_data); ++ finish_object(obj, name, cb_data); + if (info->flags & REV_LIST_QUIET) + return; +- show_object_with_name(stdout, obj, path, component); ++ show_object_with_name(stdout, obj, name); + } + + static void show_edge(struct commit *commit) diff --git a/devel/git-base/patches/patch-http-push.c b/devel/git-base/patches/patch-http-push.c new file mode 100644 index 0000000000000..cafd6d91920cc --- /dev/null +++ b/devel/git-base/patches/patch-http-push.c @@ -0,0 +1,82 @@ +$NetBSD: patch-http-push.c,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- http-push.c.orig 2016-03-10 22:11:15.000000000 +0000 ++++ http-push.c +@@ -1277,9 +1277,7 @@ static struct object_list **add_one_obje + } + + static struct object_list **process_blob(struct blob *blob, +- struct object_list **p, +- struct name_path *path, +- const char *name) ++ struct object_list **p) + { + struct object *obj = &blob->object; + +@@ -1293,14 +1291,11 @@ static struct object_list **process_blob + } + + static struct object_list **process_tree(struct tree *tree, +- struct object_list **p, +- struct name_path *path, +- const char *name) ++ struct object_list **p) + { + struct object *obj = &tree->object; + struct tree_desc desc; + struct name_entry entry; +- struct name_path me; + + obj->flags |= LOCAL; + +@@ -1310,21 +1305,17 @@ static struct object_list **process_tree + die("bad tree object %s", oid_to_hex(&obj->oid)); + + obj->flags |= SEEN; +- name = xstrdup(name); + p = add_one_object(obj, p); +- me.up = path; +- me.elem = name; +- me.elem_len = strlen(name); + + init_tree_desc(&desc, tree->buffer, tree->size); + + while (tree_entry(&desc, &entry)) + switch (object_type(entry.mode)) { + case OBJ_TREE: +- p = process_tree(lookup_tree(entry.sha1), p, &me, name); ++ p = process_tree(lookup_tree(entry.sha1), p); + break; + case OBJ_BLOB: +- p = process_blob(lookup_blob(entry.sha1), p, &me, name); ++ p = process_blob(lookup_blob(entry.sha1), p); + break; + default: + /* Subproject commit - not in this repository */ +@@ -1343,7 +1334,7 @@ static int get_delta(struct rev_info *re + int count = 0; + + while ((commit = get_revision(revs)) != NULL) { +- p = process_tree(commit->tree, p, NULL, ""); ++ p = process_tree(commit->tree, p); + commit->object.flags |= LOCAL; + if (!(commit->object.flags & UNINTERESTING)) + count += add_send_request(&commit->object, lock); +@@ -1362,11 +1353,11 @@ static int get_delta(struct rev_info *re + continue; + } + if (obj->type == OBJ_TREE) { +- p = process_tree((struct tree *)obj, p, NULL, name); ++ p = process_tree((struct tree *)obj, p); + continue; + } + if (obj->type == OBJ_BLOB) { +- p = process_blob((struct blob *)obj, p, NULL, name); ++ p = process_blob((struct blob *)obj, p); + continue; + } + die("unknown pending object %s (%s)", oid_to_hex(&obj->oid), name); diff --git a/devel/git-base/patches/patch-list-objects.c b/devel/git-base/patches/patch-list-objects.c new file mode 100644 index 0000000000000..c6a6b5deff014 --- /dev/null +++ b/devel/git-base/patches/patch-list-objects.c @@ -0,0 +1,126 @@ +$NetBSD: patch-list-objects.c,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- list-objects.c.orig 2016-03-10 22:11:15.000000000 +0000 ++++ list-objects.c +@@ -11,11 +11,12 @@ + static void process_blob(struct rev_info *revs, + struct blob *blob, + show_object_fn show, +- struct name_path *path, ++ struct strbuf *path, + const char *name, + void *cb_data) + { + struct object *obj = &blob->object; ++ size_t pathlen; + + if (!revs->blob_objects) + return; +@@ -24,7 +25,11 @@ static void process_blob(struct rev_info + if (obj->flags & (UNINTERESTING | SEEN)) + return; + obj->flags |= SEEN; +- show(obj, path, name, cb_data); ++ ++ pathlen = path->len; ++ strbuf_addstr(path, name); ++ show(obj, path->buf, cb_data); ++ strbuf_setlen(path, pathlen); + } + + /* +@@ -52,7 +57,7 @@ static void process_blob(struct rev_info + static void process_gitlink(struct rev_info *revs, + const unsigned char *sha1, + show_object_fn show, +- struct name_path *path, ++ struct strbuf *path, + const char *name, + void *cb_data) + { +@@ -62,7 +67,6 @@ static void process_gitlink(struct rev_i + static void process_tree(struct rev_info *revs, + struct tree *tree, + show_object_fn show, +- struct name_path *path, + struct strbuf *base, + const char *name, + void *cb_data) +@@ -70,7 +74,6 @@ static void process_tree(struct rev_info + struct object *obj = &tree->object; + struct tree_desc desc; + struct name_entry entry; +- struct name_path me; + enum interesting match = revs->diffopt.pathspec.nr == 0 ? + all_entries_interesting: entry_not_interesting; + int baselen = base->len; +@@ -86,17 +89,12 @@ static void process_tree(struct rev_info + return; + die("bad tree object %s", oid_to_hex(&obj->oid)); + } ++ + obj->flags |= SEEN; +- show(obj, path, name, cb_data); +- me.up = path; +- me.elem = name; +- me.elem_len = strlen(name); +- +- if (!match) { +- strbuf_addstr(base, name); +- if (base->len) +- strbuf_addch(base, '/'); +- } ++ strbuf_addstr(base, name); ++ show(obj, base->buf, cb_data); ++ if (base->len) ++ strbuf_addch(base, '/'); + + init_tree_desc(&desc, tree->buffer, tree->size); + +@@ -113,16 +111,16 @@ static void process_tree(struct rev_info + if (S_ISDIR(entry.mode)) + process_tree(revs, + lookup_tree(entry.sha1), +- show, &me, base, entry.path, ++ show, base, entry.path, + cb_data); + else if (S_ISGITLINK(entry.mode)) + process_gitlink(revs, entry.sha1, +- show, &me, entry.path, ++ show, base, entry.path, + cb_data); + else + process_blob(revs, + lookup_blob(entry.sha1), +- show, &me, entry.path, ++ show, base, entry.path, + cb_data); + } + strbuf_setlen(base, baselen); +@@ -213,19 +211,19 @@ void traverse_commit_list(struct rev_inf + continue; + if (obj->type == OBJ_TAG) { + obj->flags |= SEEN; +- show_object(obj, NULL, name, data); ++ show_object(obj, name, data); + continue; + } + if (!path) + path = ""; + if (obj->type == OBJ_TREE) { + process_tree(revs, (struct tree *)obj, show_object, +- NULL, &base, path, data); ++ &base, path, data); + continue; + } + if (obj->type == OBJ_BLOB) { + process_blob(revs, (struct blob *)obj, show_object, +- NULL, path, data); ++ &base, path, data); + continue; + } + die("unknown pending object %s (%s)", diff --git a/devel/git-base/patches/patch-list-objects.h b/devel/git-base/patches/patch-list-objects.h new file mode 100644 index 0000000000000..cec1fffbcacb5 --- /dev/null +++ b/devel/git-base/patches/patch-list-objects.h @@ -0,0 +1,17 @@ +$NetBSD: patch-list-objects.h,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- list-objects.h.orig 2016-03-10 22:11:15.000000000 +0000 ++++ list-objects.h +@@ -2,7 +2,7 @@ + #define LIST_OBJECTS_H + + typedef void (*show_commit_fn)(struct commit *, void *); +-typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *); ++typedef void (*show_object_fn)(struct object *, const char *, void *); + void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *); + + typedef void (*show_edge_fn)(struct commit *); diff --git a/devel/git-base/patches/patch-pack-bitmap-write.c b/devel/git-base/patches/patch-pack-bitmap-write.c new file mode 100644 index 0000000000000..c9aabc09cc3df --- /dev/null +++ b/devel/git-base/patches/patch-pack-bitmap-write.c @@ -0,0 +1,18 @@ +$NetBSD: patch-pack-bitmap-write.c,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- pack-bitmap-write.c.orig 2016-03-10 22:11:15.000000000 +0000 ++++ pack-bitmap-write.c +@@ -148,8 +148,7 @@ static uint32_t find_object_pos(const un + return entry->in_pack_pos; + } + +-static void show_object(struct object *object, const struct name_path *path, +- const char *last, void *data) ++static void show_object(struct object *object, const char *name, void *data) + { + struct bitmap *base = data; + bitmap_set(base, find_object_pos(object->oid.hash)); diff --git a/devel/git-base/patches/patch-pack-bitmap.c b/devel/git-base/patches/patch-pack-bitmap.c new file mode 100644 index 0000000000000..a25cb6439d5c6 --- /dev/null +++ b/devel/git-base/patches/patch-pack-bitmap.c @@ -0,0 +1,42 @@ +$NetBSD: patch-pack-bitmap.c,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- pack-bitmap.c.orig 2016-03-10 22:11:15.000000000 +0000 ++++ pack-bitmap.c +@@ -417,19 +417,15 @@ static int ext_index_add_object(struct o + return bitmap_pos + bitmap_git.pack->num_objects; + } + +-static void show_object(struct object *object, const struct name_path *path, +- const char *last, void *data) ++static void show_object(struct object *object, const char *name, void *data) + { + struct bitmap *base = data; + int bitmap_pos; + + bitmap_pos = bitmap_position(object->oid.hash); + +- if (bitmap_pos < 0) { +- char *name = path_name(path, last); ++ if (bitmap_pos < 0) + bitmap_pos = ext_index_add_object(object, name); +- free(name); +- } + + bitmap_set(base, bitmap_pos); + } +@@ -897,9 +893,8 @@ struct bitmap_test_data { + size_t seen; + }; + +-static void test_show_object(struct object *object, +- const struct name_path *path, +- const char *last, void *data) ++static void test_show_object(struct object *object, const char *name, ++ void *data) + { + struct bitmap_test_data *tdata = data; + int bitmap_pos; diff --git a/devel/git-base/patches/patch-reachable.c b/devel/git-base/patches/patch-reachable.c new file mode 100644 index 0000000000000..b4ef874ce8cb6 --- /dev/null +++ b/devel/git-base/patches/patch-reachable.c @@ -0,0 +1,26 @@ +$NetBSD: patch-reachable.c,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- reachable.c.orig 2016-03-10 22:11:15.000000000 +0000 ++++ reachable.c +@@ -43,15 +43,14 @@ static int add_one_ref(const char *path, + * The traversal will have already marked us as SEEN, so we + * only need to handle any progress reporting here. + */ +-static void mark_object(struct object *obj, const struct name_path *path, +- const char *name, void *data) ++static void mark_object(struct object *obj, const char *name, void *data) + { + update_progress(data); + } + + static void mark_commit(struct commit *c, void *data) + { +- mark_object(&c->object, NULL, NULL, data); ++ mark_object(&c->object, NULL, data); + } + + struct recent_data { diff --git a/devel/git-base/patches/patch-revision.c b/devel/git-base/patches/patch-revision.c new file mode 100644 index 0000000000000..dc2783ce519c0 --- /dev/null +++ b/devel/git-base/patches/patch-revision.c @@ -0,0 +1,82 @@ +$NetBSD: patch-revision.c,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- revision.c.orig 2016-03-10 22:11:15.000000000 +0000 ++++ revision.c +@@ -25,69 +25,13 @@ volatile show_early_output_fn_t show_ear + static const char *term_bad; + static const char *term_good; + +-char *path_name(const struct name_path *path, const char *name) ++void show_object_with_name(FILE *out, struct object *obj, const char *name) + { +- const struct name_path *p; +- char *n, *m; +- int nlen = strlen(name); +- int len = nlen + 1; +- +- for (p = path; p; p = p->up) { +- if (p->elem_len) +- len += p->elem_len + 1; +- } +- n = xmalloc(len); +- m = n + len - (nlen + 1); +- memcpy(m, name, nlen + 1); +- for (p = path; p; p = p->up) { +- if (p->elem_len) { +- m -= p->elem_len + 1; +- memcpy(m, p->elem, p->elem_len); +- m[p->elem_len] = '/'; +- } +- } +- return n; +-} +- +-static int show_path_component_truncated(FILE *out, const char *name, int len) +-{ +- int cnt; +- for (cnt = 0; cnt < len; cnt++) { +- int ch = name[cnt]; +- if (!ch || ch == '\n') +- return -1; +- fputc(ch, out); +- } +- return len; +-} +- +-static int show_path_truncated(FILE *out, const struct name_path *path) +-{ +- int emitted, ours; +- +- if (!path) +- return 0; +- emitted = show_path_truncated(out, path->up); +- if (emitted < 0) +- return emitted; +- if (emitted) +- fputc('/', out); +- ours = show_path_component_truncated(out, path->elem, path->elem_len); +- if (ours < 0) +- return ours; +- return ours || emitted; +-} +- +-void show_object_with_name(FILE *out, struct object *obj, +- const struct name_path *path, const char *component) +-{ +- struct name_path leaf; +- leaf.up = (struct name_path *)path; +- leaf.elem = component; +- leaf.elem_len = strlen(component); ++ const char *p; + + fprintf(out, "%s ", oid_to_hex(&obj->oid)); +- show_path_truncated(out, &leaf); ++ for (p = name; *p && *p != '\n'; p++) ++ fputc(*p, out); + fputc('\n', out); + } + diff --git a/devel/git-base/patches/patch-revision.h b/devel/git-base/patches/patch-revision.h new file mode 100644 index 0000000000000..005ea650d5482 --- /dev/null +++ b/devel/git-base/patches/patch-revision.h @@ -0,0 +1,27 @@ +$NetBSD: patch-revision.h,v 1.1 2016/03/16 19:38:52 sevan Exp $ + +CVE-2016-2324 via Debian +https://security-tracker.debian.org/tracker/CVE-2016-2324 +https://github.com/git/git/commit/9831e92bfa833ee9c0ce464bbc2f941ae6c2698d + +--- revision.h.orig 2016-03-10 22:11:15.000000000 +0000 ++++ revision.h +@@ -257,16 +257,9 @@ extern void put_revision_mark(const stru + extern void mark_parents_uninteresting(struct commit *commit); + extern void mark_tree_uninteresting(struct tree *tree); + +-struct name_path { +- struct name_path *up; +- int elem_len; +- const char *elem; +-}; +- +-char *path_name(const struct name_path *path, const char *name); ++char *path_name(struct strbuf *path, const char *name); + +-extern void show_object_with_name(FILE *, struct object *, +- const struct name_path *, const char *); ++extern void show_object_with_name(FILE *, struct object *, const char *); + + extern void add_pending_object(struct rev_info *revs, + struct object *obj, const char *name); From e927bb5f6846e16381196712567fd1697f2f45d9 Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 16 Mar 2016 19:55:55 +0000 Subject: [PATCH 0245/2457] Update to 2.1.1 Changelog: Release 2.1.1 Sat March 12 2016 Security fixes: #582: CVE-2015-1283 - Multiple integer overflows in XML_GetBuffer Bug fixes: #502: Fix potential null pointer dereference #520: Symbol XML_SetHashSalt was not exported Output of "xmlwf -h" was incomplete Other changes #503: Document behavior of calling XML_SetHashSalt with salt 0 Minor improvements to man page xmlwf(1) Improvements to the experimental CMake build system libtool now invoked with --verbose --- textproc/expat/Makefile | 6 +- textproc/expat/PLIST | 3 +- textproc/expat/buildlink3.mk | 6 +- textproc/expat/distinfo | 11 ++-- textproc/expat/patches/patch-xmlparse.c | 78 ------------------------- 5 files changed, 13 insertions(+), 91 deletions(-) delete mode 100644 textproc/expat/patches/patch-xmlparse.c diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile index e0dbb1c1e427b..2e37259bf104c 100644 --- a/textproc/expat/Makefile +++ b/textproc/expat/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.30 2016/01/01 01:29:30 ryoon Exp $ +# $NetBSD: Makefile,v 1.31 2016/03/16 19:55:55 ryoon Exp $ # -DISTNAME= expat-2.1.0 -PKGREVISION= 2 +DISTNAME= expat-2.1.1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=expat/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://expat.sourceforge.net/ diff --git a/textproc/expat/PLIST b/textproc/expat/PLIST index 42d13107e9cca..95319796bff46 100644 --- a/textproc/expat/PLIST +++ b/textproc/expat/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.9 2012/04/01 08:52:43 obache Exp $ +@comment $NetBSD: PLIST,v 1.10 2016/03/16 19:55:55 ryoon Exp $ bin/xmlwf include/expat.h +include/expat_config.h include/expat_external.h lib/libexpat.la lib/pkgconfig/expat.pc diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk index 1630d31c3da3f..fe24c19936ee0 100644 --- a/textproc/expat/buildlink3.mk +++ b/textproc/expat/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.19 2009/03/20 19:25:28 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2016/03/16 19:55:55 ryoon Exp $ BUILDLINK_TREE+= expat .if !defined(EXPAT_BUILDLINK3_MK) EXPAT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.expat+= expat>=1.95.7 -BUILDLINK_ABI_DEPENDS.expat+= expat>=2.0.0nb1 +BUILDLINK_API_DEPENDS.expat+= expat>=2.1.1 +BUILDLINK_ABI_DEPENDS.expat+= expat>=2.1.1 BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat .endif # EXPAT_BUILDLINK3_MK diff --git a/textproc/expat/distinfo b/textproc/expat/distinfo index 020955e65770b..52c126f88681b 100644 --- a/textproc/expat/distinfo +++ b/textproc/expat/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.23 2016/01/01 01:29:30 ryoon Exp $ +$NetBSD: distinfo,v 1.24 2016/03/16 19:55:55 ryoon Exp $ -SHA1 (expat-2.1.0.tar.gz) = b08197d146930a5543a7b99e871cba3da614f6f0 -RMD160 (expat-2.1.0.tar.gz) = bffca083d29fe7688f106a902ef9b909c3321c5d -SHA512 (expat-2.1.0.tar.gz) = 2a9ad2b44b87b84087979fe4114d661838df3b03dbdcb74d590cb74096bf35ce9d5a86617b0941a2655ea441a94537bcbcd78252da92342238823be36de2d09d -Size (expat-2.1.0.tar.gz) = 562616 bytes +SHA1 (expat-2.1.1.tar.bz2) = ff91419882ac52151050dad0ee8190645fbeee08 +RMD160 (expat-2.1.1.tar.bz2) = a1741237726c0b48d7a3f03943c76826ee6f3e48 +SHA512 (expat-2.1.1.tar.bz2) = 088e2ef3434f2affd4fc79fe46f0e9826b9b4c3931ddc780cd18892f1cd1e11365169c6807f45916a56bb6abcc627dcd17a23f970be0bf464f048f5be2713628 +Size (expat-2.1.1.tar.bz2) = 405103 bytes SHA1 (patch-Makefile.in) = 196837e69acda50ce813c198b730a9ba18015196 -SHA1 (patch-xmlparse.c) = e6e3697102b2f86d4a0824b1f6498e0ec435b9e4 diff --git a/textproc/expat/patches/patch-xmlparse.c b/textproc/expat/patches/patch-xmlparse.c deleted file mode 100644 index b89c9d7ccf2a2..0000000000000 --- a/textproc/expat/patches/patch-xmlparse.c +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-xmlparse.c,v 1.1 2015/08/04 08:47:19 tnn Exp $ - -CVE-2015-1283 heap based buffer overflow in expat. - -https://hg.mozilla.org/releases/mozilla-esr31/raw-diff/2f3e78643f5c/parser/expat/lib/xmlparse.c - -diff --git a/parser/expat/lib/xmlparse.c b/parser/expat/lib/xmlparse.c ---- lib/xmlparse.c -+++ lib/xmlparse.c -@@ -1646,29 +1646,40 @@ XML_ParseBuffer(XML_Parser parser, int l - XmlUpdatePosition(encoding, positionPtr, bufferPtr, &position); - positionPtr = bufferPtr; - return result; - } - - void * XMLCALL - XML_GetBuffer(XML_Parser parser, int len) - { -+/* BEGIN MOZILLA CHANGE (sanity check len) */ -+ if (len < 0) { -+ errorCode = XML_ERROR_NO_MEMORY; -+ return NULL; -+ } -+/* END MOZILLA CHANGE */ - switch (ps_parsing) { - case XML_SUSPENDED: - errorCode = XML_ERROR_SUSPENDED; - return NULL; - case XML_FINISHED: - errorCode = XML_ERROR_FINISHED; - return NULL; - default: ; - } - - if (len > bufferLim - bufferEnd) { -- /* FIXME avoid integer overflow */ - int neededSize = len + (int)(bufferEnd - bufferPtr); -+/* BEGIN MOZILLA CHANGE (sanity check neededSize) */ -+ if (neededSize < 0) { -+ errorCode = XML_ERROR_NO_MEMORY; -+ return NULL; -+ } -+/* END MOZILLA CHANGE */ - #ifdef XML_CONTEXT_BYTES - int keep = (int)(bufferPtr - buffer); - - if (keep > XML_CONTEXT_BYTES) - keep = XML_CONTEXT_BYTES; - neededSize += keep; - #endif /* defined XML_CONTEXT_BYTES */ - if (neededSize <= bufferLim - buffer) { -@@ -1687,17 +1698,25 @@ XML_GetBuffer(XML_Parser parser, int len - } - else { - char *newBuf; - int bufferSize = (int)(bufferLim - bufferPtr); - if (bufferSize == 0) - bufferSize = INIT_BUFFER_SIZE; - do { - bufferSize *= 2; -- } while (bufferSize < neededSize); -+/* BEGIN MOZILLA CHANGE (prevent infinite loop on overflow) */ -+ } while (bufferSize < neededSize && bufferSize > 0); -+/* END MOZILLA CHANGE */ -+/* BEGIN MOZILLA CHANGE (sanity check bufferSize) */ -+ if (bufferSize <= 0) { -+ errorCode = XML_ERROR_NO_MEMORY; -+ return NULL; -+ } -+/* END MOZILLA CHANGE */ - newBuf = (char *)MALLOC(bufferSize); - if (newBuf == 0) { - errorCode = XML_ERROR_NO_MEMORY; - return NULL; - } - bufferLim = newBuf + bufferSize; - #ifdef XML_CONTEXT_BYTES - if (bufferPtr) { From c6b5b8b1ee4bd4bd9e9f7e2fd92133747498fdc5 Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 16 Mar 2016 19:56:34 +0000 Subject: [PATCH 0246/2457] Updated textproc/expat to 2.1.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index dd41eac8931b5..8a389a04187c3 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1234 2016/03/16 15:35:15 tsutsui Exp $ +$NetBSD: CHANGES-2016,v 1.1235 2016/03/16 19:56:34 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1633,3 +1633,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/ruby-curses-gem to 1.0.2 [taca 2016-03-16] Updated ham/trustedQSL to 2.2.1 [mef 2016-03-16] Removed misc/ruby-hashie1 [tsutsui 2016-03-16] + Updated textproc/expat to 2.1.1 [ryoon 2016-03-16] From 6b297a39d4cdb72d13615f7f76a049068d27b8eb Mon Sep 17 00:00:00 2001 From: tnn Date: Wed, 16 Mar 2016 23:13:07 +0000 Subject: [PATCH 0247/2457] mark as broken for now due to unsatisfiable ruby-oauth dependency --- net/mikutter/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile index f7e82515a8e40..20272c5516918 100644 --- a/net/mikutter/Makefile +++ b/net/mikutter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.115 2016/02/27 02:30:24 tsutsui Exp $ +# $NetBSD: Makefile,v 1.116 2016/03/16 23:13:07 tnn Exp $ # DISTNAME= mikutter.3.3.8 @@ -16,7 +16,8 @@ LICENSE= mit AND cc-by-sa-v3.0 DEPENDS+= ${RUBY_PKGPREFIX}-pluggaloid-[0-9]*:../../net/ruby-pluggaloid DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=3.0.7:../../x11/ruby-gnome2-gtk DEPENDS+= ${RUBY_PKGPREFIX}-gettext>=3.0.1:../../devel/ruby-gettext -DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.4<0.5:../../security/ruby-oauth +BROKEN= ruby-oauth less than 0.5 dependency no longer satisfiable +#DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.4<0.5:../../security/ruby-oauth DEPENDS+= ${RUBY_PKGPREFIX}-addressable>=2.3:../../net/ruby-addressable DEPENDS+= ${RUBY_PKGPREFIX}-memoist-[0-9]*:../../devel/ruby-memoist DEPENDS+= ${RUBY_PKGPREFIX}-hmac>=0.4:../../security/ruby-hmac From ce49698b581612a8d7076e3dc55d2e8bd9ba668c Mon Sep 17 00:00:00 2001 From: tnn Date: Wed, 16 Mar 2016 23:16:26 +0000 Subject: [PATCH 0248/2457] MAKEFLAGS -> MAKE_FLAGS --- archivers/unrar/Makefile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archivers/unrar/Makefile.common b/archivers/unrar/Makefile.common index 8bb938148cf1e..bccdbedc4483c 100644 --- a/archivers/unrar/Makefile.common +++ b/archivers/unrar/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2015/11/07 10:10:09 adam Exp $ +# $NetBSD: Makefile.common,v 1.8 2016/03/16 23:16:26 tnn Exp $ # # used by archivers/libunrar/Makefile # used by archivers/unrar/Makefile @@ -24,7 +24,7 @@ USE_LANGUAGES= c++ USE_TOOLS+= gmake MAKE_FILE= makefile -MAKEFLAGS+= CXX=${CXX:Q} CXXFLAGS=${CXXFLAGS:Q} LDFLAGS=${LDFLAGS:Q} +MAKE_FLAGS+= CXX=${CXX:Q} CXXFLAGS=${CXXFLAGS:Q} LDFLAGS=${LDFLAGS:Q} # usually set in Makefile, but overridden by line above LDFLAGS+= -pthread CXXFLAGS+= -fPIC From c68c12d8d156509077f26d74bacd0dabe65deb4f Mon Sep 17 00:00:00 2001 From: tnn Date: Thu, 17 Mar 2016 00:01:09 +0000 Subject: [PATCH 0249/2457] according to https://github.com/oauth-xx/oauth-ruby/pull/108 the problem should be fixed with ruby-oauth 0.5.1, so depend on that. --- net/mikutter/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mikutter/Makefile b/net/mikutter/Makefile index 20272c5516918..c04ee9f468589 100644 --- a/net/mikutter/Makefile +++ b/net/mikutter/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.116 2016/03/16 23:13:07 tnn Exp $ +# $NetBSD: Makefile,v 1.117 2016/03/17 00:01:09 tnn Exp $ # DISTNAME= mikutter.3.3.8 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/./-/} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= http://mikutter.hachune.net/bin/ @@ -16,8 +17,7 @@ LICENSE= mit AND cc-by-sa-v3.0 DEPENDS+= ${RUBY_PKGPREFIX}-pluggaloid-[0-9]*:../../net/ruby-pluggaloid DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=3.0.7:../../x11/ruby-gnome2-gtk DEPENDS+= ${RUBY_PKGPREFIX}-gettext>=3.0.1:../../devel/ruby-gettext -BROKEN= ruby-oauth less than 0.5 dependency no longer satisfiable -#DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.4<0.5:../../security/ruby-oauth +DEPENDS+= ${RUBY_PKGPREFIX}-oauth>=0.5.1:../../security/ruby-oauth DEPENDS+= ${RUBY_PKGPREFIX}-addressable>=2.3:../../net/ruby-addressable DEPENDS+= ${RUBY_PKGPREFIX}-memoist-[0-9]*:../../devel/ruby-memoist DEPENDS+= ${RUBY_PKGPREFIX}-hmac>=0.4:../../security/ruby-hmac From 0ace7d5d9c6a7eb9721e923e37e04ccb140675ce Mon Sep 17 00:00:00 2001 From: wiedi Date: Thu, 17 Mar 2016 00:26:16 +0000 Subject: [PATCH 0250/2457] Update sysutils/znapzend to 0.15.3 Changes since 0.15.2 include: - additional [info] and [debug] messages - fix bashism introduced in thirdparty makefile (comparing with ==) - simplifie module setup --- sysutils/znapzend/Makefile | 6 ++---- sysutils/znapzend/distinfo | 12 ++++++------ sysutils/znapzend/patches/patch-Makefile.in | 14 ++++++++++++++ .../znapzend/patches/patch-thirdparty_Makefile.in | 14 -------------- 4 files changed, 22 insertions(+), 24 deletions(-) create mode 100644 sysutils/znapzend/patches/patch-Makefile.in delete mode 100644 sysutils/znapzend/patches/patch-thirdparty_Makefile.in diff --git a/sysutils/znapzend/Makefile b/sysutils/znapzend/Makefile index 6812b9c43fb60..1d433f822b8a5 100644 --- a/sysutils/znapzend/Makefile +++ b/sysutils/znapzend/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2016/02/21 15:19:59 wiedi Exp $ +# $NetBSD: Makefile,v 1.9 2016/03/17 00:26:16 wiedi Exp $ -DISTNAME= znapzend-0.15.2 +DISTNAME= znapzend-0.15.3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=oetiker/} @@ -15,8 +15,6 @@ GNU_CONFIGURE= yes USE_LANGUAGES= # none USE_TOOLS+= perl gmake -CONFIGURE_ARGS+= --enable-pkgonly - TEST_TARGET= test DEPENDS+= p5-Mojolicious>=6.46:../../www/p5-Mojolicious diff --git a/sysutils/znapzend/distinfo b/sysutils/znapzend/distinfo index f091b46464cec..ea7896f537093 100644 --- a/sysutils/znapzend/distinfo +++ b/sysutils/znapzend/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2016/02/24 20:55:48 wiedi Exp $ +$NetBSD: distinfo,v 1.10 2016/03/17 00:26:16 wiedi Exp $ -SHA1 (znapzend-0.15.2.tar.gz) = 3e2e6d1c3dac0e453fd2bddcb36e18c17720ff8f -RMD160 (znapzend-0.15.2.tar.gz) = 450de7e87d87bf30ffbac221cf76c8e4190e21f9 -SHA512 (znapzend-0.15.2.tar.gz) = ff0eadee22dfec91d6d011ebb2636b7188abd00ed64267cf9773f3b34d7cc4a1046834ae0e7e41913cf5e30221e3a4e43c67d73d657cee9a7c10c64f0a5d16be -Size (znapzend-0.15.2.tar.gz) = 142052 bytes -SHA1 (patch-thirdparty_Makefile.in) = 76495123f4a48be24c9e65715e4314b1261eea55 +SHA1 (znapzend-0.15.3.tar.gz) = c43ded12d02914410db77162350fca489cc37d4f +RMD160 (znapzend-0.15.3.tar.gz) = 3970722b844d82e638a81addcf3d977a47411c30 +SHA512 (znapzend-0.15.3.tar.gz) = 8f7169d5a57a47a1d35cc1ed6fc86486353f899ba3667067d8d4498ec38942bfe079777c6b8004861188cb9169fb7642d7dee20522cdd8513bf0a4e773b73787 +Size (znapzend-0.15.3.tar.gz) = 141905 bytes +SHA1 (patch-Makefile.in) = 5ddb527ada8d3657f806d0731dd24856dde35cc7 diff --git a/sysutils/znapzend/patches/patch-Makefile.in b/sysutils/znapzend/patches/patch-Makefile.in new file mode 100644 index 0000000000000..40f1d3fc19d6b --- /dev/null +++ b/sysutils/znapzend/patches/patch-Makefile.in @@ -0,0 +1,14 @@ +$NetBSD: patch-Makefile.in,v 1.4 2016/03/17 00:26:16 wiedi Exp $ +thirdparty deps are provided by pkgsrc + +--- Makefile.in.orig 2016-02-25 14:00:38.000000000 +0000 ++++ Makefile.in +@@ -314,7 +314,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign + SUFFIXES = .1 .man .pm +-SUBDIRS = thirdparty lib ++SUBDIRS = lib + BIN = bin/@PACKAGE@ bin/znapzendzetup bin/znapzendztatz + PM := $(shell find lib/ -name "*.pm") + MAN = man/znapzend.1 man/znapzendzetup.1 man/znapzendztatz.1 diff --git a/sysutils/znapzend/patches/patch-thirdparty_Makefile.in b/sysutils/znapzend/patches/patch-thirdparty_Makefile.in deleted file mode 100644 index 0dc9e36c9b6c7..0000000000000 --- a/sysutils/znapzend/patches/patch-thirdparty_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-thirdparty_Makefile.in,v 1.1 2016/02/24 20:55:48 wiedi Exp $ - -Fix bashism ---- thirdparty/Makefile.in.orig 2016-02-15 16:00:51.000000000 +0000 -+++ thirdparty/Makefile.in -@@ -385,7 +385,7 @@ uninstall-am: - - - all-local: -- $(AM_V_GEN)[ "$(MISSING_PERL_MODULES)" == "" ] || $(GMAKE) touch -+ $(AM_V_GEN)[ "$(MISSING_PERL_MODULES)" = "" ] || $(GMAKE) touch - - touch: CPAN/touch ../config.status - $(AM_V_GEN)echo $(MISSING_PERL_MODULES) | PERL_CPANM_HOME=$(THIRDPARTY_DIR) xargs $(PERL) $(THIRDPARTY_DIR)/bin/cpanm -q --notest --local-lib-contained $(THIRDPARTY_DIR) --mirror file://$(THIRDPARTY_DIR)/CPAN --mirror-only From 800b476adc8dda1ac8ba641fc972a606473432c1 Mon Sep 17 00:00:00 2001 From: wiedi Date: Thu, 17 Mar 2016 00:26:51 +0000 Subject: [PATCH 0251/2457] Updated sysutils/znapzend to 0.15.3 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 8a389a04187c3..b1dba6574b147 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1235 2016/03/16 19:56:34 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1236 2016/03/17 00:26:51 wiedi Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1634,3 +1634,4 @@ Changes to the packages collection and infrastructure in 2016: Updated ham/trustedQSL to 2.2.1 [mef 2016-03-16] Removed misc/ruby-hashie1 [tsutsui 2016-03-16] Updated textproc/expat to 2.1.1 [ryoon 2016-03-16] + Updated sysutils/znapzend to 0.15.3 [wiedi 2016-03-17] diff --git a/doc/TODO b/doc/TODO index 3522ac27234b2..4cce4a658e943 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15600 2016/03/15 18:49:12 leot Exp $ +$NetBSD: TODO,v 1.15601 2016/03/17 00:26:51 wiedi Exp $ Suggested new packages ====================== @@ -2088,7 +2088,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o zile-2.4.11 o zim-0.65 o zkt-1.1.3 - o znapzend-0.15.3 o zoneminder-1.29.0 o zopeedit-0.8 From 2a6c4dd5647a43c2913bea4bd0da79be70c38ef2 Mon Sep 17 00:00:00 2001 From: wiedi Date: Thu, 17 Mar 2016 00:39:25 +0000 Subject: [PATCH 0252/2457] Update www/goaccess to 0.9.8 Changes to GoAccess 0.9.8 - Monday, February 29, 2016 - Added a more complete list of static extensions to the config file. - Added Android 6.0 Marshmallow to the list of OSs. - Added the ability to scroll through panels on TAB with option to disable it --no-tab-scroll. - Added the first and last log dates to the overall statistics panel. - Ensure GoAccess links correctly against libtinfo. - Ensure static content is case-insensitive verified. - Fixed bandwidth overflow issue (numbers > 2GB on non-x86_64 arch). - Fixed broken HTML layout when html-method/protocol is missing in config file. - Refactored parsing and display of available modules/panels. --- www/goaccess/Makefile | 4 ++-- www/goaccess/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/goaccess/Makefile b/www/goaccess/Makefile index 93118c954c99c..f052a3feeb24d 100644 --- a/www/goaccess/Makefile +++ b/www/goaccess/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2016/02/21 15:45:01 wiedi Exp $ +# $NetBSD: Makefile,v 1.12 2016/03/17 00:39:25 wiedi Exp $ -DISTNAME= goaccess-0.9.7 +DISTNAME= goaccess-0.9.8 CATEGORIES= www MASTER_SITES= http://tar.goaccess.io/ diff --git a/www/goaccess/distinfo b/www/goaccess/distinfo index 7000496e6056e..0cf9ba3cd8a89 100644 --- a/www/goaccess/distinfo +++ b/www/goaccess/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2016/02/21 15:45:01 wiedi Exp $ +$NetBSD: distinfo,v 1.11 2016/03/17 00:39:25 wiedi Exp $ -SHA1 (goaccess-0.9.7.tar.gz) = 5a46bb1f849be150160397b902a6783e8525557f -RMD160 (goaccess-0.9.7.tar.gz) = be6dd4062f52523611a3dfb4c719891bb1ec6f06 -SHA512 (goaccess-0.9.7.tar.gz) = 27c54401fb5ce086f191c8a1ba0a86b6c155469a3f412be64924f3fa3a80f3e04541c805fb98539b47872d06cf4e2c89150c20351d08c68139c63b17de17adb8 -Size (goaccess-0.9.7.tar.gz) = 270009 bytes +SHA1 (goaccess-0.9.8.tar.gz) = 35d3cd6004c566e017d3e2702d5fc0f566655766 +RMD160 (goaccess-0.9.8.tar.gz) = fcf5ff2b905f9ee1047d00ef3b674e5570a8db47 +SHA512 (goaccess-0.9.8.tar.gz) = 40ce161c14f058d5482b90c1fe9c88a7ca8abf063bc041597b23390c5715466bde9bda58beb6e5b61d578a0f7b7d7860a9b3d2056812cc96564d3208e17703e1 +Size (goaccess-0.9.8.tar.gz) = 277618 bytes SHA1 (patch-Makefile.am) = 8bb0bbd6595be0ac32ecbc7990716a24092504f0 From 5d15a4607e36581661207755efdba92f1e283f96 Mon Sep 17 00:00:00 2001 From: wiedi Date: Thu, 17 Mar 2016 00:40:00 +0000 Subject: [PATCH 0253/2457] Updated www/goaccess to 0.9.8 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index b1dba6574b147..7721ee0c0257a 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1236 2016/03/17 00:26:51 wiedi Exp $ +$NetBSD: CHANGES-2016,v 1.1237 2016/03/17 00:40:00 wiedi Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1635,3 +1635,4 @@ Changes to the packages collection and infrastructure in 2016: Removed misc/ruby-hashie1 [tsutsui 2016-03-16] Updated textproc/expat to 2.1.1 [ryoon 2016-03-16] Updated sysutils/znapzend to 0.15.3 [wiedi 2016-03-17] + Updated www/goaccess to 0.9.8 [wiedi 2016-03-17] From 4d0d0c3c7e8147facc66fb7010ed4278e57ae435 Mon Sep 17 00:00:00 2001 From: tnn Date: Thu, 17 Mar 2016 02:47:14 +0000 Subject: [PATCH 0254/2457] catch up with mail/roundcube rename --- meta-pkgs/bulk-large/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-pkgs/bulk-large/Makefile b/meta-pkgs/bulk-large/Makefile index a53610d385656..34c2d1d030452 100644 --- a/meta-pkgs/bulk-large/Makefile +++ b/meta-pkgs/bulk-large/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2015/12/05 21:25:49 adam Exp $ +# $NetBSD: Makefile,v 1.27 2016/03/17 02:47:14 tnn Exp $ -DISTNAME= bulk-large-20150218 -PKGREVISION= 1 +DISTNAME= bulk-large-20160317 CATEGORIES= meta-pkgs MASTER_SITES= # empty DISTFILES= # empty @@ -85,7 +84,7 @@ BUILD_DEPENDS+= gimp-[0-9]*:../../graphics/gimp BUILD_DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz BUILD_DEPENDS+= claws-mail-[0-9]*:../../mail/claws-mail BUILD_DEPENDS+= evolution-[0-9]*:../../mail/evolution -BUILD_DEPENDS+= roundcube-[0-9]*:../../mail/roundcube +BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-roundcube-[0-9]*:../../mail/roundcube BUILD_DEPENDS+= squirrelmail-[0-9]*:../../mail/squirrelmail BUILD_DEPENDS+= thunderbird-[0-9]*:../../mail/thunderbird BUILD_DEPENDS+= thunderbird-l10n-[0-9]*:../../mail/thunderbird-l10n @@ -169,6 +168,7 @@ BUILD_DEPENDS+= bulk-medium-[0-9]*:../../meta-pkgs/bulk-medium BUILD_DEPENDS+= bulk-small-[0-9]*:../../meta-pkgs/bulk-small PYTHON_FOR_BUILD_ONLY= yes +.include "../../lang/php/phpversion.mk" # for PHP_PKG_PREFIX .include "../../lang/python/pyversion.mk" # for PYPKGPREFIX .include "../../lang/ruby/rubyversion.mk" # for RUBY_PKGPREFIX .include "../../mk/bsd.pkg.mk" From 652dbfa0f9e80541d60a200fa52c43f13d5e0650 Mon Sep 17 00:00:00 2001 From: tnn Date: Thu, 17 Mar 2016 02:53:59 +0000 Subject: [PATCH 0255/2457] fix wrong llvm-config --libs output. Should return -lLLVM-3.8. Bump. --- lang/libLLVM/Makefile | 15 +++-- lang/libLLVM/PLIST | 4 +- lang/libLLVM/distinfo | 3 +- .../patch-tools_llvm-config_llvm-config.cpp | 55 +++++++++++++++++++ 4 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 lang/libLLVM/patches/patch-tools_llvm-config_llvm-config.cpp diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile index 852b322566b6d..b9c6b762a3d01 100644 --- a/lang/libLLVM/Makefile +++ b/lang/libLLVM/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2016/03/08 21:50:29 tnn Exp $ +# $NetBSD: Makefile,v 1.10 2016/03/17 02:53:59 tnn Exp $ DISTNAME= llvm-3.8.0.src +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/llvm/libLLVM/:S/.src//} CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PKGVERSION_NOREV}/ @@ -22,7 +23,7 @@ CMAKE_ARG_PATH= ${WRKSRC} CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release CMAKE_ARGS+= -DCMAKE_C_COMPILER=gcc CMAKE_ARGS+= -DCMAKE_CXX_COMPILER=g++ -CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=On +CMAKE_ARGS+= -DLLVM_BUILD_LLVM_DYLIB=ON .for tool in bugpoint bugpoint_passes dsymutil llc lli llvm_ar \ llvm_as llvm_bcanalyzer llvm_c_test llvm_cov llvm_cxxdump \ @@ -38,9 +39,7 @@ SUBST_CLASSES+= fix-cnf SUBST_STAGE.fix-cnf= pre-configure SUBST_MESSAGE.fix-cnf= Fixing llvm-config paths SUBST_FILES.fix-cnf= tools/llvm-config/llvm-config.cpp -SUBST_SED.fix-cnf= -e 's|ActivePrefix + "/include"|"${PREFIX}/include/libLLVM"|g' -SUBST_SED.fix-cnf+= -e 's|ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX|"${PREFIX}/lib/libLLVM"|g' -SUBST_SED.fix-cnf+= -e 's|"-L" << ActiveLibDir|"${COMPILER_RPATH_FLAG}" << ActiveLibDir << " " << &|g' +SUBST_VARS.fix-cnf= PREFIX LLVM_MAJOR_MINOR COMPILER_RPATH_FLAG CHECK_PORTABILITY_SKIP= utils/buildit/build_llvm @@ -90,8 +89,8 @@ TEST_ENV+= LD_LIBRARY_PATH=${WRKDIR}/build/lib .include "../../mk/bsd.prefs.mk" # 3.8.0 -> 3.8 -LLVM_MAJOR= ${PKGVERSION_NOREV:C/^([0-9]+\.[0-9]+)\..*$/\1/} -PLIST_SUBST+= LLVM_MAJOR=${LLVM_MAJOR} +LLVM_MAJOR_MINOR= ${PKGVERSION_NOREV:C/^([0-9]+\.[0-9]+)\..*$/\1/} +PLIST_SUBST+= LLVM_MAJOR_MINOR=${LLVM_MAJOR_MINOR} PLIST_VARS+= notdylib .if ${_OPSYS_SHLIB_TYPE} == "dylib" @@ -99,7 +98,7 @@ SOEXT= dylib LLVM_LIBNAME= libLLVM.${SOEXT} .else SOEXT= so -LLVM_LIBNAME= libLLVM-${LLVM_MAJOR}.${SOEXT} +LLVM_LIBNAME= libLLVM-${LLVM_MAJOR_MINOR}.${SOEXT} PLIST.notdylib= yes .endif PLIST_SUBST+= SOEXT=${SOEXT} diff --git a/lang/libLLVM/PLIST b/lang/libLLVM/PLIST index b9b64f1756eff..44741ff81f21d 100644 --- a/lang/libLLVM/PLIST +++ b/lang/libLLVM/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2016/03/08 21:50:29 tnn Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/03/17 02:53:59 tnn Exp $ include/libLLVM/llvm-c/Analysis.h include/libLLVM/llvm-c/BitReader.h include/libLLVM/llvm-c/BitWriter.h @@ -802,7 +802,7 @@ include/libLLVM/llvm/Transforms/Utils/UnifyFunctionExitNodes.h include/libLLVM/llvm/Transforms/Utils/UnrollLoop.h include/libLLVM/llvm/Transforms/Utils/ValueMapper.h include/libLLVM/llvm/Transforms/Vectorize.h -${PLIST.notdylib}lib/libLLVM/libLLVM-${LLVM_MAJOR}.${SOEXT} +${PLIST.notdylib}lib/libLLVM/libLLVM-${LLVM_MAJOR_MINOR}.${SOEXT} ${PLIST.notdylib}lib/libLLVM/libLLVM-${PKGVERSION}.${SOEXT} lib/libLLVM/libLLVM.${SOEXT} libexec/libLLVM/llvm-config diff --git a/lang/libLLVM/distinfo b/lang/libLLVM/distinfo index b520c7499fbe1..dc580a6c4fafb 100644 --- a/lang/libLLVM/distinfo +++ b/lang/libLLVM/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2016/03/11 06:50:42 tnn Exp $ +$NetBSD: distinfo,v 1.3 2016/03/17 02:53:59 tnn Exp $ SHA1 (llvm-3.8.0.src.tar.xz) = 723ac918979255706434a05f5af34b71c49c9971 RMD160 (llvm-3.8.0.src.tar.xz) = 3c657d061bc8e9de017b0cf1f1a7e63f215b0295 @@ -10,4 +10,5 @@ SHA1 (patch-cmake_modules_CMakeLists.txt) = 8297c4b9ddd3ac05a06d8a4a8040be46b5b8 SHA1 (patch-cmake_modules_TableGen.cmake) = 53be811936dd5157e6eb08db8cd51a7265bc8c7f SHA1 (patch-include_llvm_Support_Host.h) = 55a9fab6ee49ec09a2fd644747a6dddd6b39f942 SHA1 (patch-lib_Transforms_CMakeLists.txt) = cafdd73a39574aa3a83db35997ff918f87191d18 +SHA1 (patch-tools_llvm-config_llvm-config.cpp) = 2964b70aa81d272940b8c48c7854e61f7d0662be SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 8f538db138219c2a3ce394b7a3c21f277d5544dd diff --git a/lang/libLLVM/patches/patch-tools_llvm-config_llvm-config.cpp b/lang/libLLVM/patches/patch-tools_llvm-config_llvm-config.cpp new file mode 100644 index 0000000000000..c7d2f289e0092 --- /dev/null +++ b/lang/libLLVM/patches/patch-tools_llvm-config_llvm-config.cpp @@ -0,0 +1,55 @@ +$NetBSD: patch-tools_llvm-config_llvm-config.cpp,v 1.1 2016/03/17 02:53:59 tnn Exp $ + +avoid conflict with lang/clang. +Use -lLLVM-3.8 instead of -lLLVM-3.8.0 so we don't break unnecessarily +on patch updates. + +--- tools/llvm-config/llvm-config.cpp.orig 2016-01-12 07:23:58.000000000 +0000 ++++ tools/llvm-config/llvm-config.cpp +@@ -309,9 +309,9 @@ int main(int argc, char **argv) { + "-I" + ActiveObjRoot + "/include"); + } else { + ActivePrefix = CurrentExecPrefix; +- ActiveIncludeDir = ActivePrefix + "/include"; ++ ActiveIncludeDir = "@PREFIX@/include/libLLVM"; + ActiveBinDir = ActivePrefix + "/bin"; +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; ++ ActiveLibDir = "@PREFIX@/lib/libLLVM"; + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + +@@ -334,14 +334,14 @@ int main(int argc, char **argv) { + StaticPrefix = SharedPrefix = "lib"; + } else if (HostTriple.isOSDarwin()) { + SharedExt = "dylib"; +- SharedVersionedExt = PACKAGE_VERSION ".dylib"; ++ SharedVersionedExt = ".dylib"; + StaticExt = "a"; + StaticDir = SharedDir = ActiveLibDir; + StaticPrefix = SharedPrefix = "lib"; + } else { + // default to the unix values: + SharedExt = "so"; +- SharedVersionedExt = PACKAGE_VERSION ".so"; ++ SharedVersionedExt = "-@LLVM_MAJOR_MINOR@.so"; + StaticExt = "a"; + StaticDir = SharedDir = ActiveLibDir; + StaticPrefix = SharedPrefix = "lib"; +@@ -362,7 +362,7 @@ int main(int argc, char **argv) { + + bool DyLibExists = false; + const std::string DyLibName = +- (SharedPrefix + "LLVM-" + SharedVersionedExt).str(); ++ (SharedPrefix + "LLVM" + SharedVersionedExt).str(); + + if (BuiltDyLib) { + DyLibExists = sys::fs::exists(SharedDir + "/" + DyLibName); +@@ -440,7 +440,7 @@ int main(int argc, char **argv) { + } else if (Arg == "--cxxflags") { + OS << ActiveIncludeOption << ' ' << LLVM_CXXFLAGS << '\n'; + } else if (Arg == "--ldflags") { +- OS << "-L" << ActiveLibDir << ' ' << LLVM_LDFLAGS << '\n'; ++ OS << "-L" << ActiveLibDir << " @COMPILER_RPATH_FLAG@" << ActiveLibDir << ' ' << LLVM_LDFLAGS << '\n'; + } else if (Arg == "--system-libs") { + PrintSystemLibs = true; + } else if (Arg == "--libs") { From caf7fc55368c25d4a1bea013555b6f1516967c11 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 17 Mar 2016 05:35:47 +0000 Subject: [PATCH 0256/2457] fix XSParagraph support by adding perl bl3, forcing use of pkgsrc libtool instead of bundled libtool to get over rm issue. bump PKGREVISION --- devel/gtexinfo/Makefile | 5 ++++- devel/gtexinfo/PLIST | 4 +++- devel/gtexinfo/distinfo | 3 ++- .../patch-tp_Texinfo_Convert_XSParagraph_configure | 13 +++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_configure diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile index a615da7b15d0f..d4d8a9b0f3a89 100644 --- a/devel/gtexinfo/Makefile +++ b/devel/gtexinfo/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.91 2016/02/13 07:02:07 ryoon Exp $ +# $NetBSD: Makefile,v 1.92 2016/03/17 05:35:47 richard Exp $ DISTNAME= texinfo-6.1 PKGNAME= g${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel sysutils MASTER_SITES= ${MASTER_SITE_GNU:=texinfo/} @@ -20,6 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-external-libintl-perl CONFIGURE_ARGS+= --with-external-Text-Unidecode CONFIGURE_ARGS+= --with-external-Unicode-EastAsianWidth +USE_LIBTOOL= yes INFO_FILES= yes TEST_TARGET= check @@ -34,6 +36,7 @@ REPLACE_SH+= util/texi2dvi .include "../../mk/bsd.prefs.mk" .include "options.mk" +.include "../../lang/perl5/buildlink3.mk" # for EXTERN.h in XSParagraph .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/gtexinfo/PLIST b/devel/gtexinfo/PLIST index 2e87bf67d24af..ac16674c9759f 100644 --- a/devel/gtexinfo/PLIST +++ b/devel/gtexinfo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2016/02/14 07:08:01 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.21 2016/03/17 05:35:47 richard Exp $ bin/info bin/install-info bin/makeinfo @@ -10,6 +10,7 @@ bin/texi2pdf bin/texindex info/info-stnd.info info/texinfo.info +lib/texinfo/XSParagraph.la man/man1/info.1 man/man1/install-info.1 man/man1/makeinfo.1 @@ -44,6 +45,7 @@ share/texinfo/Texinfo/Convert/Text.pm share/texinfo/Texinfo/Convert/TextContent.pm share/texinfo/Texinfo/Convert/UnFilled.pm share/texinfo/Texinfo/Convert/Unicode.pm +share/texinfo/Texinfo/Convert/XSParagraph/TestXS.pm share/texinfo/Texinfo/Documentlanguages.pm share/texinfo/Texinfo/Encoding.pm share/texinfo/Texinfo/ModulePath.pm diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo index af3298cef2fdc..65a38fd560093 100644 --- a/devel/gtexinfo/distinfo +++ b/devel/gtexinfo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2016/02/13 07:02:07 ryoon Exp $ +$NetBSD: distinfo,v 1.47 2016/03/17 05:35:47 richard Exp $ SHA1 (texinfo-6.1.tar.gz) = b6ed8b4af3fe9a4aa7c72081dc61f095f73d895c RMD160 (texinfo-6.1.tar.gz) = 6ab09576dab209cf8784c8052039126e0b21d941 @@ -9,4 +9,5 @@ SHA1 (patch-ac) = 7f7226ee521fddba9f967be4fe199f6bedcfa148 SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4 SHA1 (patch-texindex_texindex.awk) = 1f022f1495c951337997036ef1cd758ef9c116a7 +SHA1 (patch-tp_Texinfo_Convert_XSParagraph_configure) = d4557bae4417cd42297bceaa76478b00b3875df3 SHA1 (patch-util_texi2dvi) = d17608312d4b5546a2295e1be2b193124ad97256 diff --git a/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_configure b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_configure new file mode 100644 index 0000000000000..3cdfe29a48ef7 --- /dev/null +++ b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_configure @@ -0,0 +1,13 @@ +$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_configure,v 1.1 2016/03/17 05:35:47 richard Exp $ +force use of pkgsrc libtool instead of bundled to get over rm issue. +--- tp/Texinfo/Convert/XSParagraph/configure.orig 2016-01-30 18:04:16.000000000 +0000 ++++ tp/Texinfo/Convert/XSParagraph/configure +@@ -14592,7 +14592,7 @@ esac + LIBTOOL_DEPS=$ltmain + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++#LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + From 12c9697cf1b71b0201b793c8a20890c653f32399 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 17 Mar 2016 07:53:46 +0000 Subject: [PATCH 0257/2457] Add upstream patch from SVN to fix build with RELRO. I don't see a relation to relro, but the linker found out about a missing symbol it didn't complain about before. SVN 54139: Thu Mar 17 11:36:27 2016 Nobuyoshi Nakada * ext/socket/option.c (inspect_tcpi_msec): more accurate condition for TCPI msec member inspection function. [ruby-core:74388] [Bug #12185] Bump PKGREVISION. --- lang/ruby22-base/Makefile | 5 ++-- lang/ruby22-base/distinfo | 3 ++- .../patches/patch-ext_socket_option.c | 26 +++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 lang/ruby22-base/patches/patch-ext_socket_option.c diff --git a/lang/ruby22-base/Makefile b/lang/ruby22-base/Makefile index a2fcee67937a5..ad9f8aea9696a 100644 --- a/lang/ruby22-base/Makefile +++ b/lang/ruby22-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2016/03/05 11:28:44 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.12 2016/03/17 07:53:46 wiz Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby22-base/distinfo b/lang/ruby22-base/distinfo index f3acc4e10b539..7892933df7440 100644 --- a/lang/ruby22-base/distinfo +++ b/lang/ruby22-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2015/12/17 01:36:36 taca Exp $ +$NetBSD: distinfo,v 1.13 2016/03/17 07:53:46 wiz Exp $ SHA1 (ruby-2.2.4.tar.bz2) = 6132840a859dbf2ac1498ba313021f299a870038 RMD160 (ruby-2.2.4.tar.bz2) = 012fa73d430db36e5b807cd677a961d6e2700758 @@ -8,6 +8,7 @@ SHA1 (patch-configure) = 8abbc486b8cf30bb789ef58d1cb289191dcd1af6 SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959 +SHA1 (patch-ext_socket_option.c) = 8759eabfe884a891fd6adab6921418a1ab56d21f SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 SHA1 (patch-lib_rubygems.rb) = 5b63c96109fa53fb072b6ae12bf91c4b2889e079 diff --git a/lang/ruby22-base/patches/patch-ext_socket_option.c b/lang/ruby22-base/patches/patch-ext_socket_option.c new file mode 100644 index 0000000000000..9787dfc63161f --- /dev/null +++ b/lang/ruby22-base/patches/patch-ext_socket_option.c @@ -0,0 +1,26 @@ +$NetBSD: patch-ext_socket_option.c,v 1.1 2016/03/17 07:53:46 wiz Exp $ + +SVN 54139: + +Thu Mar 17 11:36:27 2016 Nobuyoshi Nakada + + * ext/socket/option.c (inspect_tcpi_msec): more accurate condition + for TCPI msec member inspection function. + [ruby-core:74388] [Bug #12185] + +--- ext/socket/option.c.orig 2015-08-10 15:33:59.000000000 +0000 ++++ ext/socket/option.c +@@ -928,7 +928,12 @@ inspect_tcpi_usec(VALUE ret, const char + rb_str_catf(ret, "%s%u.%06us", prefix, t / 1000000, t % 1000000); + } + +-#if defined(__linux__) || defined(__sun) ++#if !defined __FreeBSD__ && ( \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_SENT || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_RECV || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_SENT || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_RECV || \ ++ 0) + static void + inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t) + { From 3925c537b6d4231065599e9b98d48cb779078e3b Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 17 Mar 2016 07:53:57 +0000 Subject: [PATCH 0258/2457] Updated lang/ruby22-base to 2.2.4nb3 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 7721ee0c0257a..dbe9adf727da4 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1237 2016/03/17 00:40:00 wiedi Exp $ +$NetBSD: CHANGES-2016,v 1.1238 2016/03/17 07:53:57 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1636,3 +1636,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/expat to 2.1.1 [ryoon 2016-03-16] Updated sysutils/znapzend to 0.15.3 [wiedi 2016-03-17] Updated www/goaccess to 0.9.8 [wiedi 2016-03-17] + Updated lang/ruby22-base to 2.2.4nb3 [wiz 2016-03-17] From a95af348587f6735bde49b1a57e3fb359f2c69f8 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 17 Mar 2016 07:55:43 +0000 Subject: [PATCH 0259/2457] Add upstream patch from SVN to fix build with RELRO. I don't see a relation to relro, but the linker found out about a missing symbol it didn't complain about before. SVN 54139: Thu Mar 17 11:36:27 2016 Nobuyoshi Nakada * ext/socket/option.c (inspect_tcpi_msec): more accurate condition for TCPI msec member inspection function. [ruby-core:74388] [Bug #12185] Bump PKGREVISION. --- lang/ruby23-base/Makefile | 5 ++-- lang/ruby23-base/distinfo | 5 ++-- .../patches/patch-ext_socket_option.c | 26 +++++++++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 lang/ruby23-base/patches/patch-ext_socket_option.c diff --git a/lang/ruby23-base/Makefile b/lang/ruby23-base/Makefile index 1e9fd80a49ddf..398057f8f59d0 100644 --- a/lang/ruby23-base/Makefile +++ b/lang/ruby23-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:44 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.4 2016/03/17 07:55:43 wiz Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby23-base/distinfo b/lang/ruby23-base/distinfo index 0cd50bd21f770..00e882dec5c5c 100644 --- a/lang/ruby23-base/distinfo +++ b/lang/ruby23-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2015/12/30 14:59:42 taca Exp $ +$NetBSD: distinfo,v 1.2 2016/03/17 07:55:43 wiz Exp $ SHA1 (ruby-2.3.0.tar.bz2) = 6c8a832d49d22755ea8c45b6d53faf2ccc6d6ac9 RMD160 (ruby-2.3.0.tar.bz2) = 4e9066b169b1b00435ba154069416e14457fe22e @@ -8,8 +8,7 @@ SHA1 (patch-configure) = ccddb80f90f75a09dc7d802d1ddad6255ba13ffa SHA1 (patch-eval.c) = 16e6eadca15c95ac3e2291a2003cb0fc606eafeb SHA1 (patch-eval__error.c) = 8ed04dec5c3c0bf4d9ca8516888b331676f7c957 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b -SHA1 (patch-ext_fiddle_depend) = f1de70280e55a036d1063635bfc24f8856a4d508 -SHA1 (patch-ext_readline_depend) = 9c5f22eac751c9333f9292ce32860e3b714a61b8 +SHA1 (patch-ext_socket_option.c) = 210753a7db6ab7b8c459765f1ec656948da86e28 SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e SHA1 (patch-lib_rdoc_ri_driver.rb) = bdbe04aa1dd1719d901233b16bcb318172a42b6c SHA1 (patch-lib_rubygems.rb) = d8968f54bdc973379675a3ebb5ca68325cff6644 diff --git a/lang/ruby23-base/patches/patch-ext_socket_option.c b/lang/ruby23-base/patches/patch-ext_socket_option.c new file mode 100644 index 0000000000000..f208564f2a4e7 --- /dev/null +++ b/lang/ruby23-base/patches/patch-ext_socket_option.c @@ -0,0 +1,26 @@ +$NetBSD: patch-ext_socket_option.c,v 1.1 2016/03/17 07:55:43 wiz Exp $ + +SVN 54139: + +Thu Mar 17 11:36:27 2016 Nobuyoshi Nakada + + * ext/socket/option.c (inspect_tcpi_msec): more accurate condition + for TCPI msec member inspection function. + [ruby-core:74388] [Bug #12185] + +--- ext/socket/option.c.orig 2015-08-15 04:32:15.000000000 +0000 ++++ ext/socket/option.c +@@ -928,7 +928,12 @@ inspect_tcpi_usec(VALUE ret, const char + rb_str_catf(ret, "%s%u.%06us", prefix, t / 1000000, t % 1000000); + } + +-#if defined(__linux__) || defined(__sun) ++#if !defined __FreeBSD__ && ( \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_SENT || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_RECV || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_SENT || \ ++ defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_RECV || \ ++ 0) + static void + inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t) + { From d9bf66c0429dfed3389d99368d89faa2fc708b66 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 17 Mar 2016 07:55:52 +0000 Subject: [PATCH 0260/2457] Updated lang/ruby23-base to 2.3.0nb2 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index dbe9adf727da4..7435a8e02a1a4 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1238 2016/03/17 07:53:57 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1239 2016/03/17 07:55:52 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1637,3 +1637,4 @@ Changes to the packages collection and infrastructure in 2016: Updated sysutils/znapzend to 0.15.3 [wiedi 2016-03-17] Updated www/goaccess to 0.9.8 [wiedi 2016-03-17] Updated lang/ruby22-base to 2.2.4nb3 [wiz 2016-03-17] + Updated lang/ruby23-base to 2.3.0nb2 [wiz 2016-03-17] From 95926661d9f5072fc32274821d4a524128e13f8a Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 17 Mar 2016 12:32:38 +0000 Subject: [PATCH 0261/2457] Remove xkl_engine_VOID__FLAGS_INT_BOOLEAN symbol, it no longer exists. Fixes build on systems with a stricter linker than GNU. --- x11/libxklavier/distinfo | 3 ++- .../patches/patch-libxklavier_libxklavier.public | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 x11/libxklavier/patches/patch-libxklavier_libxklavier.public diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 8302aa3852253..40ec078fe727d 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2016/03/12 11:12:40 ryoon Exp $ +$NetBSD: distinfo,v 1.26 2016/03/17 12:32:38 jperkin Exp $ SHA1 (libxklavier-5.4.tar.bz2) = 6bd04a332700ad43d518167beaafbf734e94bd35 RMD160 (libxklavier-5.4.tar.bz2) = 0f150c12365264eb68608fac46fb6c7b39628d4e @@ -6,3 +6,4 @@ SHA512 (libxklavier-5.4.tar.bz2) = e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30 Size (libxklavier-5.4.tar.bz2) = 390428 bytes SHA1 (patch-ab) = 15f02943f7a34cb737a8e78264ade06a83b6a1b0 SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc +SHA1 (patch-libxklavier_libxklavier.public) = b9e6ea17d686c80e6eaa8fbdd3be7fd22d07d250 diff --git a/x11/libxklavier/patches/patch-libxklavier_libxklavier.public b/x11/libxklavier/patches/patch-libxklavier_libxklavier.public new file mode 100644 index 0000000000000..c510aaa060112 --- /dev/null +++ b/x11/libxklavier/patches/patch-libxklavier_libxklavier.public @@ -0,0 +1,14 @@ +$NetBSD: patch-libxklavier_libxklavier.public,v 1.1 2016/03/17 12:32:39 jperkin Exp $ + +Remove symbol that no longer exists. + +--- libxklavier/libxklavier.public.orig 2013-04-23 00:51:31.000000000 +0000 ++++ libxklavier/libxklavier.public +@@ -83,7 +83,6 @@ xkl_engine_start_listen + xkl_engine_state_change_get_type + xkl_engine_stop_listen + xkl_engine_ungrab_key +-xkl_engine_VOID__FLAGS_INT_BOOLEAN + xkl_engine_VOID__ENUM_INT_BOOLEAN + xkl_get_country_name + xkl_get_language_name From 5d7916a19df0c9c674887cdce89fc08c6cafb71c Mon Sep 17 00:00:00 2001 From: fhajny Date: Thu, 17 Mar 2016 12:44:58 +0000 Subject: [PATCH 0262/2457] Update graphics/leptonice to 1.73. 1.73 - All lept_* functions have been rewritten to avoid path rewrites for output to temp files, which were introduced in 1.72. - Naming changes (to avoid collisions): #defines MALLOC --> LEPT_MALLOC, CALLOC --> LEPT_CALLOC, etc. ByteBuffer --> L_ByteBuffer - Added grayscale histogram functions that can be used to compare images. - Added functions to determine if an image region has horizontal text lines. - Added functions to compare photo regions of images to determine if they're essentially the same. - Added red-black tree utility functions to implement maps and sets. - The keys for maps and sets can be 64-bit entities (signed and unsigned integers and doubles). - Implemented hashsets and hashmaps, using 64 bit keys. - Replaced the numaHash by l_dnaHash; removed numa2d - Improved security of tiff and gif reading, to prevent memory corruption when reading bad data. - Removed src files: bootnumgen.c - Added src files: rbtree.c, rbtree.h, map.c, bootnumgen1.c, bootnumgen2.c - Added prog files: rbtreetest.c, maptest.c, settest.c, hashtest.c, recog_bootnum.c, percolatetest.c - Added files for building using cmake (Egor Pugin) 1.72 - Better handling of 1 bpp colormap read/write with png so that they are losseless. - Fixed overflow bug in pixCorrelationBinary(). - Fixed orientation flags and handling of 16 bit RGB in tiff. - Also new wrappers to TIFFClientOpen(), so we no longer go through the file descriptor for memory operations. - Improvements in the dewarp functions. - New box sequence smoothings. - New antialiased painting through mask; previously it was only implemented for connected components in a mask. - Better error handling and debug output with jpeg2000 read/write. - Implemented base64 encoding. This allows binary data to be represented as a C string that can be compiled. Used this in bmf utility. - Implemented automatic code generation for deserialization from compiled strings (stringcode.*) - Regression tests write to leptonica subdir of in windows; in unix it is optional. This avoids spamming the directory. - Added new colorspace conversions (XYZ, LAB). - New source files: encoding.c, bmfdata.h, stringcode.c, stringcode.h, bootnumgen.c. - Removed source files: convolvelow.c, graymorphlow.c - New programs: genfonts_reg, colorize_reg, texturefill_reg, autogentest1, autogentest2. - alltests_reg now has 66 tests. --- graphics/leptonica/Makefile | 5 ++--- graphics/leptonica/PLIST | 5 ++++- graphics/leptonica/buildlink3.mk | 4 ++-- graphics/leptonica/distinfo | 10 +++++----- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index 8b1a454679dd7..5d949b36c2aa7 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2016/01/06 10:46:49 adam Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/17 12:44:58 fhajny Exp $ -DISTNAME= leptonica-1.71 -PKGREVISION= 2 +DISTNAME= leptonica-1.73 CATEGORIES= graphics MASTER_SITES= http://www.leptonica.org/source/ diff --git a/graphics/leptonica/PLIST b/graphics/leptonica/PLIST index 69e0871f0d322..5540e6c0e5bbb 100644 --- a/graphics/leptonica/PLIST +++ b/graphics/leptonica/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2014/10/02 07:23:56 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/17 12:44:58 fhajny Exp $ bin/convertfilestopdf bin/convertfilestops bin/convertformat @@ -19,6 +19,7 @@ include/leptonica/arrayaccess.h include/leptonica/bbuffer.h include/leptonica/bilateral.h include/leptonica/bmf.h +include/leptonica/bmfdata.h include/leptonica/bmp.h include/leptonica/ccbord.h include/leptonica/dewarp.h @@ -34,10 +35,12 @@ include/leptonica/morph.h include/leptonica/pix.h include/leptonica/ptra.h include/leptonica/queue.h +include/leptonica/rbtree.h include/leptonica/readbarcode.h include/leptonica/recog.h include/leptonica/regutils.h include/leptonica/stack.h +include/leptonica/stringcode.h include/leptonica/sudoku.h include/leptonica/watershed.h lib/liblept.la diff --git a/graphics/leptonica/buildlink3.mk b/graphics/leptonica/buildlink3.mk index de353a26a7e2f..10c5c09cc572a 100644 --- a/graphics/leptonica/buildlink3.mk +++ b/graphics/leptonica/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/01/06 10:46:49 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2016/03/17 12:44:58 fhajny Exp $ BUILDLINK_TREE+= leptonica @@ -6,7 +6,7 @@ BUILDLINK_TREE+= leptonica LEPTONICA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.leptonica+= leptonica>=1.71 -BUILDLINK_ABI_DEPENDS.leptonica?= leptonica>=1.71nb2 +BUILDLINK_ABI_DEPENDS.leptonica+= leptonica>=1.71nb2 BUILDLINK_PKGSRCDIR.leptonica?= ../../graphics/leptonica .include "../../graphics/giflib/buildlink3.mk" diff --git a/graphics/leptonica/distinfo b/graphics/leptonica/distinfo index 08b9e64675b95..c66231e014bc2 100644 --- a/graphics/leptonica/distinfo +++ b/graphics/leptonica/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 21:34:06 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/03/17 12:44:58 fhajny Exp $ -SHA1 (leptonica-1.71.tar.gz) = 1ee59b06fd6c6402876f46c26c21b17ffd3c9b6b -RMD160 (leptonica-1.71.tar.gz) = 597dcd4f5319c925a2b5d4f2adcaa855a45f0124 -SHA512 (leptonica-1.71.tar.gz) = fd02eec19a442d767ba39ce01132ef1304a977e038bdbf64ec5e763607d51adf1c06aaa687fc3ec542854e535618b6da2042f10709286c2e1d236e43d77efd51 -Size (leptonica-1.71.tar.gz) = 10212309 bytes +SHA1 (leptonica-1.73.tar.gz) = f4b33b391483d90df45eba95079f0bd826e4039a +RMD160 (leptonica-1.73.tar.gz) = a95b69ca0ea40203519b2cf59ea71f037179fb46 +SHA512 (leptonica-1.73.tar.gz) = 4808474d5941a91fbf542a22fed26ddc33f9c4baf2699096acf5e894b7e4e84889d165373b7d1df391a68cda8176113cf122f15203a9e38d3059e17140efc575 +Size (leptonica-1.73.tar.gz) = 10894175 bytes From 2606efc762e89465ada94afccfc20f7b01a0c795 Mon Sep 17 00:00:00 2001 From: fhajny Date: Thu, 17 Mar 2016 12:45:09 +0000 Subject: [PATCH 0263/2457] Updated graphics/leptonica to 1.73 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 7435a8e02a1a4..b62ca113e1a29 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1239 2016/03/17 07:55:52 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1240 2016/03/17 12:45:09 fhajny Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1638,3 +1638,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/goaccess to 0.9.8 [wiedi 2016-03-17] Updated lang/ruby22-base to 2.2.4nb3 [wiz 2016-03-17] Updated lang/ruby23-base to 2.3.0nb2 [wiz 2016-03-17] + Updated graphics/leptonica to 1.73 [fhajny 2016-03-17] From 76e2948806853db9210be173a2a1feca28d186f5 Mon Sep 17 00:00:00 2001 From: fhajny Date: Thu, 17 Mar 2016 12:51:14 +0000 Subject: [PATCH 0264/2457] Update graphics/tesseract to 3.04.01. Move to new home at Github. Clean up. 2015-02-17 - V3.04.01 - Added OSD renderer for psm 0. Works for single page and multi-page images. - Improve tesstrain.sh script. - Simplify build and run of ScrollView. - Improved PDF output for OS X Preview utility. - INCOMPATIBLE fix to hOCR line height information - commit 134ebc3. - Added option to build Tesseract without Cube OCR engine (-DNO_CUBE_BUILD). - Enable OpenMP support. - Many bug fixes. 2015-07-11 - V3.04.00 - Tesseract development is now done with Git and hosted at github.com (Previously we used Subversion as a VCS and code.google.com for hosting). - Tesseract now requires leptonica 1.71 or a higher version. - Removed official support for VS 2008. - Added support for 39 additional scripts/languages, including: amh, asm, aze_cyrl, bod, bos, ceb, cym, dzo, fas, gle, guj, hat, iku, jav, kat, kat_old, kaz, khm, kir, kur, lao, lat, mar, mya, nep, ori, pan, pus, san, sin, srp_latn, syr, tgk, tir, uig, urd, uzb, uzb_cyrl, yid - Major updates to training system as a result of extensive testing on 100 languages. - New training data for over 100 languages - Improved performance with PIC compilation option. - Significant change to invisible font system in pdf output to improve correctness and compatibility with external programs, particularly ghostscript. - Improved font identification. - Major change to improve layout analysis for heavily diacritic languages: Thai, Vietnamese, Kannada, Telugu etc. - Fixed problems with shifted baselines so recognition can recover from layout analysis errors. - Major refactor to improve speed on difficult images, especially when running a heap checker. - Moved params from global in page layout to tesseractclass. - Improved single column layout analysis. - Allow ocr output to multiple formats using tesseract command line executable. - Fixed issues with mixed eng+ara scripts. - Improved script consistency in numbers. - Major refactor of control.cpp to enable line recognition. - Added tesstrain.sh - a master training script. - Added ability to text2image training tool to just list available fonts. - Added ability to text2image to underline words. - Improved efficiency of image processing for PDF output. - Added parameter description for each parameter listed with 'print-parameters' command line option. - Added font info to hOCR output. - Enabled streaming input and output of multi-page documents. - Many bug fixes. 2014-02-04 - V3.03(rc1) - Added new training tool text2image to generate box/tif file pairs from text and truetype fonts. - Added support for PDF output with searchable text. - Removed entire IMAGE class and all code in image directory. - Tesseract executable: support for output to stdout; limited support for one page images from stdin (especially on Windows) - Added Renderer to API to allow document-level processing and output of document formats, like hOCR, PDF. - Major refactor of word-level recognition, beam search, eliminating dead code. - Refactored classifier to make it easier to add new ones. - Generalized feature extractor to allow feature extraction from greyscale. - Improved sub/superscript treatment. - Improved baseline fit. - Added set_unicharset_properties to training tools. - Many bug fixes. - More training source data included. --- graphics/tesseract/Makefile | 43 +++--- graphics/tesseract/PLIST | 59 ++++++++- graphics/tesseract/distinfo | 258 ++---------------------------------- 3 files changed, 90 insertions(+), 270 deletions(-) diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile index 86e1eab20a6b6..9f18770620ac0 100644 --- a/graphics/tesseract/Makefile +++ b/graphics/tesseract/Makefile @@ -1,38 +1,41 @@ -# $NetBSD: Makefile,v 1.17 2016/01/06 10:46:53 adam Exp $ +# $NetBSD: Makefile,v 1.18 2016/03/17 12:51:14 fhajny Exp $ -DISTNAME= tesseract-ocr-3.02.02 -PKGNAME= ${DISTNAME:S/-ocr//} -PKGREVISION= 2 +DISTNAME= tesseract-3.04.01 CATEGORIES= graphics -MASTER_SITES= https://tesseract-ocr.googlecode.com/files/ -DISTFILES+= ${DISTNAME}.tar.gz +MASTER_SITES= ${MASTER_SITE_GITHUB:=tesseract-ocr/} +DISTFILES= ${DEFAULT_DISTFILES} MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://code.google.com/p/tesseract-ocr/ -COMMENT= Commercial quality open source OCR engine +HOMEPAGE= http://github.com/tesseract-ocr/tesseract/ +COMMENT= Tesseract Open Source OCR Engine LICENSE= apache-2.0 +LANGVER= 3.04.00 +DISTFILES+= tessdata-${LANGVER}${EXTRACT_SUFX} +SITES.tessdata-${LANGVER}.tar.gz= -${MASTER_SITES:Q}tessdata/archive/${LANGVER}.tar.gz + USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake pax GNU_CONFIGURE= yes -CONFIGURE_ENV+= LIBLEPT_HEADERSDIR=${BUILDLINK_PREFIX.leptonica}/include -MAKE_ENV+= LANGS=${TESSERACT_LANGS:Q} -WRKSRC= ${WRKDIR}/tesseract-ocr +INSTALL_TARGET= install training-install INSTALLATION_DIRS= libexec share/doc/tesseract share/tesseract -TESSERACT_LANGS= afr ara aze bel ben bul cat ces chi_sim chi_tra chr \ - dan deu ell eng enm epo equ est eus fin fra frk frm \ - glg grc heb hin hrv hun ind isl ita jpn kan kor lav \ - lit mal mkd mlt msa nld nor pol por rus slk slv spa \ - sqi srp swa swe tam tel tgl tha tur ukr vie -.for l in ${TESSERACT_LANGS} -DISTFILES+= tesseract-ocr-3.02.${l}.tar.gz -.endfor +post-extract: + ${MV} ${WRKDIR}/tessdata-${LANGVER}/* ${WRKSRC}/tessdata + +# Building the training tools requires that the base build is done +post-build: + cd ${WRKSRC} && ${BUILD_MAKE_CMD} training -LIBS.SunOS+= -lsocket -lnsl +post-install: + cd ${WRKSRC}/tessdata && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \ + ${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} install-langs +.include "../../devel/pango/buildlink3.mk" +.include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/leptonica/buildlink3.mk" +.include "../../textproc/icu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tesseract/PLIST b/graphics/tesseract/PLIST index 087a138917924..4e1b486824a38 100644 --- a/graphics/tesseract/PLIST +++ b/graphics/tesseract/PLIST @@ -1,12 +1,14 @@ -@comment $NetBSD: PLIST,v 1.7 2014/10/02 16:06:02 adam Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/03/17 12:51:14 fhajny Exp $ bin/ambiguous_words bin/classifier_tester bin/cntraining bin/combine_tessdata bin/dawg2wordlist bin/mftraining +bin/set_unicharset_properties bin/shapeclustering bin/tesseract +bin/text2image bin/unicharset_extractor bin/wordlist2dawg include/tesseract/apitypes.h @@ -21,10 +23,13 @@ include/tesseract/host.h include/tesseract/ltrresultiterator.h include/tesseract/memry.h include/tesseract/ndminx.h +include/tesseract/ocrclass.h +include/tesseract/osdetect.h include/tesseract/pageiterator.h include/tesseract/params.h include/tesseract/platform.h include/tesseract/publictypes.h +include/tesseract/renderer.h include/tesseract/resultiterator.h include/tesseract/serialis.h include/tesseract/strngs.h @@ -47,6 +52,7 @@ man/man1/wordlist2dawg.1 man/man5/unicharambigs.5 man/man5/unicharset.5 share/tessdata/afr.traineddata +share/tessdata/amh.traineddata share/tessdata/ara.cube.bigrams share/tessdata/ara.cube.fold share/tessdata/ara.cube.lm @@ -55,17 +61,23 @@ share/tessdata/ara.cube.params share/tessdata/ara.cube.size share/tessdata/ara.cube.word-freq share/tessdata/ara.traineddata +share/tessdata/asm.traineddata share/tessdata/aze.traineddata +share/tessdata/aze_cyrl.traineddata share/tessdata/bel.traineddata share/tessdata/ben.traineddata +share/tessdata/bod.traineddata +share/tessdata/bos.traineddata share/tessdata/bul.traineddata share/tessdata/cat.traineddata +share/tessdata/ceb.traineddata share/tessdata/ces.traineddata share/tessdata/chi_sim.traineddata share/tessdata/chi_tra.traineddata share/tessdata/chr.traineddata share/tessdata/configs/ambigs.train share/tessdata/configs/api_config +share/tessdata/configs/bigram share/tessdata/configs/box.train share/tessdata/configs/box.train.stderr share/tessdata/configs/digits @@ -75,12 +87,18 @@ share/tessdata/configs/kannada share/tessdata/configs/linebox share/tessdata/configs/logfile share/tessdata/configs/makebox +share/tessdata/configs/pdf share/tessdata/configs/quiet share/tessdata/configs/rebox share/tessdata/configs/strokewidth +share/tessdata/configs/txt share/tessdata/configs/unlv +share/tessdata/cym.traineddata share/tessdata/dan.traineddata +share/tessdata/dan_frak.traineddata share/tessdata/deu.traineddata +share/tessdata/deu_frak.traineddata +share/tessdata/dzo.traineddata share/tessdata/ell.traineddata share/tessdata/eng.cube.bigrams share/tessdata/eng.cube.fold @@ -91,11 +109,14 @@ share/tessdata/eng.cube.size share/tessdata/eng.cube.word-freq share/tessdata/eng.tesseract_cube.nn share/tessdata/eng.traineddata +share/tessdata/eng.user-patterns +share/tessdata/eng.user-words share/tessdata/enm.traineddata share/tessdata/epo.traineddata share/tessdata/equ.traineddata share/tessdata/est.traineddata share/tessdata/eus.traineddata +share/tessdata/fas.traineddata share/tessdata/fin.traineddata share/tessdata/fra.cube.bigrams share/tessdata/fra.cube.fold @@ -108,8 +129,11 @@ share/tessdata/fra.tesseract_cube.nn share/tessdata/fra.traineddata share/tessdata/frk.traineddata share/tessdata/frm.traineddata +share/tessdata/gle.traineddata share/tessdata/glg.traineddata share/tessdata/grc.traineddata +share/tessdata/guj.traineddata +share/tessdata/hat.traineddata share/tessdata/heb.traineddata share/tessdata/hin.cube.bigrams share/tessdata/hin.cube.fold @@ -121,6 +145,7 @@ share/tessdata/hin.tesseract_cube.nn share/tessdata/hin.traineddata share/tessdata/hrv.traineddata share/tessdata/hun.traineddata +share/tessdata/iku.traineddata share/tessdata/ind.traineddata share/tessdata/isl.traineddata share/tessdata/ita.cube.bigrams @@ -132,19 +157,38 @@ share/tessdata/ita.cube.size share/tessdata/ita.cube.word-freq share/tessdata/ita.tesseract_cube.nn share/tessdata/ita.traineddata +share/tessdata/ita_old.traineddata +share/tessdata/jav.traineddata share/tessdata/jpn.traineddata share/tessdata/kan.traineddata +share/tessdata/kat.traineddata +share/tessdata/kat_old.traineddata +share/tessdata/kaz.traineddata +share/tessdata/khm.traineddata +share/tessdata/kir.traineddata share/tessdata/kor.traineddata +share/tessdata/kur.traineddata +share/tessdata/lao.traineddata +share/tessdata/lat.traineddata share/tessdata/lav.traineddata share/tessdata/lit.traineddata share/tessdata/mal.traineddata +share/tessdata/mar.traineddata share/tessdata/mkd.traineddata share/tessdata/mlt.traineddata share/tessdata/msa.traineddata +share/tessdata/mya.traineddata +share/tessdata/nep.traineddata share/tessdata/nld.traineddata share/tessdata/nor.traineddata +share/tessdata/ori.traineddata +share/tessdata/osd.traineddata +share/tessdata/pan.traineddata +share/tessdata/pdf.ttf share/tessdata/pol.traineddata share/tessdata/por.traineddata +share/tessdata/pus.traineddata +share/tessdata/ron.traineddata share/tessdata/rus.cube.fold share/tessdata/rus.cube.lm share/tessdata/rus.cube.nn @@ -152,7 +196,10 @@ share/tessdata/rus.cube.params share/tessdata/rus.cube.size share/tessdata/rus.cube.word-freq share/tessdata/rus.traineddata +share/tessdata/san.traineddata +share/tessdata/sin.traineddata share/tessdata/slk.traineddata +share/tessdata/slk_frak.traineddata share/tessdata/slv.traineddata share/tessdata/spa.cube.bigrams share/tessdata/spa.cube.fold @@ -162,10 +209,13 @@ share/tessdata/spa.cube.params share/tessdata/spa.cube.size share/tessdata/spa.cube.word-freq share/tessdata/spa.traineddata +share/tessdata/spa_old.traineddata share/tessdata/sqi.traineddata share/tessdata/srp.traineddata +share/tessdata/srp_latn.traineddata share/tessdata/swa.traineddata share/tessdata/swe.traineddata +share/tessdata/syr.traineddata share/tessdata/tam.traineddata share/tessdata/tel.traineddata share/tessdata/tessconfigs/batch @@ -174,8 +224,15 @@ share/tessdata/tessconfigs/matdemo share/tessdata/tessconfigs/msdemo share/tessdata/tessconfigs/nobatch share/tessdata/tessconfigs/segdemo +share/tessdata/tgk.traineddata share/tessdata/tgl.traineddata share/tessdata/tha.traineddata +share/tessdata/tir.traineddata share/tessdata/tur.traineddata +share/tessdata/uig.traineddata share/tessdata/ukr.traineddata +share/tessdata/urd.traineddata +share/tessdata/uzb.traineddata +share/tessdata/uzb_cyrl.traineddata share/tessdata/vie.traineddata +share/tessdata/yid.traineddata diff --git a/graphics/tesseract/distinfo b/graphics/tesseract/distinfo index 3401290a4a5d0..2cb1e430f90e3 100644 --- a/graphics/tesseract/distinfo +++ b/graphics/tesseract/distinfo @@ -1,252 +1,12 @@ -$NetBSD: distinfo,v 1.12 2015/11/03 21:34:21 agc Exp $ +$NetBSD: distinfo,v 1.13 2016/03/17 12:51:14 fhajny Exp $ -SHA1 (tesseract-ocr-3.02.02.tar.gz) = a950acf7b75cf851de2de787e9abb62c58ca1827 -RMD160 (tesseract-ocr-3.02.02.tar.gz) = 6489b3756aab1ccadba1dd5d19e64d2cb6e90789 -SHA512 (tesseract-ocr-3.02.02.tar.gz) = 52f60f95f7e8e68f5ad633f8c79e6320e284484ac870e4741cce14e4e043dd269bdb66ddb9bdfd111844aa42d18f9156622986d27100803f4fb86d378a73d3f1 -Size (tesseract-ocr-3.02.02.tar.gz) = 3890393 bytes -SHA1 (tesseract-ocr-3.02.afr.tar.gz) = fe8fa7f87d207024938abf6e143f6612cd6bbbc7 -RMD160 (tesseract-ocr-3.02.afr.tar.gz) = 3668e993e44feed9bfd8a9db2ba6f29f5f239a23 -SHA512 (tesseract-ocr-3.02.afr.tar.gz) = b2071771f6c720a9bd898da305f337a9f5a75d5a5056fffeafce6c71acc5512bb347374aa9cf2131c946f6beb815bf4760144a8ad1e189774562a03976bec5fd -Size (tesseract-ocr-3.02.afr.tar.gz) = 1082552 bytes -SHA1 (tesseract-ocr-3.02.ara.tar.gz) = e15cf6b7a027454db56ecedab0038c7739ab29cc -RMD160 (tesseract-ocr-3.02.ara.tar.gz) = a57502bacac49f396ad18254f8021d141f1d9908 -SHA512 (tesseract-ocr-3.02.ara.tar.gz) = 6d4b2a8ba86da08e2692993bde3ad63c7ef003d7b1bb1bb3c9ac1fa628146b7ff305f70c7537af0426c7aa956566cb4a1d37675b3a5440f644627bfc7706d012 -Size (tesseract-ocr-3.02.ara.tar.gz) = 6613796 bytes -SHA1 (tesseract-ocr-3.02.aze.tar.gz) = 8e26797471e9cd943ac76cd6803e596ed3fb0625 -RMD160 (tesseract-ocr-3.02.aze.tar.gz) = 44a89d7b69caef6d52887069ccb516ff660d8cf0 -SHA512 (tesseract-ocr-3.02.aze.tar.gz) = f314239192eee55ecdf711ea494cd1452fdaa1f9d869b0ffee0c0befd37e1b13c14a42c383f024f732d6b180954c0df7cecb8d9c53706afa13209bf4a313940f -Size (tesseract-ocr-3.02.aze.tar.gz) = 1418724 bytes -SHA1 (tesseract-ocr-3.02.bel.tar.gz) = 9fc3a081e077b23d8da253f227e8a337acd9a6c8 -RMD160 (tesseract-ocr-3.02.bel.tar.gz) = e09918242105a320ba40a4333fa264f933c35fef -SHA512 (tesseract-ocr-3.02.bel.tar.gz) = c30fb8460398526d11dcb97800b8a7bc24ccba71403f000a7e29a2a04da4c5a969352caecb2fee5c13e383292b50f33b187f394a88f0aa2ed14075a397c743f0 -Size (tesseract-ocr-3.02.bel.tar.gz) = 1278018 bytes -SHA1 (tesseract-ocr-3.02.ben.tar.gz) = d1b2dec8ee537598594554768de899a9e8e361f6 -RMD160 (tesseract-ocr-3.02.ben.tar.gz) = 717de30e225380f9fb7a0845d9b0288a3074f58c -SHA512 (tesseract-ocr-3.02.ben.tar.gz) = 6b9bf6095895bc855d49fa7222a2839d4a709bd3e15cbadbc8d914eed6687e66cf4c3a0b2691ff3ffde612990a6a46ca17c9e347889f3621c6df8a68035677df -Size (tesseract-ocr-3.02.ben.tar.gz) = 6854068 bytes -SHA1 (tesseract-ocr-3.02.bul.tar.gz) = 34ef79f0f0f3f2b7715c343ea5357791e52336d8 -RMD160 (tesseract-ocr-3.02.bul.tar.gz) = ad807968a439d969277b5c10fcdaf11541388fdd -SHA512 (tesseract-ocr-3.02.bul.tar.gz) = 7ce56e1c3496aaae765ec80af8e3a73ca606b8abd5a5fb3fc6707b37cad69c2ee307863a71fcc1c214dfd103beb2be81e4acbe31bdc1cf06e8fcae4d0e20ac3b -Size (tesseract-ocr-3.02.bul.tar.gz) = 1607632 bytes -SHA1 (tesseract-ocr-3.02.cat.tar.gz) = 1d806a2346100d93bcfc32ebf4b4c94ab006ef93 -RMD160 (tesseract-ocr-3.02.cat.tar.gz) = e477eb53f518f8fd985ec18a2f790da103a46c35 -SHA512 (tesseract-ocr-3.02.cat.tar.gz) = 60b5dedd7d9bb5ebf69df84c702fb2a6d6ed9eaf5a49dcb95916a73c39637dfffcb44fe0a577a6a42117885ee931f8a00298ae9260d8eb91c999eb603b3595ab -Size (tesseract-ocr-3.02.cat.tar.gz) = 1651754 bytes -SHA1 (tesseract-ocr-3.02.ces.tar.gz) = 82f1797de7c06bfa9a20dbf2e4e1db03a0e94be0 -RMD160 (tesseract-ocr-3.02.ces.tar.gz) = e052064161b85d7df022349d4ee6ef5d5ddf7bed -SHA512 (tesseract-ocr-3.02.ces.tar.gz) = 387f70e7f7dbda1dccfdd5407df0be2f243350350c544751729b16db4683d62f93710b04403b661dc1ce146111438fff3fe50e339c67d76a9a65917fa77bb68c -Size (tesseract-ocr-3.02.ces.tar.gz) = 1045965 bytes -SHA1 (tesseract-ocr-3.02.chi_sim.tar.gz) = edcfd4cea1b5e52a37eed605c6a2d7d5e15ef03f -RMD160 (tesseract-ocr-3.02.chi_sim.tar.gz) = ca385bdee6ddbd3e96fb2f6ea707ed3e288dc76c -SHA512 (tesseract-ocr-3.02.chi_sim.tar.gz) = ffeab2cc610a37865289b1223d82b7d5b858fedb15474daa743d7f38e485b379ba95fe2a1e17078b658635681b3cac1986898ffa11ef18b09b3207421a51c757 -Size (tesseract-ocr-3.02.chi_sim.tar.gz) = 17920627 bytes -SHA1 (tesseract-ocr-3.02.chi_tra.tar.gz) = f2c8bca5ffeb62e0a10d685d4f66a029472ffe52 -RMD160 (tesseract-ocr-3.02.chi_tra.tar.gz) = 100faf598d64bee7145847b243dd336fe13bc8ee -SHA512 (tesseract-ocr-3.02.chi_tra.tar.gz) = a69c66bb72199c6dbc50bf9235b718bb913ed8ea87c7ee15f5898472deb574fefbe60d0d7a6de098dad0da5ce5754507feca5964edeaa870c4d3d572eb4e43ca -Size (tesseract-ocr-3.02.chi_tra.tar.gz) = 24997251 bytes -SHA1 (tesseract-ocr-3.02.chr.tar.gz) = b9ead6114a41b395a82f1d33a276d524af81f993 -RMD160 (tesseract-ocr-3.02.chr.tar.gz) = ce4fa8a150cca59b4a554aa68a8a1274801cede4 -SHA512 (tesseract-ocr-3.02.chr.tar.gz) = 8e43090e1e38d6ea032968f5b6bc267025d05a427e93baded9b94fecf2b74072a38ed9f43af905b3e72d34ca6818d40a9a6c3c29445a86bfea75796a0beab8dd -Size (tesseract-ocr-3.02.chr.tar.gz) = 322002 bytes -SHA1 (tesseract-ocr-3.02.dan.tar.gz) = b2c4c09cde1ac5229d22eff72accb60e66b09c2b -RMD160 (tesseract-ocr-3.02.dan.tar.gz) = e9ab962bdb6b7f94b37b85f6b04af1dee0f8fab1 -SHA512 (tesseract-ocr-3.02.dan.tar.gz) = 933c8744eb08586d52d576345096670aae6fec9cdb6c93d2b26bc30ebca693ba0bcb83f77e62ba4ed552199f5c6adade374dd22c35a20ab6d9841fe0da6e8168 -Size (tesseract-ocr-3.02.dan.tar.gz) = 2653066 bytes -SHA1 (tesseract-ocr-3.02.deu.tar.gz) = 6d21596225f9a4c36fa81b19518f2aead8c8ac79 -RMD160 (tesseract-ocr-3.02.deu.tar.gz) = 7dbb3078b859bff828fbcebc2f57b232ae8fa700 -SHA512 (tesseract-ocr-3.02.deu.tar.gz) = 897b62ca9befa884c1bea640ef1b6be9a9ef975ab68b07e434d61f1cce21419ac303c0110005f30f8cdd47102f6dc9b742effc185b6d4fe62026343e77cce602 -Size (tesseract-ocr-3.02.deu.tar.gz) = 1825064 bytes -SHA1 (tesseract-ocr-3.02.ell.tar.gz) = 5a5746c7a1e473c89de71a4dd46a8a888ba4ce76 -RMD160 (tesseract-ocr-3.02.ell.tar.gz) = a741981cef2274cd583108e2c16e8e6ed12e58bb -SHA512 (tesseract-ocr-3.02.ell.tar.gz) = 070950f3816e4bc481e0e7f2c9800d3bf0db33671254c319df164e541e741ce34ecc2e1f897edb8584139325cd3863ee6eca81d26ddfd576bed90c1b391221d0 -Size (tesseract-ocr-3.02.ell.tar.gz) = 866284 bytes -SHA1 (tesseract-ocr-3.02.eng.tar.gz) = 989ed4c3a5b246d7353893e466c353099d8b73a1 -RMD160 (tesseract-ocr-3.02.eng.tar.gz) = 795d2050133b5398a9f13eb291f9b36da124ec5a -SHA512 (tesseract-ocr-3.02.eng.tar.gz) = 4db016a3809be03855c41363788907f404e08aa277cf891e86de5f0d7da5f4f9fd76f6e19a2a983a7906a94c8235e66608fefe45e0bdc786e44e613896d1f48c -Size (tesseract-ocr-3.02.eng.tar.gz) = 12641221 bytes -SHA1 (tesseract-ocr-3.02.enm.tar.gz) = 8d83830859654ffb7e1228f6fbd2604aafea987f -RMD160 (tesseract-ocr-3.02.enm.tar.gz) = c7e43a22e207245b9b6784bc2c92e5ca5dd4c477 -SHA512 (tesseract-ocr-3.02.enm.tar.gz) = 5a7e5c014798822cda2a17bf1e3ae9e00c01376b795ed40c39811d3aec8dbbd8d1039a9bb52f933c90bb0dbc7640af460768d67a20ae44c15b00d00fbc82bbf4 -Size (tesseract-ocr-3.02.enm.tar.gz) = 624909 bytes -SHA1 (tesseract-ocr-3.02.epo.tar.gz) = 84ff2e071864e2766dcde842cdbe74d6bdd59549 -RMD160 (tesseract-ocr-3.02.epo.tar.gz) = ee80cb8814d3518c6b7b8efba83563e2be38a284 -SHA512 (tesseract-ocr-3.02.epo.tar.gz) = 078d301b7d787c6a229c4e41cfb04ddb2d1bf87d86c25b7bf4cb372f6d8e8fadaa10e7a06cb64d5707a04464934cc693ed5da68beeff60456f3c2390d1632a75 -Size (tesseract-ocr-3.02.epo.tar.gz) = 1249158 bytes -SHA1 (tesseract-ocr-3.02.equ.tar.gz) = 24b46c2bfe4a652b6ac7bdee9afb68f44ffc333e -RMD160 (tesseract-ocr-3.02.equ.tar.gz) = 63c2fe3b12b771a1f832261e366b6ed494779ae4 -SHA512 (tesseract-ocr-3.02.equ.tar.gz) = d8045143991c835b5d024f89e3d0c0ad51a540b782a26ff8c80569cb8ed05d12abf3a9e8e7f705bb6a86a7f5daf8794a6766e354d6e34d29846d83e6c2bf8bdc -Size (tesseract-ocr-3.02.equ.tar.gz) = 827909 bytes -SHA1 (tesseract-ocr-3.02.est.tar.gz) = d37d2c295472f6e6ded26c9d799380d205a8cec4 -RMD160 (tesseract-ocr-3.02.est.tar.gz) = e2cb8fd06c08fc0579339f2777d04db6d7b7c235 -SHA512 (tesseract-ocr-3.02.est.tar.gz) = 6b5b77bda2f96bc6a52ec2c15ca37031e4f3bc2845913fde7a5478fa22eaef55cdbd69cc8cfa76f8dd9b1288dce7f065bafb6c9e477ef375462371e179c0d1b6 -Size (tesseract-ocr-3.02.est.tar.gz) = 1881719 bytes -SHA1 (tesseract-ocr-3.02.eus.tar.gz) = 072b7a4fc36c8b28903e9ef651693be702f21afd -RMD160 (tesseract-ocr-3.02.eus.tar.gz) = f8e7a858ac29a1a0260a1feaaba132fd5d760451 -SHA512 (tesseract-ocr-3.02.eus.tar.gz) = e677db9c1c2dd49de8570655f66c0483977f3d1bf0b18239fac5a9158fc23b53ae60d0077d2bf0265181bab3147d3100dbe96d109f4153fdbad29b68b1b2a48b -Size (tesseract-ocr-3.02.eus.tar.gz) = 1639091 bytes -SHA1 (tesseract-ocr-3.02.fin.tar.gz) = c30b504178e5fabd8f084f59e72aa9579b4ee436 -RMD160 (tesseract-ocr-3.02.fin.tar.gz) = ecbf8d0b61849dd8bfc3389e834af01965f853a0 -SHA512 (tesseract-ocr-3.02.fin.tar.gz) = a17682e3c9e07d46db7bc4b6e65850b1e7cbfe21e69bfe1f25b6adf7f24404932f7654775072b8b3ccdc8accb026a8ddf6ec36bee63b5be77ae2bc1e833f9368 -Size (tesseract-ocr-3.02.fin.tar.gz) = 986093 bytes -SHA1 (tesseract-ocr-3.02.fra.tar.gz) = 627893d878b33138608df372d191bd799b0edd4f -RMD160 (tesseract-ocr-3.02.fra.tar.gz) = 40b2b7bc846e36f46c12114c05e8b066a1bd3ff7 -SHA512 (tesseract-ocr-3.02.fra.tar.gz) = d10a23acb0dd4128c00a5c3d90ceace55601d2847b60a59d4d268252ac04f5d3917c98fceff02dc7e98fd1ec7233332d56ba53d71da73044f8547e5c19da2209 -Size (tesseract-ocr-3.02.fra.tar.gz) = 6474735 bytes -SHA1 (tesseract-ocr-3.02.frk.tar.gz) = 81b897434eee2762757519097913bd02ba527dd1 -RMD160 (tesseract-ocr-3.02.frk.tar.gz) = 63c4aee87dd263f29c513cdf86437643f945f843 -SHA512 (tesseract-ocr-3.02.frk.tar.gz) = af290d34bd32639a26f421916a2e2819e101d3168261e0896bca96097f6ba3d05f30b9e2aefb89ff2de62c14470ed35fafd3b6f981f7d732a05b1de364018039 -Size (tesseract-ocr-3.02.frk.tar.gz) = 5915892 bytes -SHA1 (tesseract-ocr-3.02.frm.tar.gz) = e52f58b8244f67f07b3bc0f849247b79ab6d1bcb -RMD160 (tesseract-ocr-3.02.frm.tar.gz) = 3e6f57f7414c1e88a2dce997b5e7e5f1b3fca598 -SHA512 (tesseract-ocr-3.02.frm.tar.gz) = d5b7f81a0f272d25694ae6461f0cac45d677625ea1b5a94b0fbadeded865938311b9767afd083b6ea8c162b4f803ae4f32f510232b5e0c8d9fc985f5d4e24383 -Size (tesseract-ocr-3.02.frm.tar.gz) = 5179468 bytes -SHA1 (tesseract-ocr-3.02.glg.tar.gz) = dee1605b15a57b321e7ad747df6c12a9491cfb08 -RMD160 (tesseract-ocr-3.02.glg.tar.gz) = d9e37bf597ef20c20191c2b4f27ff866b4a17838 -SHA512 (tesseract-ocr-3.02.glg.tar.gz) = 0ac9b1d0f28ab356786caa5b5f57a8d51b9a963dc45c8cf1ab20778f4bbf5f468b9b2cd8ba395362e0f904ac3c6a28b8b8550c118b2058ec7d36909f93a3495f -Size (tesseract-ocr-3.02.glg.tar.gz) = 1668470 bytes -SHA1 (tesseract-ocr-3.02.grc.tar.gz) = 2502de7df524264959c73f7253c580f491ee9a2d -RMD160 (tesseract-ocr-3.02.grc.tar.gz) = f3063b271102598e3d0985a13d8c497a8ac2af70 -SHA512 (tesseract-ocr-3.02.grc.tar.gz) = 166885daf8525538dd82c49d34ea7459c461f15aa3aa1cd8afe7c75367714a147ae0200bcd765116017518cdb5982044fa2294fb7df3b9d260199c438a9d01c4 -Size (tesseract-ocr-3.02.grc.tar.gz) = 3417998 bytes -SHA1 (tesseract-ocr-3.02.heb.tar.gz) = 67e10e616caf62545eacd436e85f89436687e22b -RMD160 (tesseract-ocr-3.02.heb.tar.gz) = 1c88989da04ae2514e92836a9682defd72a8d612 -SHA512 (tesseract-ocr-3.02.heb.tar.gz) = 1a2eb1ff20a52c98607db2f132e7a6789236cbe35eceb7a5ad07db9298afc2d6b4516026e9c1c55f5393d72b906642414ca8ff38869d63aec6fd1c98f5ef9e5d -Size (tesseract-ocr-3.02.heb.tar.gz) = 1062155 bytes -SHA1 (tesseract-ocr-3.02.hin.tar.gz) = 4ceef97ffb8b4ab5ac79ee4bad5b5be0885f228f -RMD160 (tesseract-ocr-3.02.hin.tar.gz) = 7ac8934ff29c8c65ca42c1ae4533e850613a871a -SHA512 (tesseract-ocr-3.02.hin.tar.gz) = 5b86946723b591d2a0289879dd7a9fa015fdd0c63332f877e4bc59281b50cbd61cba5c23a9b9ad677a884207d3bc97e6fcaf832dc8bae6d643e519e53dfdda13 -Size (tesseract-ocr-3.02.hin.tar.gz) = 10117234 bytes -SHA1 (tesseract-ocr-3.02.hrv.tar.gz) = c281dbaca6c1fa39ab1e7a82b43542fa46a9020b -RMD160 (tesseract-ocr-3.02.hrv.tar.gz) = 999b8e9559b90ff416cabe869f12f915bf43e437 -SHA512 (tesseract-ocr-3.02.hrv.tar.gz) = 2161919c3ac8414e7c316e42887f15e77b7e726d33bd17cf37396a89928bd8b3a79608feac1b7d7bc255fa2546c77677839710dcdf715d0480db84e0e3bc235f -Size (tesseract-ocr-3.02.hrv.tar.gz) = 1917626 bytes -SHA1 (tesseract-ocr-3.02.hun.tar.gz) = 4d7b4534d03c1a6a3861dac0f66da13fd9601e62 -RMD160 (tesseract-ocr-3.02.hun.tar.gz) = b92f41f560604c6b733cf5f5deeac2daf3703062 -SHA512 (tesseract-ocr-3.02.hun.tar.gz) = 58c2e2b983a535c793485cf793ddd32fbf019760c7bfe425d207309f621398f9ee8a9c1ceffb45480f23d69f9d6d004e11044cf70e8827bca71db20df9286a90 -Size (tesseract-ocr-3.02.hun.tar.gz) = 3132378 bytes -SHA1 (tesseract-ocr-3.02.ind.tar.gz) = 364fe00da0be5bd47661a68acf10ac0bc928cdaf -RMD160 (tesseract-ocr-3.02.ind.tar.gz) = 134303a34137b6dfe76f3823f879a163403e22fb -SHA512 (tesseract-ocr-3.02.ind.tar.gz) = 130539c088f56bcce449324208561d1427af53e74c0b5de0652f25966d2ff86005829eefb449ad24d6f0005ba8d7eeac022a70523c60db97225eb3b7d7252c51 -Size (tesseract-ocr-3.02.ind.tar.gz) = 1872259 bytes -SHA1 (tesseract-ocr-3.02.isl.tar.gz) = 7036d949d1860f192d4e038597c435d47fe8ca9a -RMD160 (tesseract-ocr-3.02.isl.tar.gz) = ab9f2dbc392920c07840c5311bf91d07170f9ab1 -SHA512 (tesseract-ocr-3.02.isl.tar.gz) = c6f5a1b6a7b483e5bc3430dd3496ce9023ff5d84493a489eea4e306eb5dcba0c017b256671269772d04729021bf37f498675a10692a2271673e37b94c1023d70 -Size (tesseract-ocr-3.02.isl.tar.gz) = 1632509 bytes -SHA1 (tesseract-ocr-3.02.ita.tar.gz) = b4d75234cab050db69874190d1bab5b2b1c59961 -RMD160 (tesseract-ocr-3.02.ita.tar.gz) = 1967275b5fc1a76a4fbbf97458f7aa61cb77c15e -SHA512 (tesseract-ocr-3.02.ita.tar.gz) = 20246685d0d092de96ebddadf2ae981ab9035c0735ae7cfafc6aa943a009516649a32e6db06a61932218b4c6a1e9dc33dad5fd403207fe1982f598d06d7800d3 -Size (tesseract-ocr-3.02.ita.tar.gz) = 7173232 bytes -SHA1 (tesseract-ocr-3.02.jpn.tar.gz) = 7212a708ef688687538abe9a40aab99aa06017a2 -RMD160 (tesseract-ocr-3.02.jpn.tar.gz) = 7dbcaa6ce64e6a97267d81c706e0d74b3c13aa0f -SHA512 (tesseract-ocr-3.02.jpn.tar.gz) = 2d69e1dd569fc6d0b8fb44a76f064a848b8cc64cb6e220d181a4e0868f88b09aa59f2d4ed2a638cc84ca03af76b2483785dca94be2fe75d714d6a7efea6b731c -Size (tesseract-ocr-3.02.jpn.tar.gz) = 13691665 bytes -SHA1 (tesseract-ocr-3.02.kan.tar.gz) = d3a71631227b04dbcd370b1fdee6d423655663b7 -RMD160 (tesseract-ocr-3.02.kan.tar.gz) = 192e908039720d9b1c5b3a3c5e774cdaacda35f5 -SHA512 (tesseract-ocr-3.02.kan.tar.gz) = 38614b8f2b3b0ac4f37c87f4a63886be07862a33a47b8471239d149b56ded5237935a1be824be8cb873f89609adb6afee1fb337906677e5d410bd4188c17c644 -Size (tesseract-ocr-3.02.kan.tar.gz) = 4445839 bytes -SHA1 (tesseract-ocr-3.02.kor.tar.gz) = d39e165fb73e339c21fbdf995b9d0fffda9fd7db -RMD160 (tesseract-ocr-3.02.kor.tar.gz) = e305a5ea7c2a0635c57b232e9a8302a3e0c9eb8a -SHA512 (tesseract-ocr-3.02.kor.tar.gz) = 4720dc67011b8b2fc2292991f450c2ede9a5c285090a20566657b08aeb0daefdbc83626b9cd2b4ecb0e8db172f768f8449aa0f52bfac1eff137f5c6736528837 -Size (tesseract-ocr-3.02.kor.tar.gz) = 5419147 bytes -SHA1 (tesseract-ocr-3.02.lav.tar.gz) = 98fccc5c8b1613364d5386b29c9dfa82d178d772 -RMD160 (tesseract-ocr-3.02.lav.tar.gz) = 3e555976a384719d10e46b97c838b1a62c34fcbe -SHA512 (tesseract-ocr-3.02.lav.tar.gz) = 878aa91c1b87fa0346f30a471df123a0cbad5b08810c42f5b409cbe6855aba9b28ae93a73e8eb86c685edaffbb856ac9c4bafc7b658eb0c59d427ee9e0f43c7e -Size (tesseract-ocr-3.02.lav.tar.gz) = 1826809 bytes -SHA1 (tesseract-ocr-3.02.lit.tar.gz) = 1ef0fb76f9b463aa8a6e41056c87842d43102698 -RMD160 (tesseract-ocr-3.02.lit.tar.gz) = 0dbc183bd56a549057d383d216b6df0429e31359 -SHA512 (tesseract-ocr-3.02.lit.tar.gz) = f76beb2323c3d1c5f294d1e268be1921a3c03d8a4bdf236ebe9d3b4a46fa9a3ad941296cb12ef54b00d8f04978c1621f374a2fb8771d84d70161c768fd1f5592 -Size (tesseract-ocr-3.02.lit.tar.gz) = 1762787 bytes -SHA1 (tesseract-ocr-3.02.mal.tar.gz) = aadbded7e50f7dd503d62f99060836c9f4d65732 -RMD160 (tesseract-ocr-3.02.mal.tar.gz) = 1290bba4363a5356153d17252214a7d58c5db1ed -SHA512 (tesseract-ocr-3.02.mal.tar.gz) = a8d09f441d2ba6767d8811a33905c208889077cac70dca5120f42850cb3bfa2711b17ba93af666420592617d55a300742fe39bf4536ae32af36e596c55202005 -Size (tesseract-ocr-3.02.mal.tar.gz) = 6048861 bytes -SHA1 (tesseract-ocr-3.02.mkd.tar.gz) = f6a5235ad131dde816f3f151df4f999f4ea214c6 -RMD160 (tesseract-ocr-3.02.mkd.tar.gz) = 13aa3ca673c6203ed402f5081d71374fc2e09499 -SHA512 (tesseract-ocr-3.02.mkd.tar.gz) = 9559a8312e86b0388dad960e4f8cebb5bb9ee58ede5d7fb7690c1e9f9276a82a272ae7da267ba353d9d987eac97de434a1adf2ec8a3166e01637c84f76ed0d12 -Size (tesseract-ocr-3.02.mkd.tar.gz) = 1166336 bytes -SHA1 (tesseract-ocr-3.02.mlt.tar.gz) = 72d4ee59e6fd79f618a7ef09bdedb5e887d20db4 -RMD160 (tesseract-ocr-3.02.mlt.tar.gz) = 8885051d58e78a7ec6791d78b81164f657427cbc -SHA512 (tesseract-ocr-3.02.mlt.tar.gz) = e04f1da4386302dd0b6f311581626f31287c82f83c90fe5f8dc50ac5e86c6351fd57c271933c998a2b58a0c872daf2b16577e082b909c8c3d0ddcc5b0c80547e -Size (tesseract-ocr-3.02.mlt.tar.gz) = 1454216 bytes -SHA1 (tesseract-ocr-3.02.msa.tar.gz) = 6344682dc9fe541499f455ae88c07f5941d5e646 -RMD160 (tesseract-ocr-3.02.msa.tar.gz) = b6d055fb4f324efacfc711b85537449061e53b84 -SHA512 (tesseract-ocr-3.02.msa.tar.gz) = 9ceeae534dedf09339f339a25654e366c9b469f36ec5e6b9def925390e518d81ddb662036e1637fcc4242efd4322ba9d43a99a685db9c94586a19595d4a17cd4 -Size (tesseract-ocr-3.02.msa.tar.gz) = 1664381 bytes -SHA1 (tesseract-ocr-3.02.nld.tar.gz) = e68e491d68fa367e2d173b12f19330e3ed72e750 -RMD160 (tesseract-ocr-3.02.nld.tar.gz) = 41e41ab4c34e04a92148287811e92dd688e1e182 -SHA512 (tesseract-ocr-3.02.nld.tar.gz) = ee00ddb20a8ecb18ff6dbe5211bccb7bd7cf7342df8b7da29f3bde3677c8a2a24cbd99400f25224e2a2432955c11026277af8f98852016c95d349259eb746f1c -Size (tesseract-ocr-3.02.nld.tar.gz) = 1139701 bytes -SHA1 (tesseract-ocr-3.02.nor.tar.gz) = cc0f69a4df82adb0f8591f1dfbe3920ced46181b -RMD160 (tesseract-ocr-3.02.nor.tar.gz) = 9cf47c13e1aef04af77740729dbba480800e9f40 -SHA512 (tesseract-ocr-3.02.nor.tar.gz) = fbd1bebd94695880914e5fcc19f420583925391b24aab9e3852ca7d6c46dcf37b47d45498b60533615a5a571f48150d061f9e05cd75656438fdac558a8f62525 -Size (tesseract-ocr-3.02.nor.tar.gz) = 2184462 bytes -SHA1 (tesseract-ocr-3.02.pol.tar.gz) = b6c1092ad1bdba5dc019d8f84d3e6c3478e4ffb0 -RMD160 (tesseract-ocr-3.02.pol.tar.gz) = 4b9d6d437bf291a88bb366db8497cb5121807043 -SHA512 (tesseract-ocr-3.02.pol.tar.gz) = f3a2e323f35cba6a742a253bc03aaf911e5a4266de1a50bcfebc74fea6d1cf7b76860c81e395bdaeefbe0be25cfc2e2ebf1eb217825d15ace032b6fe463b1cc4 -Size (tesseract-ocr-3.02.pol.tar.gz) = 7067117 bytes -SHA1 (tesseract-ocr-3.02.por.tar.gz) = 919e6503bd7fc00ffeb27b0823ddad3d2aaf7ba9 -RMD160 (tesseract-ocr-3.02.por.tar.gz) = 53359d4e5df589336b29c185181e0b94c4a07f47 -SHA512 (tesseract-ocr-3.02.por.tar.gz) = e7a585477ee7b2c9fe74483342c403d3c7a0983ef4fb95d918b1187bdb92ebf6621ce682c71f753a4ab39c6d4b65df0b43730ef2e592352ec27b24769afe1a56 -Size (tesseract-ocr-3.02.por.tar.gz) = 920087 bytes -SHA1 (tesseract-ocr-3.02.rus.tar.gz) = 5caa3f1c5d46642e7c0c17ecd7cc4fe2a4aa2b0b -RMD160 (tesseract-ocr-3.02.rus.tar.gz) = bed7102a68eb1d2672addbfcbaca8adcba436f33 -SHA512 (tesseract-ocr-3.02.rus.tar.gz) = 2d72dfd03c48897dbda47a534567805ee3680170b093a550212e5651575cc1325e4f7962a6e8f21202ee2bb816bf2bd309add83537658847b5d5df1003399e1e -Size (tesseract-ocr-3.02.rus.tar.gz) = 9185294 bytes -SHA1 (tesseract-ocr-3.02.slk.tar.gz) = 946d6033b276f7e3fcfceca35978d3380d10710f -RMD160 (tesseract-ocr-3.02.slk.tar.gz) = 8cf5f1776f9a99d362428802ab2dc534d6bb5aa7 -SHA512 (tesseract-ocr-3.02.slk.tar.gz) = b2db7c8042218d5299902c41f82cf1727cc65ddd503b33bb535cbf4fca54cdaee3091468ea0b00e0277d08c2147ba1265da114dcd1f99e6095be4e9305efdc3e -Size (tesseract-ocr-3.02.slk.tar.gz) = 2486120 bytes -SHA1 (tesseract-ocr-3.02.slv.tar.gz) = cbd9506944069954e3742cbcac2f15ca7f7c90cc -RMD160 (tesseract-ocr-3.02.slv.tar.gz) = 5c19344d8f7158d6d384a9d5f3e31ad7ff7830c3 -SHA512 (tesseract-ocr-3.02.slv.tar.gz) = 7a0f2a2ed67a38c6b778852184a0d85b32fac847909984da4141ccdbeaff8ec5eb4ad9f6063afcc3dea95373af80241c9c54ba6f73dbea66ce9d14b101786d0f -Size (tesseract-ocr-3.02.slv.tar.gz) = 1610823 bytes -SHA1 (tesseract-ocr-3.02.spa.tar.gz) = 51e1289f0320bd750be4b04065dcae6862562b01 -RMD160 (tesseract-ocr-3.02.spa.tar.gz) = f5270f3b78e96d412e67d600491f4a880b9c4d22 -SHA512 (tesseract-ocr-3.02.spa.tar.gz) = cd7d9cc6e83d13fed9ee7921a8f22ff8c52be043802abdd545d6b9b17f5fb8d10bd55b26131c790ceb9a09359c73af9e850ac927f7be687690c29b5e638c8d32 -Size (tesseract-ocr-3.02.spa.tar.gz) = 9843970 bytes -SHA1 (tesseract-ocr-3.02.sqi.tar.gz) = 4d865da27ec2b0ce5f5dbc67a7a1781af1eca05c -RMD160 (tesseract-ocr-3.02.sqi.tar.gz) = 17665a0c1beb295227afba1e8f144c916c4ba5e7 -SHA512 (tesseract-ocr-3.02.sqi.tar.gz) = 1e255b4a7307b465b440828217641289ce20e8cf73efaa9662836233eb60842a52a2e249227d7990a7c7f8ae0f2e4e1be8222f10e32ea394921045e6e1a1ee5b -Size (tesseract-ocr-3.02.sqi.tar.gz) = 1658111 bytes -SHA1 (tesseract-ocr-3.02.srp.tar.gz) = ca496054260efb361f6873ba7212dd7438fd496c -RMD160 (tesseract-ocr-3.02.srp.tar.gz) = 2435b8acd2eb22427b08479889a791f08de2e3e5 -SHA512 (tesseract-ocr-3.02.srp.tar.gz) = a02ad30c05456c91184b7ae326ee237380b3cf9fdb40f0a9b1188fa6362529a1226c2f8bb0d751ec4880c1d32a20266ad5597f62c376b9ee7063c7c7daa3cac7 -Size (tesseract-ocr-3.02.srp.tar.gz) = 1770663 bytes -SHA1 (tesseract-ocr-3.02.swa.tar.gz) = 453ca6cd1b0b154006eef2046fb008796f59ce8a -RMD160 (tesseract-ocr-3.02.swa.tar.gz) = d01cf8eacc7384e7a1d482df3aff9ed35f5ed6d6 -SHA512 (tesseract-ocr-3.02.swa.tar.gz) = a844d8e3e369014cb016de9dae0f5f63ae2f0e5ae21b4c73d8ca8a1cd6a0e2077db6155460ba0c633e2caadb0f17d4c59dbbcd7e5933224d571755a7d5537bd4 -Size (tesseract-ocr-3.02.swa.tar.gz) = 763404 bytes -SHA1 (tesseract-ocr-3.02.swe.tar.gz) = 8ecabd4d010ff89d6d3975fb09fc622bf1c157bb -RMD160 (tesseract-ocr-3.02.swe.tar.gz) = 987aa3c82c7d419fda05dd349e5ee3b4fe14b307 -SHA512 (tesseract-ocr-3.02.swe.tar.gz) = 9af4b2384b859eaf19d75989bbfdb5738b295faa846e028a1590255d44eceb9903f3cba470dedae7ee252e63a2b040582b742ec6a9a5404545e64cb8f67a8b1d -Size (tesseract-ocr-3.02.swe.tar.gz) = 2444131 bytes -SHA1 (tesseract-ocr-3.02.tam.tar.gz) = b1067548993f168b06019616fc1a1d515169ee84 -RMD160 (tesseract-ocr-3.02.tam.tar.gz) = aceb01612c11255bc03113368bcc053a13c192bd -SHA512 (tesseract-ocr-3.02.tam.tar.gz) = 21481b3c62266541ee8cccc1350257764204152c5544f66028189353445904057c4b7f0304a73c166e65aa606b9278a7186ed718cc805e1836807cd723a12c34 -Size (tesseract-ocr-3.02.tam.tar.gz) = 3549042 bytes -SHA1 (tesseract-ocr-3.02.tel.tar.gz) = 726a411daa5ba3c5a6e3e04e870591ba65bf3ee8 -RMD160 (tesseract-ocr-3.02.tel.tar.gz) = fe9fb6b07c7d2755b8fbf372de77636e64c6a549 -SHA512 (tesseract-ocr-3.02.tel.tar.gz) = 99e01d40198bac6ee1ac4000a2529bd425383b5ca61e06a8a042a05b757d3d6df7fd2fc2be3083d28bd92429d2120edddda1c9c5f5cb4b1cdb16b868e10fd9a5 -Size (tesseract-ocr-3.02.tel.tar.gz) = 5866272 bytes -SHA1 (tesseract-ocr-3.02.tgl.tar.gz) = 5437a1a2ffc3dceea2e241b41bd414e64148274d -RMD160 (tesseract-ocr-3.02.tgl.tar.gz) = 155a261e6faa5f6f210b035460960c5d6e57cabc -SHA512 (tesseract-ocr-3.02.tgl.tar.gz) = 02deab716f9c310e5423b8afb197852efde50de461c7dd8d94a0f0dac43c1da379eabde7509c04fbb843c7ecb8a7af0a345bf6fdc02d3d01e15ac58cbfaa6e51 -Size (tesseract-ocr-3.02.tgl.tar.gz) = 1498530 bytes -SHA1 (tesseract-ocr-3.02.tha.tar.gz) = 04a35c04585a887662dc668e54f5368dabf31f50 -RMD160 (tesseract-ocr-3.02.tha.tar.gz) = 87f52149f3acd038cf5ca9b0317115561a42e292 -SHA512 (tesseract-ocr-3.02.tha.tar.gz) = 84dd0d2b923449eaa1514c6a61dd4b19b955c2a608bfcb53318c8c2037f6b2afdd1685d6216a9e8987693237c199f28c6b5a709d2d8a3960388296ec89c22b10 -Size (tesseract-ocr-3.02.tha.tar.gz) = 3872875 bytes -SHA1 (tesseract-ocr-3.02.tur.tar.gz) = 017c11a1630ad96f600a863803a892aeadaa34fb -RMD160 (tesseract-ocr-3.02.tur.tar.gz) = dbffa99dde65b3a082a15d75ad199b7f91625bfd -SHA512 (tesseract-ocr-3.02.tur.tar.gz) = b7fe891b4cbc45adadee4059ec0f52f36c5838d242b74e7db2449e1b31791a452dd2ece34a1e2fc61b3b19b536cb93c1425862e82dd746de2d33b210e9f7ecbe -Size (tesseract-ocr-3.02.tur.tar.gz) = 3543917 bytes -SHA1 (tesseract-ocr-3.02.ukr.tar.gz) = 729a2bd1a2cf81c314b8b0f2057260019f056149 -RMD160 (tesseract-ocr-3.02.ukr.tar.gz) = fcf96e1653083065a9454dea2bc3beefe40128ef -SHA512 (tesseract-ocr-3.02.ukr.tar.gz) = 1e6c44d2d529afcec864ab51e4cc3e4251f6d7daf8f55df77160374e8b724051691b4f462d9acbce9a9ad49dd84d5fb1042b89c8f393afcda7ff2bcb93f4d9de -Size (tesseract-ocr-3.02.ukr.tar.gz) = 946344 bytes -SHA1 (tesseract-ocr-3.02.vie.tar.gz) = 9ab987ff577f1e1c536000d97cf6247f44ef8fdd -RMD160 (tesseract-ocr-3.02.vie.tar.gz) = 1a028355cfa95bf24db6203ba89531a2675aff4c -SHA512 (tesseract-ocr-3.02.vie.tar.gz) = c80d3193b0474379d00960016a2863890e76f447943f50707825e1dce0fdd67054116616c6c657f1e2a1e73d60fcc4d98c81993bace69bae25292882acd20e4d -Size (tesseract-ocr-3.02.vie.tar.gz) = 2207972 bytes +SHA1 (tessdata-3.04.00.tar.gz) = 6ea24cccf0e823da98589ccc75d51f0950618236 +RMD160 (tessdata-3.04.00.tar.gz) = 0a3c3b3c127b6031e2e037d78e3a6f159fb9e869 +SHA512 (tessdata-3.04.00.tar.gz) = 4fbb66137c729e16c7a9e35b09916a45c1bb5ec5a7002a22647e0b10975362cb44c6d6c0c997baf25866f78749ec2d4a86317ec3fb664bd963243e230516d162 +Size (tessdata-3.04.00.tar.gz) = 499088801 bytes +SHA1 (tesseract-3.04.01.tar.gz) = 359ffc1925f0270ca100a2b4c1d3b41f4b23701d +RMD160 (tesseract-3.04.01.tar.gz) = 5e754411afa74cfc4e6b601fe2c770ba93a25f23 +SHA512 (tesseract-3.04.01.tar.gz) = 816f6c29f8efeaf157891ddb022bd0daf8eb27c0cb8b6df5542e745d209f0ce617245e4583c59a561ed3216044d3afb38f8620ee94cdea656364923dcb140b5b +Size (tesseract-3.04.01.tar.gz) = 2269105 bytes SHA1 (patch-viewer_scrollview.cpp) = 05a9ff5d2a9e302b3a682144db54c612fd4eccc2 SHA1 (patch-viewer_svutil_cpp) = ec6f8b79c66993e5272a4f2a13aa92f2432cbea0 From e52c731d4b0291774f1c9c04c0840c33e481a115 Mon Sep 17 00:00:00 2001 From: fhajny Date: Thu, 17 Mar 2016 12:51:26 +0000 Subject: [PATCH 0265/2457] Updated graphics/tesseract to 3.04.01 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index b62ca113e1a29..17195cd815958 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1240 2016/03/17 12:45:09 fhajny Exp $ +$NetBSD: CHANGES-2016,v 1.1241 2016/03/17 12:51:26 fhajny Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1639,3 +1639,4 @@ Changes to the packages collection and infrastructure in 2016: Updated lang/ruby22-base to 2.2.4nb3 [wiz 2016-03-17] Updated lang/ruby23-base to 2.3.0nb2 [wiz 2016-03-17] Updated graphics/leptonica to 1.73 [fhajny 2016-03-17] + Updated graphics/tesseract to 3.04.01 [fhajny 2016-03-17] diff --git a/doc/TODO b/doc/TODO index 4cce4a658e943..c25f0e41d7b50 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15601 2016/03/17 00:26:51 wiedi Exp $ +$NetBSD: TODO,v 1.15602 2016/03/17 12:51:26 fhajny Exp $ Suggested new packages ====================== @@ -1916,7 +1916,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o telepathy-logger-0.8.2 o telepathy-mission-control5-5.16.3 o tellico-2.3.11 - o tesseract-3.04.01 o tetrinetx-1.40c o tex2page-20130325 o texlive-2014 From 935492fbb67f551cb9c81140e1aeb99fbf59f210 Mon Sep 17 00:00:00 2001 From: mef Date: Thu, 17 Mar 2016 13:55:44 +0000 Subject: [PATCH 0266/2457] Update to 1.06 -------------- 1.06 2016-02-20 Fix linking on MSVC. --- devel/p5-Devel-CheckLib/Makefile | 4 ++-- devel/p5-Devel-CheckLib/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devel/p5-Devel-CheckLib/Makefile b/devel/p5-Devel-CheckLib/Makefile index fb9afc18b4c81..58674a979505d 100644 --- a/devel/p5-Devel-CheckLib/Makefile +++ b/devel/p5-Devel-CheckLib/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2016/01/10 13:37:10 wen Exp $ +# $NetBSD: Makefile,v 1.12 2016/03/17 13:55:44 mef Exp $ -DISTNAME= Devel-CheckLib-1.05 +DISTNAME= Devel-CheckLib-1.06 PKGNAME= p5-${DISTNAME} CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Devel/} diff --git a/devel/p5-Devel-CheckLib/distinfo b/devel/p5-Devel-CheckLib/distinfo index 159cf3f1a5fda..59b51450bc7d7 100644 --- a/devel/p5-Devel-CheckLib/distinfo +++ b/devel/p5-Devel-CheckLib/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2016/01/10 13:37:10 wen Exp $ +$NetBSD: distinfo,v 1.7 2016/03/17 13:55:44 mef Exp $ -SHA1 (Devel-CheckLib-1.05.tar.gz) = 2a9e0a677f989e6f9041003ba5e32f73feeb8b35 -RMD160 (Devel-CheckLib-1.05.tar.gz) = 18b6399a8ca942845ee4b663bed01b54c747c4f1 -SHA512 (Devel-CheckLib-1.05.tar.gz) = 09c5e0b921beb69573848c220bb8233826d40db034fe3cb5495dc61312169a30432391a3dc0eb913789993624781cb3f4f5b2912089c6470e70b3356a6c01a47 -Size (Devel-CheckLib-1.05.tar.gz) = 14126 bytes +SHA1 (Devel-CheckLib-1.06.tar.gz) = 3efe554c5634dcb87bbc0978a90da3f4c075d338 +RMD160 (Devel-CheckLib-1.06.tar.gz) = f92ca76a642df17acdaf1cd5213894281149d9b2 +SHA512 (Devel-CheckLib-1.06.tar.gz) = a87d7ecb6ab3936b1dfe69f7a6b61c21ab097cc89a45d98715e1615895f9412e64206f950535a77009249f35d028875fe679f90adb9b48030c2d5a28f6a8f68e +Size (Devel-CheckLib-1.06.tar.gz) = 14315 bytes From da65f46c6e8cc9c9ced96c01059740c82d65bfa7 Mon Sep 17 00:00:00 2001 From: mef Date: Thu, 17 Mar 2016 13:56:33 +0000 Subject: [PATCH 0267/2457] Updated devel/p5-Devel-CheckLib to 1.06 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 17195cd815958..907416f287c23 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1241 2016/03/17 12:51:26 fhajny Exp $ +$NetBSD: CHANGES-2016,v 1.1242 2016/03/17 13:56:33 mef Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1640,3 +1640,4 @@ Changes to the packages collection and infrastructure in 2016: Updated lang/ruby23-base to 2.3.0nb2 [wiz 2016-03-17] Updated graphics/leptonica to 1.73 [fhajny 2016-03-17] Updated graphics/tesseract to 3.04.01 [fhajny 2016-03-17] + Updated devel/p5-Devel-CheckLib to 1.06 [mef 2016-03-17] diff --git a/doc/TODO b/doc/TODO index c25f0e41d7b50..9fce256f8c624 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15602 2016/03/17 12:51:26 fhajny Exp $ +$NetBSD: TODO,v 1.15603 2016/03/17 13:56:33 mef Exp $ Suggested new packages ====================== @@ -1309,7 +1309,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-Data-Peek-0.45 o p5-Data-SimplePassword-0.11 o p5-Date-Extract-0.05 - o p5-Devel-CheckLib-1.06 o p5-Devel-PatchPerl-1.40 o p5-Devel-Pragma-0.62 o p5-Devel-REPL-1.003028 From f9a9f964d615c7cac3c5e019fa54284748659d32 Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 17 Mar 2016 14:15:39 +0000 Subject: [PATCH 0268/2457] Disable SSLv2, fixing build against newer OpenSSL. --- x11/kdebase3/distinfo | 4 ++-- x11/kdebase3/patches/patch-ge | 31 +++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 2486af34a0608..2fb8ce769142a 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.120 2016/02/24 10:14:10 jperkin Exp $ +$NetBSD: distinfo,v 1.121 2016/03/17 14:15:39 jperkin Exp $ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 @@ -61,7 +61,7 @@ SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29 SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e SHA1 (patch-gc) = e02ddb93ae7aa249b3b3e68690f587b2c98255b8 SHA1 (patch-gd) = 39469384668e4ee7fc489406e2813100fc90aa9b -SHA1 (patch-ge) = 8470cf03d768d784714e926281757e9d68749360 +SHA1 (patch-ge) = ed4c7bbac47562e50a73120a0f990e62a321c778 SHA1 (patch-gf) = 78de196a700fa9cd5e221ff57c295fdb3562f931 SHA1 (patch-kcheckpass_checkpass_pam.c) = b5dd2e50c5f1047d3c195836c8b2d06e11edea3b SHA1 (patch-kcontrol_access_kcmaccess.cpp) = f7eaec78fa13f2cfb5b97ca84c10f3e403b64919 diff --git a/x11/kdebase3/patches/patch-ge b/x11/kdebase3/patches/patch-ge index ab830491611a6..d82044a282df4 100644 --- a/x11/kdebase3/patches/patch-ge +++ b/x11/kdebase3/patches/patch-ge @@ -1,8 +1,10 @@ -$NetBSD: patch-ge,v 1.4 2009/09/01 09:51:02 wiz Exp $ +$NetBSD: patch-ge,v 1.5 2016/03/17 14:15:39 jperkin Exp $ ---- kcontrol/crypto/crypto.cpp.orig 2006-10-02 06:31:49.000000000 +1300 +Disable SSLv2. + +--- kcontrol/crypto/crypto.cpp.orig 2006-10-01 17:31:49.000000000 +0000 +++ kcontrol/crypto/crypto.cpp -@@ -2321,7 +2321,11 @@ bool KCryptoConfig::loadCiphers() { +@@ -2321,11 +2321,17 @@ bool KCryptoConfig::loadCiphers() { unsigned int i; SSL_CTX *ctx; SSL *ssl; @@ -11,11 +13,20 @@ $NetBSD: patch-ge,v 1.4 2009/09/01 09:51:02 wiz Exp $ +#else +const SSL_METHOD *meth; +#endif ++ CipherItem *item; SSLv2Box->clear(); SSLv3Box->clear(); -@@ -2337,8 +2341,10 @@ SSL_METHOD *meth; - CipherItem *item; + ++#if 0 + meth = SSLv2_client_method(); + SSLeay_add_ssl_algorithms(); + ctx = SSL_CTX_new(meth); +@@ -2334,11 +2340,12 @@ SSL_METHOD *meth; + ssl = SSL_new(ctx); + if (!ssl) return false; + +- CipherItem *item; for (i=0; ; i++) { int j, k; - SSL_CIPHER *sc; @@ -27,7 +38,15 @@ $NetBSD: patch-ge,v 1.4 2009/09/01 09:51:02 wiz Exp $ if (!sc) break; // Leak of sc*? -@@ -2365,8 +2371,10 @@ SSL_METHOD *meth; +@@ -2353,6 +2360,7 @@ SSL_METHOD *meth; + + if (ctx) SSL_CTX_free(ctx); + if (ssl) SSL_free(ssl); ++#endif + + // We repeat for SSLv3 + meth = SSLv3_client_method(); +@@ -2365,8 +2373,10 @@ SSL_METHOD *meth; for (i=0; ; i++) { int j, k; From 601eb207884369574a02c984f5413e3f32851377 Mon Sep 17 00:00:00 2001 From: mef Date: Thu, 17 Mar 2016 14:38:58 +0000 Subject: [PATCH 0269/2457] Update to 1.05 -------------- 1.05 (r1069, 2015-01-26) * Add support for GSUB Type 8 Reverse-chaining substitution * OpenType script/lang/feature tags now based on ISO/IEC 14496-22 * Remove deprecated GDL_old.pm * * Bug fixes: * Fix rt.cpan.org 92150, 93597 * Force 0xFFFF sentry to be in a segment by itself in format 4 cmap subtables * Less aggressive cmap format 4 optimization to eliminate USV holes * Fix various issues reading WOFF-compressed font tables * Fix reading DSIG --- fonts/p5-Font-TTF/Makefile | 5 ++--- fonts/p5-Font-TTF/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fonts/p5-Font-TTF/Makefile b/fonts/p5-Font-TTF/Makefile index ae89dfbd1453a..0f6b52bb15797 100644 --- a/fonts/p5-Font-TTF/Makefile +++ b/fonts/p5-Font-TTF/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2015/06/12 10:50:05 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2016/03/17 14:38:58 mef Exp $ # -DISTNAME= Font-TTF-1.04 +DISTNAME= Font-TTF-1.05 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 CATEGORIES= perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Font/} diff --git a/fonts/p5-Font-TTF/distinfo b/fonts/p5-Font-TTF/distinfo index 6e1989a5395c0..2e6adda30125c 100644 --- a/fonts/p5-Font-TTF/distinfo +++ b/fonts/p5-Font-TTF/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 20:44:38 agc Exp $ +$NetBSD: distinfo,v 1.11 2016/03/17 14:38:58 mef Exp $ -SHA1 (Font-TTF-1.04.tar.gz) = 3fcc0d97aa0fd484815846eed1d26a4a9fccd67f -RMD160 (Font-TTF-1.04.tar.gz) = d5b0d11da41ce3d6f2d71cd8356fdc63b4237910 -SHA512 (Font-TTF-1.04.tar.gz) = 6d5a4e672b1c9b214ae4e9db6c5e7e3db13773bef5cdae89e62e2fd944dc9949a4c69761cfdbb95ff2f22ece88ee62532bddc1133371f7d38681358e64524078 -Size (Font-TTF-1.04.tar.gz) = 251656 bytes +SHA1 (Font-TTF-1.05.tar.gz) = 2cd694692305c514335c345a4ecf12c4e3eb4dd4 +RMD160 (Font-TTF-1.05.tar.gz) = 04f22870496a73d22879ca47479acfd830751c7b +SHA512 (Font-TTF-1.05.tar.gz) = 7288a2de63fc92c36f3706f365b2ea886e37361b13400a14f940961b0263f6492b02f73048c653bdcd5c5d1bb714977f3c5326b7217dcf3683b16d5048cd1e63 +Size (Font-TTF-1.05.tar.gz) = 256957 bytes From 58e9217243a891c50c297023ab6efd664f631848 Mon Sep 17 00:00:00 2001 From: mef Date: Thu, 17 Mar 2016 14:39:41 +0000 Subject: [PATCH 0270/2457] Updated fonts/p5-Font-TTF to 1.05 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 907416f287c23..cab9010985edd 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1242 2016/03/17 13:56:33 mef Exp $ +$NetBSD: CHANGES-2016,v 1.1243 2016/03/17 14:39:41 mef Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1641,3 +1641,4 @@ Changes to the packages collection and infrastructure in 2016: Updated graphics/leptonica to 1.73 [fhajny 2016-03-17] Updated graphics/tesseract to 3.04.01 [fhajny 2016-03-17] Updated devel/p5-Devel-CheckLib to 1.06 [mef 2016-03-17] + Updated fonts/p5-Font-TTF to 1.05 [mef 2016-03-17] diff --git a/doc/TODO b/doc/TODO index 9fce256f8c624..3726af3153a12 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15603 2016/03/17 13:56:33 mef Exp $ +$NetBSD: TODO,v 1.15604 2016/03/17 14:39:42 mef Exp $ Suggested new packages ====================== @@ -1333,7 +1333,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-File-Path-Tiny-0.8 o p5-File-Touch-0.11 o p5-Font-FreeType-0.07 - o p5-Font-TTF-1.05 o p5-FormValidator-Simple-1.00 o p5-Fsdb-2.58 o p5-GDGraph-1.52 From 5f15d4f6e2817c9e92fb1046eeb0797c86296d8a Mon Sep 17 00:00:00 2001 From: taca Date: Thu, 17 Mar 2016 14:40:35 +0000 Subject: [PATCH 0271/2457] Update tuby-tzinfo03 to 0.3.47. == Version 0.3.47 (tzdata v2016b) - 15-Mar-2016 * Updated to tzdata version 2016b (https://mm.icann.org/pipermail/tz-announce/2016-March/000036.html). --- time/ruby-tzinfo03/Makefile | 4 ++-- time/ruby-tzinfo03/PLIST | 6 ++++-- time/ruby-tzinfo03/distinfo | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/time/ruby-tzinfo03/Makefile b/time/ruby-tzinfo03/Makefile index 85be4d88dd3fb..dcaac2d5ddfb9 100644 --- a/time/ruby-tzinfo03/Makefile +++ b/time/ruby-tzinfo03/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/01/03 05:08:06 taca Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/17 14:40:35 taca Exp $ DISTNAME= tzinfo-${VERS} PKGNAME= ${RUBY_PKGPREFIX}-tzinfo03-${VERS} @@ -9,7 +9,7 @@ HOMEPAGE= http://tzinfo.github.io/ COMMENT= Daylight-savings-aware timezone library LICENSE= mit -VERS= 0.3.46 +VERS= 0.3.47 .include "../../lang/ruby/gem.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/ruby-tzinfo03/PLIST b/time/ruby-tzinfo03/PLIST index c27edb0271347..a26e2db78f659 100644 --- a/time/ruby-tzinfo03/PLIST +++ b/time/ruby-tzinfo03/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2016/01/03 05:08:06 taca Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/17 14:40:35 taca Exp $ ${GEM_HOME}/cache/${GEM_NAME}.gem ${GEM_LIBDIR}/.yardopts ${GEM_LIBDIR}/CHANGES @@ -124,7 +124,6 @@ ${GEM_LIBDIR}/lib/tzinfo/definitions/America/Eirunepe.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/America/El_Salvador.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/America/Ensenada.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/America/Fort_Nelson.rb -${GEM_LIBDIR}/lib/tzinfo/definitions/America/Fort_Nelson.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/America/Fort_Wayne.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/America/Fortaleza.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/America/Glace_Bay.rb @@ -257,6 +256,7 @@ ${GEM_LIBDIR}/lib/tzinfo/definitions/Asia/Baghdad.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Asia/Bahrain.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Asia/Baku.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Asia/Bangkok.rb +${GEM_LIBDIR}/lib/tzinfo/definitions/Asia/Barnaul.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Asia/Beirut.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Asia/Bishkek.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Asia/Brunei.rb @@ -433,6 +433,7 @@ ${GEM_LIBDIR}/lib/tzinfo/definitions/Etc/Universal.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Etc/Zulu.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Amsterdam.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Andorra.rb +${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Astrakhan.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Athens.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Belfast.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Belgrade.rb @@ -480,6 +481,7 @@ ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Stockholm.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Tallinn.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Tirane.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Tiraspol.rb +${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Ulyanovsk.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Uzhgorod.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Vaduz.rb ${GEM_LIBDIR}/lib/tzinfo/definitions/Europe/Vatican.rb diff --git a/time/ruby-tzinfo03/distinfo b/time/ruby-tzinfo03/distinfo index ef179dd605372..f9aefc39c24a4 100644 --- a/time/ruby-tzinfo03/distinfo +++ b/time/ruby-tzinfo03/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1 2016/01/03 05:08:06 taca Exp $ +$NetBSD: distinfo,v 1.2 2016/03/17 14:40:35 taca Exp $ -SHA1 (tzinfo-0.3.46.gem) = dd1f7eca37de49c8eed301e34ab8a69a014b7ba0 -RMD160 (tzinfo-0.3.46.gem) = d86d07151153deb97d25f0a110fa754e31e978d6 -SHA512 (tzinfo-0.3.46.gem) = 2d334643463981a1e0d1d7bf959fb06d5f4f1c85997632efffe45c991707fbccd99a3c335cbf1f52bb79659625a4fcca9dd0d753f9df27598b7e7333139028a9 -Size (tzinfo-0.3.46.gem) = 299520 bytes +SHA1 (tzinfo-0.3.47.gem) = bf581da830611857665ddec7594dbc6de27a8544 +RMD160 (tzinfo-0.3.47.gem) = d745288d0064c8cc8f9de869ebeea3c3bfc8ba61 +SHA512 (tzinfo-0.3.47.gem) = 00adbf5c6250937f8262e181eb3c0366605648c10876b594f8b66a61502f54b445e76844e98b16b81eb4ece517d247161f29e43e2fdba5dc0d28aaf66ab2cca2 +Size (tzinfo-0.3.47.gem) = 298496 bytes From da1173833808f1301ebf3f0d599ca887a1f289b8 Mon Sep 17 00:00:00 2001 From: taca Date: Thu, 17 Mar 2016 14:41:12 +0000 Subject: [PATCH 0272/2457] Note update of time/ruby-tzinfo03 package to 0.3.47. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index cab9010985edd..a3596269ac379 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1243 2016/03/17 14:39:41 mef Exp $ +$NetBSD: CHANGES-2016,v 1.1244 2016/03/17 14:41:12 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1642,3 +1642,4 @@ Changes to the packages collection and infrastructure in 2016: Updated graphics/tesseract to 3.04.01 [fhajny 2016-03-17] Updated devel/p5-Devel-CheckLib to 1.06 [mef 2016-03-17] Updated fonts/p5-Font-TTF to 1.05 [mef 2016-03-17] + Updated time/ruby-tzinfo03 to 0.3.47 [taca 2016-03-17] From 87ea24c441ea0dcff4bf65d7d21c9f99297a75d6 Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 17 Mar 2016 16:02:23 +0000 Subject: [PATCH 0273/2457] Since the MACHINE_ARCH cleanup, the bootstrap for i386-on-x86_64 Linux has been broken due to NATIVE_MACHINE_ARCH no longer being set to x86_64. Fix this by introducing HOST_MACHINE_ARCH which refers to the underlying host architecture rather than bmake's native architecture, thus differentiating between cross-compiling and multilib. This is currently only set on Linux as the only OPSYS which currently requires such a test, but can be expanded to other OPSYS as necessary. --- mk/bsd.prefs.mk | 6 +++++- mk/platform/Linux.mk | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 7382adadd2586..e5a1666ca78a2 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.381 2016/03/11 23:54:08 khorben Exp $ +# $NetBSD: bsd.prefs.mk,v 1.382 2016/03/17 16:02:23 jperkin Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -221,6 +221,10 @@ LOWER_VENDOR?= ssd LOWER_VENDOR?= pc . endif LOWER_VENDOR?= unknown +. if !defined(HOST_MACHINE_ARCH) +HOST_MACHINE_ARCH!= ${UNAME} -m +MAKEFLAGS+= HOST_MACHINE_ARCH=${HOST_MACHINE_ARCH:Q} +. endif .elif ${OPSYS} == "OpenBSD" LOWER_OPSYS?= openbsd diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk index 74605d96893a5..9e1e23757ac3d 100644 --- a/mk/platform/Linux.mk +++ b/mk/platform/Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: Linux.mk,v 1.65 2016/03/10 16:58:19 jperkin Exp $ +# $NetBSD: Linux.mk,v 1.66 2016/03/17 16:02:23 jperkin Exp $ # # Variable definitions for the Linux operating system. @@ -120,7 +120,7 @@ LIBABISUFFIX?= 64 # When building 32-bit packages on x86_64 GNU ld isn't smart enough to # figure out the target architecture based on the objects so we need to # explicitly set it. -.if ${NATIVE_MACHINE_ARCH} == "x86_64" && ${MACHINE_ARCH} == "i386" +.if ${HOST_MACHINE_ARCH} == "x86_64" && ${MACHINE_ARCH} == "i386" _WRAP_EXTRA_ARGS.LD+= -m elf_i386 CWRAPPERS_APPEND.ld+= -m elf_i386 .endif From 19abeb80b1b4f0ed0f65cd8248db65fe52e2e1c1 Mon Sep 17 00:00:00 2001 From: wen Date: Fri, 18 Mar 2016 01:25:37 +0000 Subject: [PATCH 0274/2457] Update to 6.56 Upstream changes: 6.56 2016-03-16 - Added hidden option to list_files method in Mojo::Home. (batman, sri) - Added hidden option to files function in Mojo::Util. (batman, sri) - Fixed bug where Morbo would not ignore hidden files. (batman, sri) - Fixed bug where Morbo would ignore the --verbose option. - Fixed keep-alive bug in Mojo::UserAgent. (jberger) --- www/p5-Mojolicious/Makefile | 4 ++-- www/p5-Mojolicious/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/p5-Mojolicious/Makefile b/www/p5-Mojolicious/Makefile index dccb44758bb7c..00b4f5bf9166f 100644 --- a/www/p5-Mojolicious/Makefile +++ b/www/p5-Mojolicious/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.96 2016/03/09 11:56:00 wen Exp $ +# $NetBSD: Makefile,v 1.97 2016/03/18 01:25:37 wen Exp $ -DISTNAME= Mojolicious-6.55 +DISTNAME= Mojolicious-6.56 PKGNAME= p5-${DISTNAME} CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mojolicious/} diff --git a/www/p5-Mojolicious/distinfo b/www/p5-Mojolicious/distinfo index d9b0b9931ca07..aee6d77f2d9ee 100644 --- a/www/p5-Mojolicious/distinfo +++ b/www/p5-Mojolicious/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.90 2016/03/09 11:56:00 wen Exp $ +$NetBSD: distinfo,v 1.91 2016/03/18 01:25:37 wen Exp $ -SHA1 (Mojolicious-6.55.tar.gz) = 25fcd4a03689e31bb699cb3d595fb8e317e5e371 -RMD160 (Mojolicious-6.55.tar.gz) = 09e82e09b7c8fdc89953d6f5dfab0e198a2ae66c -SHA512 (Mojolicious-6.55.tar.gz) = 95a9e82af6a4388b72fe6714a3bf193d1b74661e35333eb9e8dfbb308c59d1ced66008f780e1ab0b4cee63f0eb4671ea89ea5161438db95d871d368dc66a3f32 -Size (Mojolicious-6.55.tar.gz) = 650798 bytes +SHA1 (Mojolicious-6.56.tar.gz) = 4c5fa1b8cabedebb8fc5b7202b08de0c2f5b581e +RMD160 (Mojolicious-6.56.tar.gz) = 9e0e497e468dc43af81dd09dd14b22cb08aa0dbb +SHA512 (Mojolicious-6.56.tar.gz) = b1f067b75a445b0eabf236cf02905d1b9c89ae9b59b9153dcf28349615fb40121432ae1f2ea1ff825ca29452cff4b60527afedbfb9eab00ddd12417b3e0dc513 +Size (Mojolicious-6.56.tar.gz) = 650779 bytes From 28ab48a3bcd2bc266b96513ca9eb098dcd175ee9 Mon Sep 17 00:00:00 2001 From: wen Date: Fri, 18 Mar 2016 01:26:29 +0000 Subject: [PATCH 0275/2457] Updated www/p5-Mojolicious to 6.56 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index a3596269ac379..03dce86f88230 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1244 2016/03/17 14:41:12 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1245 2016/03/18 01:26:29 wen Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1643,3 +1643,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/p5-Devel-CheckLib to 1.06 [mef 2016-03-17] Updated fonts/p5-Font-TTF to 1.05 [mef 2016-03-17] Updated time/ruby-tzinfo03 to 0.3.47 [taca 2016-03-17] + Updated www/p5-Mojolicious to 6.56 [wen 2016-03-18] From c4e6cd2ca6016f25741f7fd8fb37486bd687c10f Mon Sep 17 00:00:00 2001 From: agc Date: Fri, 18 Mar 2016 01:49:15 +0000 Subject: [PATCH 0276/2457] Note the start of the freeze in new functionality in preparation for the pkgsrc-2016Q1 branch. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 03dce86f88230..4010ca919dd0d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1245 2016/03/18 01:26:29 wen Exp $ +$NetBSD: CHANGES-2016,v 1.1246 2016/03/18 01:49:15 agc Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1644,3 +1644,4 @@ Changes to the packages collection and infrastructure in 2016: Updated fonts/p5-Font-TTF to 1.05 [mef 2016-03-17] Updated time/ruby-tzinfo03 to 0.3.47 [taca 2016-03-17] Updated www/p5-Mojolicious to 6.56 [wen 2016-03-18] + mk/bsd.pkg.mk: started freeze for pkgsrc-2016Q1 branch [agc 2016-03-17] From 51e23497a23610bfb3fb286f915ff2e7cafb33b9 Mon Sep 17 00:00:00 2001 From: pettai Date: Fri, 18 Mar 2016 06:16:18 +0000 Subject: [PATCH 0277/2457] 2.10.3 2015/05/12 LIBOPENDKIM: Make strict header checking non-destructive. The last change to this code resulted in failing signatures. 2.10.2 2015/05/10 Fix bug #221: Report a DKIM result of "policy" if MinimumKeyBits or UnprotectedKey cause the signature to result in a "pass" override. Fix bug #227: Revert removal of SenderHeaders configuration setting. Document that it is now limited to signature selection. LIBOPENDKIM: Fix bug #226: Deal with header fields that are wrapped before there's any content. CONTRIB: Update to contrib/systemd/opendkim.service.in --- mail/opendkim/Makefile | 5 ++--- mail/opendkim/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile index 2ff9b966ae042..908e483b2571e 100644 --- a/mail/opendkim/Makefile +++ b/mail/opendkim/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2016/03/05 11:28:49 jperkin Exp $ +# $NetBSD: Makefile,v 1.26 2016/03/18 06:16:18 pettai Exp $ -DISTNAME= opendkim-2.10.1 -PKGREVISION= 2 +DISTNAME= opendkim-2.10.3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opendkim/} diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo index 263640bbe08ec..9e4becd720d0b 100644 --- a/mail/opendkim/distinfo +++ b/mail/opendkim/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.17 2015/11/03 23:27:11 agc Exp $ +$NetBSD: distinfo,v 1.18 2016/03/18 06:16:18 pettai Exp $ -SHA1 (opendkim-2.10.1.tar.gz) = 13a5d5ebd3bc768e9d39dae8c984157708214166 -RMD160 (opendkim-2.10.1.tar.gz) = 353b4960bec019ce2432ba48e6700d947a57d773 -SHA512 (opendkim-2.10.1.tar.gz) = 85636647698542e72d8b353cbf3e3836010c9983af68fb59bff706c2417159b1b0e4a1a015c10cbfb5d8639ca8a576dafb15247ccbe7793e1b0ed379bad97c65 -Size (opendkim-2.10.1.tar.gz) = 1213326 bytes +SHA1 (opendkim-2.10.3.tar.gz) = 4e9b966860bcfbca6441ed84a95bbe762fff69f4 +RMD160 (opendkim-2.10.3.tar.gz) = c6553757ae9675434e647f3cc1e6357bc60c7d2a +SHA512 (opendkim-2.10.3.tar.gz) = 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 +Size (opendkim-2.10.3.tar.gz) = 1210224 bytes SHA1 (patch-configure) = 3e6bc994f72ed146770190a6b8a178abf4ebe4cd From 54b63b9a02216f5a35244d25ceae3d9976358f3d Mon Sep 17 00:00:00 2001 From: dbj Date: Fri, 18 Mar 2016 07:37:38 +0000 Subject: [PATCH 0278/2457] fix bad macro parenthesis --- x11/qt5-qtwebkit/distinfo | 4 ++-- .../patch-Source_JavaScriptCore_tools_CodeProfiling.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x11/qt5-qtwebkit/distinfo b/x11/qt5-qtwebkit/distinfo index d5dd5771e1c1f..3d598db64b026 100644 --- a/x11/qt5-qtwebkit/distinfo +++ b/x11/qt5-qtwebkit/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2016/03/15 00:19:00 tnn Exp $ +$NetBSD: distinfo,v 1.7 2016/03/18 07:37:38 dbj Exp $ SHA1 (qtwebkit-opensource-src-5.5.1.tar.xz) = e1e16f3eb48c1ce863b9ab33364e4ac178ae51a7 RMD160 (qtwebkit-opensource-src-5.5.1.tar.xz) = 0594ec1150f7899d72f57d8ff2f108f3f75faaf9 @@ -12,7 +12,7 @@ SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = a6cfdbced0bb528f47 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37 -SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 6dbdaf1aad0fbbe39f8a3e5fb48be38e3ac67aa8 +SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = da6e2627337be1d6a4692697f23381b1bc80d08a SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288 SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 875cfb3a98b943a78bf87e91d724d067b5bd2523 diff --git a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp index 8f3774540d586..4275c46de0f29 100644 --- a/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp +++ b/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.2 2016/03/15 00:19:00 tnn Exp $ +$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.3 2016/03/18 07:37:38 dbj Exp $ * Add NetBSD support @@ -26,7 +26,7 @@ CodeProfiling::sample(reinterpret_cast(context.gregs[REG_EIP]), reinterpret_cast(context.gregs[REG_EBP])); } -+#elif OS(NETBSD)) && CPU(X86) ++#elif OS(NETBSD) && CPU(X86) +static void profilingTimer(int, siginfo_t*, void* uap) +{ + mcontext_t context = static_cast(uap)->uc_mcontext; From 71c7bb9f8114016dc61f392865f8a07ed97f3a3c Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 18 Mar 2016 09:36:26 +0000 Subject: [PATCH 0279/2457] revert ABI/ABI bump for expat. Not necessary and cuases problems. --- textproc/expat/buildlink3.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk index fe24c19936ee0..f41db0bb5c058 100644 --- a/textproc/expat/buildlink3.mk +++ b/textproc/expat/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.20 2016/03/16 19:55:55 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2016/03/18 09:36:26 wiz Exp $ BUILDLINK_TREE+= expat .if !defined(EXPAT_BUILDLINK3_MK) EXPAT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.expat+= expat>=2.1.1 -BUILDLINK_ABI_DEPENDS.expat+= expat>=2.1.1 +BUILDLINK_API_DEPENDS.expat+= expat>=1.95.7 +BUILDLINK_ABI_DEPENDS.expat+= expat>=2.0.0nb1 BUILDLINK_PKGSRCDIR.expat?= ../../textproc/expat .endif # EXPAT_BUILDLINK3_MK From d75704a0f8da450c10a0cc4912c4dc243373289a Mon Sep 17 00:00:00 2001 From: bsiegert Date: Fri, 18 Mar 2016 11:37:22 +0000 Subject: [PATCH 0280/2457] Support chrootdir keyword in rc.d script. From Petar Bogdanovic via mail. --- www/lighttpd/files/lighttpd.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/lighttpd/files/lighttpd.sh b/www/lighttpd/files/lighttpd.sh index f730920614934..fdd1a7d8c5cf5 100644 --- a/www/lighttpd/files/lighttpd.sh +++ b/www/lighttpd/files/lighttpd.sh @@ -1,8 +1,9 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: lighttpd.sh,v 1.1.1.1 2005/09/04 06:37:05 jlam Exp $ +# $NetBSD: lighttpd.sh,v 1.2 2016/03/18 11:37:22 bsiegert Exp $ # # PROVIDE: lighttpd +# KEYWORD: chrootdir # REQUIRE: DAEMON . /etc/rc.subr From 41a91483dcc0364cc5414d8059146c3b19b3ea52 Mon Sep 17 00:00:00 2001 From: jperkin Date: Fri, 18 Mar 2016 11:39:18 +0000 Subject: [PATCH 0281/2457] Ensure we don't try to use gold on Linux if it doesn't exist. Fixes 64-bit build on CentOS. --- lang/nodejs/Makefile.common | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lang/nodejs/Makefile.common b/lang/nodejs/Makefile.common index 844c6d99403ea..5ad7f9d5d960c 100644 --- a/lang/nodejs/Makefile.common +++ b/lang/nodejs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2016/03/12 12:34:44 tnn Exp $ +# $NetBSD: Makefile.common,v 1.6 2016/03/18 11:39:18 jperkin Exp $ # used by lang/nodejs/Makefile # used by lang/nodejs4/Makefile @@ -30,6 +30,10 @@ PTHREAD_AUTO_VARS= yes CONFIGURE_ENV.NetBSD+= GYP_DEFINES="OS=netbsd" MAKE_ENV.NetBSD+= GYP_DEFINES="OS=netbsd" +.if ${OPSYS} == "Linux" && !exists(/usr/bin/gold) +CONFIGURE_ENV+= GYP_DEFINES="linux_use_gold_flags=0" +.endif + REPLACE_PYTHON+= configure REPLACE_PYTHON+= tools/genv8constants.py REPLACE_PYTHON+= tools/gyp/pylib/gyp/flock_tool.py From bebf8bb9c6c46b1d8ffa6814664ce15c16dae81c Mon Sep 17 00:00:00 2001 From: jperkin Date: Fri, 18 Mar 2016 12:28:21 +0000 Subject: [PATCH 0282/2457] Don't create the /usr/lib symlinks on SmartOS, it is a read-only mount. --- net/samba/options.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/samba/options.mk b/net/samba/options.mk index 1ab4f3bcba267..25d73f799de7f 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.35 2016/02/25 16:20:52 jperkin Exp $ +# $NetBSD: options.mk,v 1.36 2016/03/18 12:28:21 jperkin Exp $ # Recommended package options for various setups: # @@ -151,8 +151,10 @@ NSS_WINBIND_cmd= \ # Install a /usr/lib/${NSS_WINBIND:T} -> ${PREFIX}/${NSS_WINBIND} symlink # Unfortunately NSS_WINDIND_cmd can not be used to determine whether the # (de)install templates are needed or not. +.if ${OS_VARIANT} != "SmartOS" INSTALL_TEMPLATES+= INSTALL.nss_winbind DEINSTALL_TEMPLATES+= DEINSTALL.nss_winbind +.endif .PHONY: samba-nss-winbind-install post-install: samba-nss-winbind-install From 3a75a6607b3af5af3821c2c90a1734b9336076de Mon Sep 17 00:00:00 2001 From: wiedi Date: Fri, 18 Mar 2016 12:54:57 +0000 Subject: [PATCH 0283/2457] Fix "relative library path" on Darwin --- math/py-scipy/Makefile | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/math/py-scipy/Makefile b/math/py-scipy/Makefile index a7f72c2e973a5..e61e6c83f0a56 100644 --- a/math/py-scipy/Makefile +++ b/math/py-scipy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/02/25 15:26:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2016/03/18 12:54:57 wiedi Exp $ DISTNAME= scipy-0.15.1 PKGNAME= ${PYPKGPREFIX}-scipy-0.15.1 @@ -88,6 +88,19 @@ REPLACE_PYTHON+= scipy/special/spfun_stats.py REPLACE_PYTHON+= scipy/stats/setup.py REPLACE_PYTHON+= scipy/weave/setup.py +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "Darwin" +.PHONY: fix-darwin-install-name +post-install: fix-darwin-install-name +fix-darwin-install-name: + ${FIND} ${DESTDIR}${PREFIX} -name "*.so" | while read lib; do \ + libname=`basename $${lib}`; \ + libdir=`dirname $${lib} | sed -e 's,${DESTDIR},,'`; \ + install_name_tool -id $${libdir}/$${libname} $${lib}; \ + done +.endif + .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../math/fftw/buildlink3.mk" From c01dce4875fa860d91f61cc1b62cc803eb50333d Mon Sep 17 00:00:00 2001 From: fhajny Date: Fri, 18 Mar 2016 13:18:53 +0000 Subject: [PATCH 0284/2457] Fix build on SunOS and Ruby 2.3. --- databases/ruby-pg/distinfo | 3 ++- databases/ruby-pg/patches/patch-ext_extconf.rb | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 databases/ruby-pg/patches/patch-ext_extconf.rb diff --git a/databases/ruby-pg/distinfo b/databases/ruby-pg/distinfo index 5695b264c4934..9e196813f5e01 100644 --- a/databases/ruby-pg/distinfo +++ b/databases/ruby-pg/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.18 2015/11/29 12:10:16 taca Exp $ +$NetBSD: distinfo,v 1.19 2016/03/18 13:18:53 fhajny Exp $ SHA1 (pg-0.18.4.gem) = e095413602552ef50ef938d547c58fc1d0940d8b RMD160 (pg-0.18.4.gem) = e69cdbfabaf2142c2ff4458213a13668c21da696 SHA512 (pg-0.18.4.gem) = 48e792756c7ee205164b59a9515ace6320150f0ce1907293f8c1a736300c62c0b38c1be49e8ad4f1a50f29abc7f72bb43e742a8e63d9606eff4c7d2191a4fb74 Size (pg-0.18.4.gem) = 219648 bytes +SHA1 (patch-ext_extconf.rb) = 161b826521c4e3b5a5c6aaa88dae572e36257b9c diff --git a/databases/ruby-pg/patches/patch-ext_extconf.rb b/databases/ruby-pg/patches/patch-ext_extconf.rb new file mode 100644 index 0000000000000..d30aaae09035a --- /dev/null +++ b/databases/ruby-pg/patches/patch-ext_extconf.rb @@ -0,0 +1,17 @@ +$NetBSD: patch-ext_extconf.rb,v 1.1 2016/03/18 13:18:53 fhajny Exp $ + +Fix SunOS build with Ruby 2.3. + +Upstream bug report: +https://bitbucket.org/ged/ruby-pg/issues/236 + +--- ext/extconf.rb.orig 2016-03-18 12:46:37.072825799 +0000 ++++ ext/extconf.rb +@@ -1,6 +1,7 @@ + require 'pp' + require 'mkmf' + ++$CPPFLAGS << ' -D__EXTENSIONS__' + + if ENV['MAINTAINER_MODE'] + $stderr.puts "Maintainer mode enabled." From bd13edf84958cf806d3504c79e8d6aa372bf582c Mon Sep 17 00:00:00 2001 From: pettai Date: Fri, 18 Mar 2016 15:49:03 +0000 Subject: [PATCH 0285/2457] Updated mail/opendkim to 2.10.3 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 4010ca919dd0d..f5e897434a75f 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1246 2016/03/18 01:49:15 agc Exp $ +$NetBSD: CHANGES-2016,v 1.1247 2016/03/18 15:49:03 pettai Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1645,3 +1645,4 @@ Changes to the packages collection and infrastructure in 2016: Updated time/ruby-tzinfo03 to 0.3.47 [taca 2016-03-17] Updated www/p5-Mojolicious to 6.56 [wen 2016-03-18] mk/bsd.pkg.mk: started freeze for pkgsrc-2016Q1 branch [agc 2016-03-17] + Updated mail/opendkim to 2.10.3 [pettai 2016-03-18] From 04fbc12e684d53caa3ac49f5c641a0a080af04ca Mon Sep 17 00:00:00 2001 From: jakllsch Date: Fri, 18 Mar 2016 17:11:37 +0000 Subject: [PATCH 0286/2457] Update OpenAFS to 1.6.17, fixes security vulnerabilities. User-Visible OpenAFS Changes OpenAFS 1.6.17 (Security Release) All server platforms * Fix for OPENAFS-SA-2016-001: foreign users can create groups as if they were an administrator (RT #132822) (CVE-2016-2860) All client platforms * Fix for OPENAFS-SA-2016-002: information leakage from sending uninitialized memory over the network. Multiple call sites were vulnerable, with potential for leaking both kernel and userland stack data (RT #132847) * Update to the GCO CellServDB update from 01 January 2016 (12188) Linux clients * Fix a crash when the root volume is not found and dynroot is not in use, a regression introduced in 1.6.14.1 (12166) * Avoid introducing a dependency on the kernel-devel package corresponding to the currently running system while building the srpm (12195) * Create systemd unit files with mode 0644 instead of 0755 (12196) (RT #132662) OpenAFS 1.6.16 All platforms * Documentation improvements (11932 12096 12100 12112 12120) * Improved diagnostics and error messages (11586 11587) * Distribute the contributor code of conduct with the stable release (12056) All server platforms * Create PID files in the right location when bosserver is started with the "-pidfiles" argument and transarc paths are not being used (12086) * Several fixes regarding volume dump creation and restore (11433 11553 11825 11826 12082) * Avoid a reported bosserver crash, and potentially others, by replacing fixed size buffers with dynamically allocated ones in some user handling functions (11436) (RT #130719) * Obey the "-toname" parameter in "vos clone" operations (11434) * Avoid writing a loopback address into the server CellServDB - search for a non-loopback one, and fail if none is found (12083 12105) * Rebuild the vldb free list with "vldb_check -fix" (12084) * Fixed and improved the "check_sysid" utility (12090) * Fixed and improved the "prdb_check" utility (12101..04) All client platforms * Avoid a potential denial of service issue, by fixing a bug in pioctl logic that allowed a local user to overrun a kernel buffer with a single NUL byte (commit 2ef86372) (RT #132256) (CVE-2015-8312) * Refuse to change multi-homed server entries with "vos changeaddr", unless "-force" is given, to avoid corruption of those entries (12087) * Provide a new vos subcommand "remaddrs" for removing server entries, to replace the slightly confusing "vos changeaddr -remove" (12092 12094) * Make "fs flushall" actually invalidate all cached data (11894) * Prevent spurious call aborts due to erroneous idle timeouts (11594) * Provide a "--disable-gtx" configure switch to avoid building and installing libgtx and its header files as well as the depending "scout" and "afsmonitor" applications (12095) * Fixed building the gtx applications against newer ncurses (12125) * Allow pioctls to work in environments where the syscall emulation pseudo file is created in a read-only pseudo filesystem, like in containers under recent versions of docker (12124) Linux clients * In Red Hat packaging, avoid following a symbolic link when writing the client CellServDB, which could overwrite the server CellServDB, by removing an existing symlink before writing the file (12081) * In Red Hat packaging, avoid a conflict of openafs-debuginfo with krb5-debuginfo by excluding our kpasswd executable from debuginfo processing (12128) (RT #131771) --- filesystems/openafs/Makefile | 6 +++--- filesystems/openafs/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile index c6e4a79d478c9..31db4b60b0dc0 100644 --- a/filesystems/openafs/Makefile +++ b/filesystems/openafs/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2015/10/28 19:43:01 jakllsch Exp $ +# $NetBSD: Makefile,v 1.11 2016/03/18 17:11:37 jakllsch Exp $ -DISTNAME= openafs-1.6.15-src +DISTNAME= openafs-1.6.17-src PKGNAME= ${DISTNAME:C/-src//} CATEGORIES= filesystems net sysutils -MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.15/ +MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.17/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= gendalia@NetBSD.org diff --git a/filesystems/openafs/distinfo b/filesystems/openafs/distinfo index 958d607aaf504..218bf833127d8 100644 --- a/filesystems/openafs/distinfo +++ b/filesystems/openafs/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.12 2015/11/04 17:41:18 agc Exp $ +$NetBSD: distinfo,v 1.13 2016/03/18 17:11:37 jakllsch Exp $ -SHA1 (openafs-1.6.15-src.tar.bz2) = f6d300a408943a1f3edada4d12a8f0b60635d839 -RMD160 (openafs-1.6.15-src.tar.bz2) = b88ff1914fa5566649f218aec063a0b1be1fc54a -SHA512 (openafs-1.6.15-src.tar.bz2) = 17ac239366bb6dc8f7978b74ae5069bedab1976b7a39da76886ada5808159aa4ddc6347f49aae49c2d4e9ea14044a375217e48d443059967e50b0f82e0596065 -Size (openafs-1.6.15-src.tar.bz2) = 14388197 bytes +SHA1 (openafs-1.6.17-src.tar.bz2) = 1898679226a87659eb71e073de29384e4d8d4739 +RMD160 (openafs-1.6.17-src.tar.bz2) = b21fc9986cae46385c6440b14ac562d08cbc59c9 +SHA512 (openafs-1.6.17-src.tar.bz2) = 3ca61a7731c9bd9bae7da2f7b3900438fcc9f75c95b354574389c2203af2ec0a7b4dcaaf13a437743477fcad8a46c3bbb8c68255a976b9a9917b8f0a0cdf028f +Size (openafs-1.6.17-src.tar.bz2) = 14607107 bytes SHA1 (patch-src_comerr_Makefile.in) = dd5e996481d7ef908710868aa9dc1b65feb98717 From 8bc4c66cce69f2f6e3dba40b616277e8dd17c9d7 Mon Sep 17 00:00:00 2001 From: jakllsch Date: Fri, 18 Mar 2016 17:12:17 +0000 Subject: [PATCH 0287/2457] Updated filesystems/openafs to 1.6.17 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index f5e897434a75f..ff1a4da5503e6 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1247 2016/03/18 15:49:03 pettai Exp $ +$NetBSD: CHANGES-2016,v 1.1248 2016/03/18 17:12:17 jakllsch Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1646,3 +1646,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/p5-Mojolicious to 6.56 [wen 2016-03-18] mk/bsd.pkg.mk: started freeze for pkgsrc-2016Q1 branch [agc 2016-03-17] Updated mail/opendkim to 2.10.3 [pettai 2016-03-18] + Updated filesystems/openafs to 1.6.17 [jakllsch 2016-03-18] From bedb411fce5e88bc3a10cb920f281069da8bb6c5 Mon Sep 17 00:00:00 2001 From: tez Date: Fri, 18 Mar 2016 19:08:39 +0000 Subject: [PATCH 0288/2457] Fix build on 64 bit intel systems with yasm installed. --- security/mit-krb5/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index cdf1969c0f43e..081bdb1202e4e 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2016/03/15 15:16:39 tez Exp $ +# $NetBSD: Makefile,v 1.89 2016/03/18 19:08:39 tez Exp $ DISTNAME= krb5-1.14.1 PKGNAME= mit-${DISTNAME} @@ -45,6 +45,7 @@ CONFIGURE_ARGS+= --disable-thread-support CONFIGURE_ARGS+= --without-tcl CONFIGURE_ARGS+= --enable-pkgsrc-libtool CONFIGURE_ARGS+= --without-system-verto +CONFIGURE_ARGS+= --disable-aesni CONFIGURE_ENV+= BUILDLINK_PREFIX_OPENSSL=${BUILDLINK_PREFIX.openssl:Q} CONFIGURE_ENV+= DEFKTNAME=FILE:${PKG_SYSCONFDIR}/krb5.keytab MAKE_ENV+= ROOT_USER=${ROOT_USER} From d651f0b80ed0a13588beb9f50084ea0c9bdf26d3 Mon Sep 17 00:00:00 2001 From: tez Date: Fri, 18 Mar 2016 21:25:10 +0000 Subject: [PATCH 0289/2457] Fix for CVE-2016-1283 from http://vcs.pcre.org/pcre?view=revision&revision=1636 --- devel/pcre/Makefile | 4 +++- devel/pcre/distinfo | 3 ++- devel/pcre/patches/patch-pcre_compile.c | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 devel/pcre/patches/patch-pcre_compile.c diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 0195267dd6b8f..2887c79d386df 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.77 2015/11/24 11:04:03 wiz Exp $ +# $NetBSD: Makefile,v 1.78 2016/03/18 21:25:10 tez Exp $ DISTNAME= pcre-8.38 +PKGREVISION= 1 + CATEGORIES= devel MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ ${MASTER_SITE_SOURCEFORGE:=pcre/} diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo index 4e1e24851b867..93c5fb991e210 100644 --- a/devel/pcre/distinfo +++ b/devel/pcre/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.58 2015/11/24 11:04:03 wiz Exp $ +$NetBSD: distinfo,v 1.59 2016/03/18 21:25:10 tez Exp $ SHA1 (pcre-8.38.tar.bz2) = ae84e3b3ef0764788ce33b1adeff1add938126e1 RMD160 (pcre-8.38.tar.bz2) = eba6da5ef34780f63f8b96c60bd70ac197df3b52 @@ -7,3 +7,4 @@ Size (pcre-8.38.tar.bz2) = 1562265 bytes SHA1 (patch-aa) = ed20cfb5ca7b1e620e368c8e41a7f691d6f93282 SHA1 (patch-ab) = 0b8fbde09c27e2716e5bfa32abce8ee4a79fb7fb SHA1 (patch-doc_pcredemo.3) = 90f9b3a021f58973149d839735d40c5e2e245912 +SHA1 (patch-pcre_compile.c) = a901b33130bc421eb16883cc2de959b452e13840 diff --git a/devel/pcre/patches/patch-pcre_compile.c b/devel/pcre/patches/patch-pcre_compile.c new file mode 100644 index 0000000000000..62b62de171753 --- /dev/null +++ b/devel/pcre/patches/patch-pcre_compile.c @@ -0,0 +1,21 @@ +$NetBSD: patch-pcre_compile.c,v 1.1 2016/03/18 21:25:10 tez Exp $ + +Fix for CVE-2016-1283 from + http://vcs.pcre.org/pcre?view=revision&revision=1636 + +--- pcre_compile.c.orig 2016-03-18 21:00:47.095736300 +0000 ++++ pcre_compile.c +@@ -7274,7 +7274,12 @@ for (;; ptr++) + so far in order to get the number. If the name is not found, leave + the value of recno as 0 for a forward reference. */ + +- else ++ /* This patch (removing "else") fixes a problem when a reference is ++ to multiple identically named nested groups from within the nest. ++ Once again, it is not the "proper" fix, and it results in an ++ over-allocation of memory. */ ++ ++ /* else */ + { + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) From 183a1cb22780f1b57edf253e68b1a7426e0bba12 Mon Sep 17 00:00:00 2001 From: tez Date: Fri, 18 Mar 2016 21:26:55 +0000 Subject: [PATCH 0290/2457] Security fix for devel/pcre --- doc/CHANGES-2016 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index ff1a4da5503e6..5ee0a7c8c5705 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1248 2016/03/18 17:12:17 jakllsch Exp $ +$NetBSD: CHANGES-2016,v 1.1249 2016/03/18 21:26:55 tez Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1646,4 +1646,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/p5-Mojolicious to 6.56 [wen 2016-03-18] mk/bsd.pkg.mk: started freeze for pkgsrc-2016Q1 branch [agc 2016-03-17] Updated mail/opendkim to 2.10.3 [pettai 2016-03-18] - Updated filesystems/openafs to 1.6.17 [jakllsch 2016-03-18] + Updated devel/pcre to 8.38nb1 [tez 2016-03-18] From 6ccc9828f4070d0a291562c98ce8f4c83da74775 Mon Sep 17 00:00:00 2001 From: sevan Date: Fri, 18 Mar 2016 23:13:26 +0000 Subject: [PATCH 0291/2457] Update to 0.17.1 Submitted by Terin Stock terinjokes AT gmail com Closes PR pkg/50875 Reviewed by wiz@ 2013-08-30: StGit-0.17.1 released Fix dirty index errors when resolving conflicts. Test suite improvements. Print tracebacks to stderr. Run test suite in parallel. Fix --authdate date parsing. --- devel/stgit/Makefile | 11 ++- devel/stgit/PLIST | 164 ++++++++++++++++++++++++++++------- devel/stgit/distinfo | 15 ++-- devel/stgit/patches/patch-aa | 52 +++++++---- devel/stgit/patches/patch-ab | 17 ---- devel/stgit/patches/patch-ac | 31 ------- devel/stgit/patches/patch-ad | 12 --- 7 files changed, 181 insertions(+), 121 deletions(-) delete mode 100644 devel/stgit/patches/patch-ab delete mode 100644 devel/stgit/patches/patch-ac delete mode 100644 devel/stgit/patches/patch-ad diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile index dd419531fe61e..c98de0f8fd983 100644 --- a/devel/stgit/Makefile +++ b/devel/stgit/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2015/12/05 21:25:40 adam Exp $ +# $NetBSD: Makefile,v 1.29 2016/03/18 23:13:26 sevan Exp $ -DISTNAME= stgit-0.14.3 -PKGREVISION= 9 +DISTNAME= stgit-0.17.1 +PKGREVISION= 10 CATEGORIES= devel -MASTER_SITES= http://homepage.ntlworld.com/cmarinas/stgit/ +MASTER_SITES= http://download.gna.org/stgit/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.procode.org/stgit/ @@ -60,7 +60,6 @@ post-install: ${INSTALL_SCRIPT} stg-* ${DESTDIR}${PREFIX}/bin cd ${WRKSRC}/Documentation && \ ${INSTALL_MAN} *.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \ - ${INSTALL_DATA} *.html \ - ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/html + ${INSTALL_DATA} *.html ${DESTDIR}/${PREFIX}/share/doc/${PKGBASE}/html .include "../../mk/bsd.pkg.mk" diff --git a/devel/stgit/PLIST b/devel/stgit/PLIST index 425d70d216cd8..a18e7836bad34 100644 --- a/devel/stgit/PLIST +++ b/devel/stgit/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2012/04/08 20:21:48 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2016/03/18 23:13:26 sevan Exp $ bin/stg bin/stg-cvs bin/stg-dispatch @@ -11,22 +11,22 @@ bin/stg-show-old bin/stg-swallow bin/stg-unnew bin/stg-whatchanged -${PYSITELIB}/${EGG_FILE} +${PYSITELIB}/${PKGNAME}_dirty-py2.7.egg-info ${PYSITELIB}/stgit/__init__.py ${PYSITELIB}/stgit/__init__.pyc ${PYSITELIB}/stgit/__init__.pyo +${PYSITELIB}/stgit/argparse.py +${PYSITELIB}/stgit/argparse.pyc +${PYSITELIB}/stgit/argparse.pyo ${PYSITELIB}/stgit/basedir.py ${PYSITELIB}/stgit/basedir.pyc ${PYSITELIB}/stgit/basedir.pyo +${PYSITELIB}/stgit/builtin_version.py +${PYSITELIB}/stgit/builtin_version.pyc +${PYSITELIB}/stgit/builtin_version.pyo ${PYSITELIB}/stgit/commands/__init__.py ${PYSITELIB}/stgit/commands/__init__.pyc ${PYSITELIB}/stgit/commands/__init__.pyo -${PYSITELIB}/stgit/commands/add.py -${PYSITELIB}/stgit/commands/add.pyc -${PYSITELIB}/stgit/commands/add.pyo -${PYSITELIB}/stgit/commands/applied.py -${PYSITELIB}/stgit/commands/applied.pyc -${PYSITELIB}/stgit/commands/applied.pyo ${PYSITELIB}/stgit/commands/branch.py ${PYSITELIB}/stgit/commands/branch.pyc ${PYSITELIB}/stgit/commands/branch.pyo @@ -36,15 +36,15 @@ ${PYSITELIB}/stgit/commands/clean.pyo ${PYSITELIB}/stgit/commands/clone.py ${PYSITELIB}/stgit/commands/clone.pyc ${PYSITELIB}/stgit/commands/clone.pyo +${PYSITELIB}/stgit/commands/cmdlist.py +${PYSITELIB}/stgit/commands/cmdlist.pyc +${PYSITELIB}/stgit/commands/cmdlist.pyo ${PYSITELIB}/stgit/commands/commit.py ${PYSITELIB}/stgit/commands/commit.pyc ${PYSITELIB}/stgit/commands/commit.pyo ${PYSITELIB}/stgit/commands/common.py ${PYSITELIB}/stgit/commands/common.pyc ${PYSITELIB}/stgit/commands/common.pyo -${PYSITELIB}/stgit/commands/copy.py -${PYSITELIB}/stgit/commands/copy.pyc -${PYSITELIB}/stgit/commands/copy.pyo ${PYSITELIB}/stgit/commands/delete.py ${PYSITELIB}/stgit/commands/delete.pyc ${PYSITELIB}/stgit/commands/delete.pyo @@ -90,6 +90,9 @@ ${PYSITELIB}/stgit/commands/mail.pyo ${PYSITELIB}/stgit/commands/new.py ${PYSITELIB}/stgit/commands/new.pyc ${PYSITELIB}/stgit/commands/new.pyo +${PYSITELIB}/stgit/commands/next.py +${PYSITELIB}/stgit/commands/next.pyc +${PYSITELIB}/stgit/commands/next.pyo ${PYSITELIB}/stgit/commands/patches.py ${PYSITELIB}/stgit/commands/patches.pyc ${PYSITELIB}/stgit/commands/patches.pyo @@ -99,6 +102,12 @@ ${PYSITELIB}/stgit/commands/pick.pyo ${PYSITELIB}/stgit/commands/pop.py ${PYSITELIB}/stgit/commands/pop.pyc ${PYSITELIB}/stgit/commands/pop.pyo +${PYSITELIB}/stgit/commands/prev.py +${PYSITELIB}/stgit/commands/prev.pyc +${PYSITELIB}/stgit/commands/prev.pyo +${PYSITELIB}/stgit/commands/publish.py +${PYSITELIB}/stgit/commands/publish.pyc +${PYSITELIB}/stgit/commands/publish.pyo ${PYSITELIB}/stgit/commands/pull.py ${PYSITELIB}/stgit/commands/pull.pyc ${PYSITELIB}/stgit/commands/pull.pyo @@ -108,6 +117,9 @@ ${PYSITELIB}/stgit/commands/push.pyo ${PYSITELIB}/stgit/commands/rebase.py ${PYSITELIB}/stgit/commands/rebase.pyc ${PYSITELIB}/stgit/commands/rebase.pyo +${PYSITELIB}/stgit/commands/redo.py +${PYSITELIB}/stgit/commands/redo.pyc +${PYSITELIB}/stgit/commands/redo.pyo ${PYSITELIB}/stgit/commands/refresh.py ${PYSITELIB}/stgit/commands/refresh.pyc ${PYSITELIB}/stgit/commands/refresh.pyo @@ -117,12 +129,9 @@ ${PYSITELIB}/stgit/commands/rename.pyo ${PYSITELIB}/stgit/commands/repair.py ${PYSITELIB}/stgit/commands/repair.pyc ${PYSITELIB}/stgit/commands/repair.pyo -${PYSITELIB}/stgit/commands/resolved.py -${PYSITELIB}/stgit/commands/resolved.pyc -${PYSITELIB}/stgit/commands/resolved.pyo -${PYSITELIB}/stgit/commands/rm.py -${PYSITELIB}/stgit/commands/rm.pyc -${PYSITELIB}/stgit/commands/rm.pyo +${PYSITELIB}/stgit/commands/reset.py +${PYSITELIB}/stgit/commands/reset.pyc +${PYSITELIB}/stgit/commands/reset.pyo ${PYSITELIB}/stgit/commands/series.py ${PYSITELIB}/stgit/commands/series.pyc ${PYSITELIB}/stgit/commands/series.pyo @@ -132,24 +141,27 @@ ${PYSITELIB}/stgit/commands/show.pyo ${PYSITELIB}/stgit/commands/sink.py ${PYSITELIB}/stgit/commands/sink.pyc ${PYSITELIB}/stgit/commands/sink.pyo -${PYSITELIB}/stgit/commands/status.py -${PYSITELIB}/stgit/commands/status.pyc -${PYSITELIB}/stgit/commands/status.pyo +${PYSITELIB}/stgit/commands/squash.py +${PYSITELIB}/stgit/commands/squash.pyc +${PYSITELIB}/stgit/commands/squash.pyo ${PYSITELIB}/stgit/commands/sync.py ${PYSITELIB}/stgit/commands/sync.pyc ${PYSITELIB}/stgit/commands/sync.pyo ${PYSITELIB}/stgit/commands/top.py ${PYSITELIB}/stgit/commands/top.pyc ${PYSITELIB}/stgit/commands/top.pyo -${PYSITELIB}/stgit/commands/unapplied.py -${PYSITELIB}/stgit/commands/unapplied.pyc -${PYSITELIB}/stgit/commands/unapplied.pyo ${PYSITELIB}/stgit/commands/uncommit.py ${PYSITELIB}/stgit/commands/uncommit.pyc ${PYSITELIB}/stgit/commands/uncommit.pyo +${PYSITELIB}/stgit/commands/undo.py +${PYSITELIB}/stgit/commands/undo.pyc +${PYSITELIB}/stgit/commands/undo.pyo ${PYSITELIB}/stgit/commands/unhide.py ${PYSITELIB}/stgit/commands/unhide.pyc ${PYSITELIB}/stgit/commands/unhide.pyo +${PYSITELIB}/stgit/completion.py +${PYSITELIB}/stgit/completion.pyc +${PYSITELIB}/stgit/completion.pyo ${PYSITELIB}/stgit/config.py ${PYSITELIB}/stgit/config.pyc ${PYSITELIB}/stgit/config.pyo @@ -159,9 +171,27 @@ ${PYSITELIB}/stgit/exception.pyo ${PYSITELIB}/stgit/git.py ${PYSITELIB}/stgit/git.pyc ${PYSITELIB}/stgit/git.pyo -${PYSITELIB}/stgit/gitmergeonefile.py -${PYSITELIB}/stgit/gitmergeonefile.pyc -${PYSITELIB}/stgit/gitmergeonefile.pyo +${PYSITELIB}/stgit/lib/__init__.py +${PYSITELIB}/stgit/lib/__init__.pyc +${PYSITELIB}/stgit/lib/__init__.pyo +${PYSITELIB}/stgit/lib/edit.py +${PYSITELIB}/stgit/lib/edit.pyc +${PYSITELIB}/stgit/lib/edit.pyo +${PYSITELIB}/stgit/lib/git.py +${PYSITELIB}/stgit/lib/git.pyc +${PYSITELIB}/stgit/lib/git.pyo +${PYSITELIB}/stgit/lib/log.py +${PYSITELIB}/stgit/lib/log.pyc +${PYSITELIB}/stgit/lib/log.pyo +${PYSITELIB}/stgit/lib/stack.py +${PYSITELIB}/stgit/lib/stack.pyc +${PYSITELIB}/stgit/lib/stack.pyo +${PYSITELIB}/stgit/lib/stackupgrade.py +${PYSITELIB}/stgit/lib/stackupgrade.pyc +${PYSITELIB}/stgit/lib/stackupgrade.pyo +${PYSITELIB}/stgit/lib/transaction.py +${PYSITELIB}/stgit/lib/transaction.pyc +${PYSITELIB}/stgit/lib/transaction.pyo ${PYSITELIB}/stgit/main.py ${PYSITELIB}/stgit/main.pyc ${PYSITELIB}/stgit/main.pyo @@ -184,24 +214,98 @@ ${PYSITELIB}/stgit/version.py ${PYSITELIB}/stgit/version.pyc ${PYSITELIB}/stgit/version.pyo man/man1/stg-branch.1 +man/man1/stg-clean.1 man/man1/stg-clone.1 -man/man1/stg-cp.1 +man/man1/stg-commit.1 +man/man1/stg-delete.1 +man/man1/stg-diff.1 +man/man1/stg-edit.1 +man/man1/stg-export.1 +man/man1/stg-files.1 +man/man1/stg-float.1 +man/man1/stg-fold.1 +man/man1/stg-goto.1 +man/man1/stg-hide.1 +man/man1/stg-id.1 +man/man1/stg-import.1 man/man1/stg-init.1 +man/man1/stg-log.1 +man/man1/stg-mail.1 man/man1/stg-new.1 +man/man1/stg-next.1 +man/man1/stg-patches.1 +man/man1/stg-pick.1 +man/man1/stg-pop.1 +man/man1/stg-prev.1 +man/man1/stg-publish.1 +man/man1/stg-pull.1 +man/man1/stg-push.1 +man/man1/stg-rebase.1 +man/man1/stg-redo.1 +man/man1/stg-refresh.1 +man/man1/stg-rename.1 +man/man1/stg-repair.1 +man/man1/stg-reset.1 +man/man1/stg-series.1 +man/man1/stg-show.1 man/man1/stg-sink.1 +man/man1/stg-squash.1 +man/man1/stg-sync.1 +man/man1/stg-top.1 +man/man1/stg-uncommit.1 +man/man1/stg-undo.1 +man/man1/stg-unhide.1 man/man1/stg.1 share/doc/stgit/html/stg-branch.html +share/doc/stgit/html/stg-clean.html share/doc/stgit/html/stg-clone.html -share/doc/stgit/html/stg-cp.html +share/doc/stgit/html/stg-commit.html +share/doc/stgit/html/stg-delete.html +share/doc/stgit/html/stg-diff.html +share/doc/stgit/html/stg-edit.html +share/doc/stgit/html/stg-export.html +share/doc/stgit/html/stg-files.html +share/doc/stgit/html/stg-float.html +share/doc/stgit/html/stg-fold.html +share/doc/stgit/html/stg-goto.html +share/doc/stgit/html/stg-hide.html +share/doc/stgit/html/stg-id.html +share/doc/stgit/html/stg-import.html share/doc/stgit/html/stg-init.html +share/doc/stgit/html/stg-log.html +share/doc/stgit/html/stg-mail.html share/doc/stgit/html/stg-new.html +share/doc/stgit/html/stg-next.html +share/doc/stgit/html/stg-patches.html +share/doc/stgit/html/stg-pick.html +share/doc/stgit/html/stg-pop.html +share/doc/stgit/html/stg-prev.html +share/doc/stgit/html/stg-publish.html +share/doc/stgit/html/stg-pull.html +share/doc/stgit/html/stg-push.html +share/doc/stgit/html/stg-rebase.html +share/doc/stgit/html/stg-redo.html +share/doc/stgit/html/stg-refresh.html +share/doc/stgit/html/stg-rename.html +share/doc/stgit/html/stg-repair.html +share/doc/stgit/html/stg-reset.html +share/doc/stgit/html/stg-series.html +share/doc/stgit/html/stg-show.html share/doc/stgit/html/stg-sink.html +share/doc/stgit/html/stg-squash.html +share/doc/stgit/html/stg-sync.html +share/doc/stgit/html/stg-top.html +share/doc/stgit/html/stg-uncommit.html +share/doc/stgit/html/stg-undo.html +share/doc/stgit/html/stg-unhide.html share/doc/stgit/html/stg.html share/doc/stgit/html/tutorial.html -share/examples/stgit/gitconfig +share/stgit/completion/stgit-completion.bash share/stgit/contrib/stgbashprompt.sh -share/stgit/contrib/stgit-completion.bash +share/stgit/examples/gitconfig +share/stgit/examples/patchdescr.tmpl share/stgit/templates/covermail.tmpl share/stgit/templates/mailattch.tmpl +share/stgit/templates/patchandattch.tmpl share/stgit/templates/patchexport.tmpl share/stgit/templates/patchmail.tmpl diff --git a/devel/stgit/distinfo b/devel/stgit/distinfo index b99d171d9adb2..8db257c799914 100644 --- a/devel/stgit/distinfo +++ b/devel/stgit/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 03:29:34 agc Exp $ +$NetBSD: distinfo,v 1.11 2016/03/18 23:13:26 sevan Exp $ -SHA1 (stgit-0.14.3.tar.gz) = 9ea2e859281f8fe3cbb7f2bd9fd83b9846923cbe -RMD160 (stgit-0.14.3.tar.gz) = 5ed7ab18a3f98269c3fc29e4d1dd353171add7d9 -SHA512 (stgit-0.14.3.tar.gz) = 1b45d6b4799339c6882b1e5f512a21a67d3c912133c4d50ea27009fd5d241a04acbf1ff756094582386b12fb81942c94d7011a26e0f9ec6a464f9b47e5638482 -Size (stgit-0.14.3.tar.gz) = 227645 bytes -SHA1 (patch-aa) = 364103963f8e74eee12dbd548b4ed48b349b662f -SHA1 (patch-ab) = 4808d98409c39cd6af33aad1b318a8df41c9cfec -SHA1 (patch-ac) = ce1df6ab709c4c4e27b96491a8fc37669c593cb0 -SHA1 (patch-ad) = 71d7a3c7e71512a84231f08574713390f1db300d +SHA1 (stgit-0.17.1.tar.gz) = 5918fd983919ab70ab191868b84e917a06556cc2 +RMD160 (stgit-0.17.1.tar.gz) = 74cfb72865b3c290613ca355d360b47baa1c8351 +SHA512 (stgit-0.17.1.tar.gz) = 3efdfb9bc024c3a7c0d74d49e85f157d5d5209c9a2ad0ce63a07138c02fb1580e92ac4a91796e79bbd221e6884317e975f9f44e35db0b484fd916bc67cd61abe +Size (stgit-0.17.1.tar.gz) = 398466 bytes +SHA1 (patch-aa) = 83bf9651149e53ef9264a6d98d4e4e9faf3692cf diff --git a/devel/stgit/patches/patch-aa b/devel/stgit/patches/patch-aa index b51ffa8cb4df9..3c1195da603de 100644 --- a/devel/stgit/patches/patch-aa +++ b/devel/stgit/patches/patch-aa @@ -1,17 +1,37 @@ -$NetBSD: patch-aa,v 1.1 2008/01/10 06:35:49 bjs Exp $ +$NetBSD: patch-aa,v 1.2 2016/03/18 23:13:26 sevan Exp $ ---- contrib/stg-gitk.orig 2007-12-11 18:54:04.000000000 -0500 -+++ contrib/stg-gitk -@@ -48,10 +48,10 @@ if [ $allbranches = 1 ]; then - refdirs="$GIT_DIR/refs" - else - # default to current branch -- if [ "$branches" == "" ]; then -+ if [ "$branches" = "" ]; then - branches="$(stg branch)" - fi -- if [ "$branches" == "" ]; then -+ if [ "$branches" = "" ]; then - echo >&2 "ERROR: cannot find current branch." - exit 1 - fi +Honor PYTHON settings in Documentation Makefile. +Backport of commit e22723c8ee19cf1bb4fdf68b2f1207442ab59e39 + +Allow ASCIIDOC_EXTRA to be overridden + +--- Documentation/Makefile.orig 2009-10-26 16:09:04.000000000 +0000 ++++ Documentation/Makefile +@@ -1,4 +1,4 @@ +-COMMANDS = $(shell ../stg-build --commands) ++COMMANDS = $(shell $(PYTHON) ../stg-build --commands) + COMMANDS_TXT = $(patsubst %,stg-%.txt,$(COMMANDS)) + + MAN1_TXT= stg.txt $(COMMANDS_TXT) +@@ -19,7 +19,7 @@ man1dir=$(mandir)/man1 + # DESTDIR= + + ASCIIDOC=asciidoc --unsafe +-ASCIIDOC_EXTRA = ++ASCIIDOC_EXTRA ?= + INSTALL?=install + + # +@@ -63,10 +63,10 @@ clean: + ALL_PY = $(shell find ../stgit -name '*.py') + + $(COMMANDS_TXT): $(ALL_PY) +- ../stg-build --asciidoc $(basename $(subst stg-,,$@)) > $@ ++ $(PYTHON) ../stg-build --asciidoc $(basename $(subst stg-,,$@)) > $@ + + command-list.txt: $(ALL_PY) +- ../stg-build --cmd-list > $@ ++ $(PYTHON) ../stg-build --cmd-list > $@ + + %.html : %.txt + $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $< diff --git a/devel/stgit/patches/patch-ab b/devel/stgit/patches/patch-ab deleted file mode 100644 index 2ba35bc3559d4..0000000000000 --- a/devel/stgit/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2008/04/10 12:11:34 bjs Exp $ - ---- setup.py.orig 2008-03-24 15:21:30.000000000 -0400 -+++ setup.py -@@ -62,10 +62,8 @@ setup(name = 'stgit', - scripts = ['stg'], - packages = ['stgit', 'stgit.commands'], - data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')), -- ('share/stgit/examples', glob.glob('examples/*.tmpl')), -- ('share/stgit/examples', ['examples/gitconfig']), -- ('share/stgit/contrib', ['contrib/diffcol.sh', -- 'contrib/stgbashprompt.sh', -+ ('share/examples/stgit', ['examples/gitconfig']), -+ ('share/stgit/contrib', ['contrib/stgbashprompt.sh', - 'contrib/stgit-completion.bash']), - ('share/doc/stgit', glob.glob('doc/*.txt'))] - ) diff --git a/devel/stgit/patches/patch-ac b/devel/stgit/patches/patch-ac deleted file mode 100644 index c8fcf605be623..0000000000000 --- a/devel/stgit/patches/patch-ac +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2008/07/25 04:00:59 bjs Exp $ - ---- Documentation/Makefile.orig 2007-07-25 19:49:46.000000000 -0400 -+++ Documentation/Makefile 2008-02-11 14:55:30.000000000 -0500 -@@ -20,7 +20,7 @@ - # DESTDIR= - - ASCIIDOC=asciidoc --unsafe --ASCIIDOC_EXTRA = -+#ASCIIDOC_EXTRA = - INSTALL?=install - - # -@@ -44,9 +44,14 @@ - man7: $(DOC_MAN7) - - install: man -- $(INSTALL) -d -m755 $(DESTDIR)$(man1dir) $(DESTDIR)$(man7dir) -- $(INSTALL) -m644 $(DOC_MAN1) $(DESTDIR)$(man1dir) -- $(INSTALL) -m644 $(DOC_MAN7) $(DESTDIR)$(man7dir) -+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man1dir) -+ $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(man7dir) -+ for fn in $(DOC_MAN1); do \ -+ $(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(man1dir); \ -+ done -+ for fn in $(DOC_MAN7); do \ -+ $(BSD_INSTALL_MAN) $$fn $(DESTDIR)$(man7dir); \ -+ done - # - # Determine "include::" file references in asciidoc files. - # diff --git a/devel/stgit/patches/patch-ad b/devel/stgit/patches/patch-ad deleted file mode 100644 index 32efb1fc3efda..0000000000000 --- a/devel/stgit/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2011/01/21 13:09:51 dmcmahill Exp $ - -Remove level 0 markup which is not allowed for an 'article' document. - ---- Documentation/tutorial.txt.orig 2011-01-21 12:56:56.000000000 +0000 -+++ Documentation/tutorial.txt 2011-01-21 12:57:06.000000000 +0000 -@@ -1,4 +1,4 @@ - StGIT Tutorial --############## -+=============== - - From 7fbec96660628ede76faf17a77b59520a753509f Mon Sep 17 00:00:00 2001 From: sevan Date: Fri, 18 Mar 2016 23:27:31 +0000 Subject: [PATCH 0292/2457] Update devel/stgit to 0.17.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 5ee0a7c8c5705..a6ad2522f902f 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1249 2016/03/18 21:26:55 tez Exp $ +$NetBSD: CHANGES-2016,v 1.1250 2016/03/18 23:27:31 sevan Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1647,3 +1647,4 @@ Changes to the packages collection and infrastructure in 2016: mk/bsd.pkg.mk: started freeze for pkgsrc-2016Q1 branch [agc 2016-03-17] Updated mail/opendkim to 2.10.3 [pettai 2016-03-18] Updated devel/pcre to 8.38nb1 [tez 2016-03-18] + Updated devel/stgit to 0.17.1 [sevan 2016-03-18] From 76529b0a4716e09f8b159ae5e61b86dc78ecfdc7 Mon Sep 17 00:00:00 2001 From: rillig Date: Sat, 19 Mar 2016 00:32:10 +0000 Subject: [PATCH 0293/2457] Removed CVS conflict lines from distinfo. --- sysutils/xentools42/distinfo | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sysutils/xentools42/distinfo b/sysutils/xentools42/distinfo index a6a4f7ffc8390..c0fc6f47a5a03 100644 --- a/sysutils/xentools42/distinfo +++ b/sysutils/xentools42/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2016/01/07 17:53:58 bouyer Exp $ +$NetBSD: distinfo,v 1.23 2016/03/19 00:32:10 rillig Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -8,9 +8,6 @@ SHA1 (xen-4.2.5.tar.gz) = f42741e4ec174495ace70c4b17a6b9b0e60e798a RMD160 (xen-4.2.5.tar.gz) = 7d4f7f1b32ee541d341a756b1f8da02816438d19 SHA512 (xen-4.2.5.tar.gz) = 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac Size (xen-4.2.5.tar.gz) = 15671925 bytes -<<<<<<< distinfo -======= ->>>>>>> 1.21 SHA1 (patch-.._.._ipxe_src_Makefile.housekeeping) = 5ec8020a9705b2f64096c2942473a8de4db578bb SHA1 (patch-.._.._ipxe_src_arch_i386_include_librm.h) = 4549ac641b112321b4731a918d85219c3fce6808 SHA1 (patch-.._.._ipxe_src_arch_i386_scripts_i386.lds) = 4c0cbb7f535be43e1b6f53c284340a8bafc37c0b From 249de52a45967bc983b9bafe087c8e11bde41c42 Mon Sep 17 00:00:00 2001 From: pettai Date: Sat, 19 Mar 2016 06:45:28 +0000 Subject: [PATCH 0294/2457] *** empty log message *** --- net/rancid/Makefile | 5 ++--- net/rancid/PLIST | 10 +++++++--- net/rancid/distinfo | 10 +++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/net/rancid/Makefile b/net/rancid/Makefile index 27c0f8e5d610c..32eb62c705ede 100644 --- a/net/rancid/Makefile +++ b/net/rancid/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2015/06/12 10:50:52 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2016/03/19 06:45:28 pettai Exp $ # -DISTNAME= rancid-3.2 -PKGREVISION= 1 +DISTNAME= rancid-3.4.1 CATEGORIES= net MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ diff --git a/net/rancid/PLIST b/net/rancid/PLIST index 344ac4ed95d89..82f0dccf32e64 100644 --- a/net/rancid/PLIST +++ b/net/rancid/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.8 2015/03/16 22:36:58 pettai Exp $ +@comment $NetBSD: PLIST,v 1.9 2016/03/19 06:45:28 pettai Exp $ +bin/a10login bin/agmrancid bin/alogin bin/anlogin @@ -45,9 +46,11 @@ bin/rancid bin/rancid-cvs bin/rancid-fe bin/rancid-run +bin/rblogin bin/rivlogin bin/rivrancid bin/rrancid +bin/rtftpcopy bin/srancid bin/tlogin bin/trancid @@ -56,6 +59,7 @@ bin/xilogin bin/xirancid bin/xrancid bin/zrancid +lib/rancid/acos.pm lib/rancid/arbor.pm lib/rancid/ciscowlc.pm lib/rancid/dell.pm @@ -68,6 +72,8 @@ lib/rancid/mrv.pm lib/rancid/nxos.pm lib/rancid/panos.pm lib/rancid/rancid.pm +lib/rancid/rbt.pm +lib/rancid/wavesvros.pm man/man1/agmrancid.1 man/man1/alogin.1 man/man1/anlogin.1 @@ -81,7 +87,6 @@ man/man1/brancid.1 man/man1/cat5rancid.1 man/man1/clogin.1 man/man1/complogin.1 -man/man1/comprancid.1 man/man1/control_rancid.1 man/man1/cssrancid.1 man/man1/dllogin.1 @@ -155,4 +160,3 @@ share/doc/rancid/rtrfilter share/examples/rancid/lg.conf.sample share/examples/rancid/rancid.conf.sample share/examples/rancid/rancid.types.base -@pkgdir etc/rancid diff --git a/net/rancid/distinfo b/net/rancid/distinfo index 72ca639103cb6..4058c0e31710c 100644 --- a/net/rancid/distinfo +++ b/net/rancid/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.11 2015/11/04 00:35:33 agc Exp $ +$NetBSD: distinfo,v 1.12 2016/03/19 06:45:28 pettai Exp $ -SHA1 (rancid-3.2.tar.gz) = 8396cf695e79a4f4c526f2452603929678139bf8 -RMD160 (rancid-3.2.tar.gz) = 9182028556a0b5fd4dd9172a7a8ca54deeea64a4 -SHA512 (rancid-3.2.tar.gz) = d55a780ac2262028d1e2df214c615760f6407d6954254c562415bdf1389783f392777005322db22e92353a678568ed948307aa4e46c95ff4d1f1af24b8979f0b -Size (rancid-3.2.tar.gz) = 470336 bytes +SHA1 (rancid-3.4.1.tar.gz) = 472a890cd5b20c3e02da788c87aecf51ce0c8534 +RMD160 (rancid-3.4.1.tar.gz) = 87e72f1b839a9177b6d36dc6054750efbb503add +SHA512 (rancid-3.4.1.tar.gz) = d11dc471d3f13c15faa260fc2b074fe5fad5959b673d2fe97c2e233bf339cfc148ae80b080253513261a799f5c1913fdc848de1fc1f2db0e787175531704b228 +Size (rancid-3.4.1.tar.gz) = 486292 bytes SHA1 (patch-etc_Makefile.in) = 5400aa7c2a55ecb09577984e86e9f4dbc117f00d From 23f2ed6e521f1c22395600df139a0d05cdefacfb Mon Sep 17 00:00:00 2001 From: pettai Date: Sat, 19 Mar 2016 06:46:10 +0000 Subject: [PATCH 0295/2457] Updated net/rancid to 3.4.1 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index a6ad2522f902f..f022d2640b479 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1250 2016/03/18 23:27:31 sevan Exp $ +$NetBSD: CHANGES-2016,v 1.1251 2016/03/19 06:46:10 pettai Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1648,3 +1648,4 @@ Changes to the packages collection and infrastructure in 2016: Updated mail/opendkim to 2.10.3 [pettai 2016-03-18] Updated devel/pcre to 8.38nb1 [tez 2016-03-18] Updated devel/stgit to 0.17.1 [sevan 2016-03-18] + Updated net/rancid to 3.4.1 [pettai 2016-03-19] diff --git a/doc/TODO b/doc/TODO index 3726af3153a12..fa0e2a70db9a0 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15604 2016/03/17 14:39:42 mef Exp $ +$NetBSD: TODO,v 1.15605 2016/03/19 06:46:10 pettai Exp $ Suggested new packages ====================== @@ -1729,7 +1729,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o rainbowcrack-1.5 o raine-0.64.9 o rakudo-star-2016.01 - o rancid-3.4.1 o rasmol-2.7.5.2 o rat-4.2.25 o ratmen-2.2.3 From a1a9913d08412941fb1a8a991b683cfae6c775cc Mon Sep 17 00:00:00 2001 From: nros Date: Sat, 19 Mar 2016 17:21:48 +0000 Subject: [PATCH 0296/2457] Fix build of latex2rtf. Don't generate the pdf since it requires latex. Revbump. --- converters/latex2rtf/Makefile | 7 +- converters/latex2rtf/PLIST | 3 +- converters/latex2rtf/distinfo | 5 +- converters/latex2rtf/files/texinfo.tex | 11130 ---------------- converters/latex2rtf/patches/patch-aa | 14 +- .../latex2rtf/patches/patch-doc_Makefile | 10 + 6 files changed, 27 insertions(+), 11142 deletions(-) delete mode 100644 converters/latex2rtf/files/texinfo.tex create mode 100644 converters/latex2rtf/patches/patch-doc_Makefile diff --git a/converters/latex2rtf/Makefile b/converters/latex2rtf/Makefile index 32452f94ba5f8..b2d0d7ce79887 100644 --- a/converters/latex2rtf/Makefile +++ b/converters/latex2rtf/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2016/02/02 18:15:44 nros Exp $ +# $NetBSD: Makefile,v 1.29 2016/03/19 17:21:48 nros Exp $ DISTNAME= latex2rtf-2.3.10 +PKGREVISION= 1 CATEGORIES= print converters textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=latex2rtf/} \ ${MASTER_SITE_TEX_CTAN:=support/latex2rtf/} @@ -17,10 +18,6 @@ REPLACE_BASH= scripts/latex2png INSTALL_TARGET= install install-info -#texinfo.tex is missing in the distribution. -pre-configure: - ${CP} ${FILESDIR}/texinfo.tex ${WRKSRC}/doc - DEPENDS+= stix-otf-[0-9]*:../../fonts/stix-otf .include "../../mk/bsd.pkg.mk" diff --git a/converters/latex2rtf/PLIST b/converters/latex2rtf/PLIST index 9c7a6692a7d3d..f2a2e00b6e0f9 100644 --- a/converters/latex2rtf/PLIST +++ b/converters/latex2rtf/PLIST @@ -1,11 +1,10 @@ -@comment $NetBSD: PLIST,v 1.9 2016/02/02 18:15:44 nros Exp $ +@comment $NetBSD: PLIST,v 1.10 2016/03/19 17:21:48 nros Exp $ bin/latex2png bin/latex2rtf info/latex2rtf.info man/man1/latex2png.1 man/man1/latex2rtf.1 share/doc/latex2rtf/latex2rtf.html -share/doc/latex2rtf/latex2rtf.pdf share/doc/latex2rtf/latex2rtf.txt share/latex2rtf/cfg/afrikaans.cfg share/latex2rtf/cfg/bahasa.cfg diff --git a/converters/latex2rtf/distinfo b/converters/latex2rtf/distinfo index f9d8d0f108875..553679dcf917f 100644 --- a/converters/latex2rtf/distinfo +++ b/converters/latex2rtf/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.11 2016/02/02 18:15:44 nros Exp $ +$NetBSD: distinfo,v 1.12 2016/03/19 17:21:48 nros Exp $ SHA1 (latex2rtf-2.3.10.tar.gz) = aa6adc7d6c25658aed1bc0bb70cf0274f7a770aa RMD160 (latex2rtf-2.3.10.tar.gz) = 678f8cb35083bffcfa8ee9994a6edf9248518242 SHA512 (latex2rtf-2.3.10.tar.gz) = fc1f117aafad95abd85ecfbfb8cbae563f3e6c1f26485bd008bfa01ef48144aa6654e7f1dd09cf5093befa2febfbd5de698fbfe1613c96a7964e58e6e0cf8bf2 Size (latex2rtf-2.3.10.tar.gz) = 321712 bytes -SHA1 (patch-aa) = 90d4a16e20f6d130683bf3a4cfa7603dc34c6b4d +SHA1 (patch-aa) = e9dabf461bb72a4b41ad6ec9c87be607c273ec19 +SHA1 (patch-doc_Makefile) = b7de18c540bab246e9170555d5d0989d6d82784a diff --git a/converters/latex2rtf/files/texinfo.tex b/converters/latex2rtf/files/texinfo.tex deleted file mode 100644 index b2f744548e245..0000000000000 --- a/converters/latex2rtf/files/texinfo.tex +++ /dev/null @@ -1,11130 +0,0 @@ -% texinfo.tex -- TeX macros to handle Texinfo files. -% -% Load plain if necessary, i.e., if running under initex. -\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi -% -\def\texinfoversion{2016-01-31.12} -% -% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 -% Free Software Foundation, Inc. -% -% This texinfo.tex file is free software: you can redistribute it and/or -% modify it under the terms of the GNU General Public License as -% published by the Free Software Foundation, either version 3 of the -% License, or (at your option) any later version. -% -% This texinfo.tex file is distributed in the hope that it will be -% useful, but WITHOUT ANY WARRANTY; without even the implied warranty -% of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -% General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with this program. If not, see . -% -% As a special exception, when this file is read by TeX when processing -% a Texinfo source document, you may use the result without -% restriction. This Exception is an additional permission under section 7 -% of the GNU General Public License, version 3 ("GPLv3"). -% -% Please try the latest version of texinfo.tex before submitting bug -% reports; you can get the latest version from: -% http://ftp.gnu.org/gnu/texinfo/ (the Texinfo release area), or -% http://ftpmirror.gnu.org/texinfo/ (same, via a mirror), or -% http://www.gnu.org/software/texinfo/ (the Texinfo home page) -% The texinfo.tex in any given distribution could well be out -% of date, so if that's what you're using, please check. -% -% Send bug reports to bug-texinfo@gnu.org. Please include including a -% complete document in each bug report with which we can reproduce the -% problem. Patches are, of course, greatly appreciated. -% -% To process a Texinfo manual with TeX, it's most reliable to use the -% texi2dvi shell script that comes with the distribution. For a simple -% manual foo.texi, however, you can get away with this: -% tex foo.texi -% texindex foo.?? -% tex foo.texi -% tex foo.texi -% dvips foo.dvi -o # or whatever; this makes foo.ps. -% The extra TeX runs get the cross-reference information correct. -% Sometimes one run after texindex suffices, and sometimes you need more -% than two; texi2dvi does it as many times as necessary. -% -% It is possible to adapt texinfo.tex for other languages, to some -% extent. You can get the existing language-specific files from the -% full Texinfo distribution. -% -% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. - - -\message{Loading texinfo [version \texinfoversion]:} - -% If in a .fmt file, print the version number -% and turn on active characters that we couldn't do earlier because -% they might have appeared in the input file name. -\everyjob{\message{[Texinfo version \texinfoversion]}% - \catcode`+=\active \catcode`\_=\active} - -\chardef\other=12 - -% We never want plain's \outer definition of \+ in Texinfo. -% For @tex, we can use \tabalign. -\let\+ = \relax - -% Save some plain tex macros whose names we will redefine. -\let\ptexb=\b -\let\ptexbullet=\bullet -\let\ptexc=\c -\let\ptexcomma=\, -\let\ptexdot=\. -\let\ptexdots=\dots -\let\ptexend=\end -\let\ptexequiv=\equiv -\let\ptexexclam=\! -\let\ptexfootnote=\footnote -\let\ptexgtr=> -\let\ptexhat=^ -\let\ptexi=\i -\let\ptexindent=\indent -\let\ptexinsert=\insert -\let\ptexlbrace=\{ -\let\ptexless=< -\let\ptexnewwrite\newwrite -\let\ptexnoindent=\noindent -\let\ptexplus=+ -\let\ptexraggedright=\raggedright -\let\ptexrbrace=\} -\let\ptexslash=\/ -\let\ptexsp=\sp -\let\ptexstar=\* -\let\ptexsup=\sup -\let\ptext=\t -\let\ptextop=\top -{\catcode`\'=\active \global\let\ptexquoteright'}% active in plain's math mode - -% If this character appears in an error message or help string, it -% starts a new line in the output. -\newlinechar = `^^J - -% Use TeX 3.0's \inputlineno to get the line number, for better error -% messages, but if we're using an old version of TeX, don't do anything. -% -\ifx\inputlineno\thisisundefined - \let\linenumber = \empty % Pre-3.0. -\else - \def\linenumber{l.\the\inputlineno:\space} -\fi - -% Set up fixed words for English if not already set. -\ifx\putwordAppendix\undefined \gdef\putwordAppendix{Appendix}\fi -\ifx\putwordChapter\undefined \gdef\putwordChapter{Chapter}\fi -\ifx\putworderror\undefined \gdef\putworderror{error}\fi -\ifx\putwordfile\undefined \gdef\putwordfile{file}\fi -\ifx\putwordin\undefined \gdef\putwordin{in}\fi -\ifx\putwordIndexIsEmpty\undefined \gdef\putwordIndexIsEmpty{(Index is empty)}\fi -\ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi -\ifx\putwordInfo\undefined \gdef\putwordInfo{Info}\fi -\ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi -\ifx\putwordMethodon\undefined \gdef\putwordMethodon{Method on}\fi -\ifx\putwordNoTitle\undefined \gdef\putwordNoTitle{No Title}\fi -\ifx\putwordof\undefined \gdef\putwordof{of}\fi -\ifx\putwordon\undefined \gdef\putwordon{on}\fi -\ifx\putwordpage\undefined \gdef\putwordpage{page}\fi -\ifx\putwordsection\undefined \gdef\putwordsection{section}\fi -\ifx\putwordSection\undefined \gdef\putwordSection{Section}\fi -\ifx\putwordsee\undefined \gdef\putwordsee{see}\fi -\ifx\putwordSee\undefined \gdef\putwordSee{See}\fi -\ifx\putwordShortTOC\undefined \gdef\putwordShortTOC{Short Contents}\fi -\ifx\putwordTOC\undefined \gdef\putwordTOC{Table of Contents}\fi -% -\ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi -\ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi -\ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi -\ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi -\ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi -\ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi -\ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi -\ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi -\ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi -\ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi -\ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi -\ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi -% -\ifx\putwordDefmac\undefined \gdef\putwordDefmac{Macro}\fi -\ifx\putwordDefspec\undefined \gdef\putwordDefspec{Special Form}\fi -\ifx\putwordDefvar\undefined \gdef\putwordDefvar{Variable}\fi -\ifx\putwordDefopt\undefined \gdef\putwordDefopt{User Option}\fi -\ifx\putwordDeffunc\undefined \gdef\putwordDeffunc{Function}\fi - -% Give the space character the catcode for a space. -\def\spaceisspace{\catcode`\ =10\relax} - -\chardef\dashChar = `\- -\chardef\slashChar = `\/ -\chardef\underChar = `\_ - -% Ignore a token. -% -\def\gobble#1{} - -% The following is used inside several \edef's. -\def\makecsname#1{\expandafter\noexpand\csname#1\endcsname} - -% Hyphenation fixes. -\hyphenation{ - Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script - ap-pen-dix bit-map bit-maps - data-base data-bases eshell fall-ing half-way long-est man-u-script - man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm - par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces - spell-ing spell-ings - stand-alone strong-est time-stamp time-stamps which-ever white-space - wide-spread wrap-around -} - -% Sometimes it is convenient to have everything in the transcript file -% and nothing on the terminal. We don't just call \tracingall here, -% since that produces some useless output on the terminal. We also make -% some effort to order the tracing commands to reduce output in the log -% file; cf. trace.sty in LaTeX. -% -\def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}% -\def\loggingall{% - \tracingstats2 - \tracingpages1 - \tracinglostchars2 % 2 gives us more in etex - \tracingparagraphs1 - \tracingoutput1 - \tracingmacros2 - \tracingrestores1 - \showboxbreadth\maxdimen \showboxdepth\maxdimen - \ifx\eTeXversion\thisisundefined\else % etex gives us more logging - \tracingscantokens1 - \tracingifs1 - \tracinggroups1 - \tracingnesting2 - \tracingassigns1 - \fi - \tracingcommands3 % 3 gives us more in etex - \errorcontextlines16 -}% - -% @errormsg{MSG}. Do the index-like expansions on MSG, but if things -% aren't perfect, it's not the end of the world, being an error message, -% after all. -% -\def\errormsg{\begingroup \indexnofonts \doerrormsg} -\def\doerrormsg#1{\errmessage{#1}} - -% add check for \lastpenalty to plain's definitions. If the last thing -% we did was a \nobreak, we don't want to insert more space. -% -\def\smallbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\smallskipamount - \removelastskip\penalty-50\smallskip\fi\fi} -\def\medbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\medskipamount - \removelastskip\penalty-100\medskip\fi\fi} -\def\bigbreak{\ifnum\lastpenalty<10000\par\ifdim\lastskip<\bigskipamount - \removelastskip\penalty-200\bigskip\fi\fi} - -% Output routine -% - -% For a final copy, take out the rectangles -% that mark overfull boxes (in case you have decided -% that the text looks ok even though it passes the margin). -% -\def\finalout{\overfullrule=0pt } - -% Do @cropmarks to get crop marks. -% -\newif\ifcropmarks -\let\cropmarks = \cropmarkstrue -% -% Dimensions to add cropmarks at corners. -% Added by P. A. MacKay, 12 Nov. 1986 -% -\newdimen\outerhsize \newdimen\outervsize % set by the paper size routines -\newdimen\cornerlong \cornerlong=1pc -\newdimen\cornerthick \cornerthick=.3pt -\newdimen\topandbottommargin \topandbottommargin=.75in - -% Output a mark which sets \thischapter, \thissection and \thiscolor. -% We dump everything together because we only have one kind of mark. -% This works because we only use \botmark / \topmark, not \firstmark. -% -% A mark contains a subexpression of the \ifcase ... \fi construct. -% \get*marks macros below extract the needed part using \ifcase. -% -% Another complication is to let the user choose whether \thischapter -% (\thissection) refers to the chapter (section) in effect at the top -% of a page, or that at the bottom of a page. - -% \domark is called twice inside \chapmacro, to add one -% mark before the section break, and one after. -% In the second call \prevchapterdefs is the same as \lastchapterdefs, -% and \prevsectiondefs is the same as \lastsectiondefs. -% Then if the page is not broken at the mark, some of the previous -% section appears on the page, and we can get the name of this section -% from \firstmark for @everyheadingmarks top. -% @everyheadingmarks bottom uses \botmark. -% -% See page 260 of The TeXbook. -\def\domark{% - \toks0=\expandafter{\lastchapterdefs}% - \toks2=\expandafter{\lastsectiondefs}% - \toks4=\expandafter{\prevchapterdefs}% - \toks6=\expandafter{\prevsectiondefs}% - \toks8=\expandafter{\lastcolordefs}% - \mark{% - \the\toks0 \the\toks2 % 0: marks for @everyheadingmarks top - \noexpand\or \the\toks4 \the\toks6 % 1: for @everyheadingmarks bottom - \noexpand\else \the\toks8 % 2: color marks - }% -} - -% \gettopheadingmarks, \getbottomheadingmarks, -% \getcolormarks - extract needed part of mark. -% -% \topmark doesn't work for the very first chapter (after the title -% page or the contents), so we use \firstmark there -- this gets us -% the mark with the chapter defs, unless the user sneaks in, e.g., -% @setcolor (or @url, or @link, etc.) between @contents and the very -% first @chapter. -\def\gettopheadingmarks{% - \ifcase0\topmark\fi - \ifx\thischapter\empty \ifcase0\firstmark\fi \fi -} -\def\getbottomheadingmarks{\ifcase1\botmark\fi} -\def\getcolormarks{\ifcase2\topmark\fi} - -% Avoid "undefined control sequence" errors. -\def\lastchapterdefs{} -\def\lastsectiondefs{} -\def\lastsection{} -\def\prevchapterdefs{} -\def\prevsectiondefs{} -\def\lastcolordefs{} - -% Margin to add to right of even pages, to left of odd pages. -\newdimen\bindingoffset -\newdimen\normaloffset -\newdimen\pagewidth \newdimen\pageheight - -% Main output routine. -% -\chardef\PAGE = 255 -\output = {\onepageout{\pagecontents\PAGE}} - -\newbox\headlinebox -\newbox\footlinebox - -% \onepageout takes a vbox as an argument. -% \shipout a vbox for a single page, adding an optional header, footer, -% cropmarks, and footnote. This also causes index entries for this page -% to be written to the auxiliary files. -% -\def\onepageout#1{% - \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi - % - \ifodd\pageno \advance\hoffset by \bindingoffset - \else \advance\hoffset by -\bindingoffset\fi - % - % Common context changes for both heading and footing. - % Do this outside of the \shipout so @code etc. will be expanded in - % the headline as they should be, not taken literally (outputting ''code). - \def\commmonheadfootline{\let\hsize=\pagewidth \texinfochars} - % - % Retrieve the information for the headings from the marks in the page, - % and call Plain TeX's \makeheadline and \makefootline, which use the - % values in \headline and \footline. - % - % This is used to check if we are on the first page of a chapter. - \ifcase1\topmark\fi - \let\prevchaptername\thischaptername - \ifcase0\firstmark\fi - \let\curchaptername\thischaptername - % - \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi - \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi - % - \ifx\curchaptername\prevchaptername - \let\thischapterheading\thischapter - \else - % \thischapterheading is the same as \thischapter except it is blank - % for the first page of a chapter. This is to prevent the chapter name - % being shown twice. - \def\thischapterheading{}% - \fi - % - \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}% - \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}% - % - {% - % Set context for writing to auxiliary files like index files. - % Have to do this stuff outside the \shipout because we want it to - % take effect in \write's, yet the group defined by the \vbox ends - % before the \shipout runs. - % - \indexdummies % don't expand commands in the output. - \normalturnoffactive % \ in index entries must not stay \, e.g., if - % the page break happens to be in the middle of an example. - % We don't want .vr (or whatever) entries like this: - % \entry{{\indexbackslash }acronym}{32}{\code {\acronym}} - % "\acronym" won't work when it's read back in; - % it needs to be - % {\code {{\backslashcurfont }acronym} - \shipout\vbox{% - % Do this early so pdf references go to the beginning of the page. - \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi - % - \ifcropmarks \vbox to \outervsize\bgroup - \hsize = \outerhsize - \vskip-\topandbottommargin - \vtop to0pt{% - \line{\ewtop\hfil\ewtop}% - \nointerlineskip - \line{% - \vbox{\moveleft\cornerthick\nstop}% - \hfill - \vbox{\moveright\cornerthick\nstop}% - }% - \vss}% - \vskip\topandbottommargin - \line\bgroup - \hfil % center the page within the outer (page) hsize. - \ifodd\pageno\hskip\bindingoffset\fi - \vbox\bgroup - \fi - % - \unvbox\headlinebox - \pagebody{#1}% - \ifdim\ht\footlinebox > 0pt - % Only leave this space if the footline is nonempty. - % (We lessened \vsize for it in \oddfootingyyy.) - % The \baselineskip=24pt in plain's \makefootline has no effect. - \vskip 24pt - \unvbox\footlinebox - \fi - % - \ifcropmarks - \egroup % end of \vbox\bgroup - \hfil\egroup % end of (centering) \line\bgroup - \vskip\topandbottommargin plus1fill minus1fill - \boxmaxdepth = \cornerthick - \vbox to0pt{\vss - \line{% - \vbox{\moveleft\cornerthick\nsbot}% - \hfill - \vbox{\moveright\cornerthick\nsbot}% - }% - \nointerlineskip - \line{\ewbot\hfil\ewbot}% - }% - \egroup % \vbox from first cropmarks clause - \fi - }% end of \shipout\vbox - }% end of group with \indexdummies - \advancepageno - \ifnum\outputpenalty>-20000 \else\dosupereject\fi -} - -\newinsert\margin \dimen\margin=\maxdimen - -% Main part of page, including any footnotes -\def\pagebody#1{\vbox to\pageheight{\boxmaxdepth=\maxdepth #1}} -{\catcode`\@ =11 -\gdef\pagecontents#1{\ifvoid\topins\else\unvbox\topins\fi -% marginal hacks, juha@viisa.uucp (Juha Takala) -\ifvoid\margin\else % marginal info is present - \rlap{\kern\hsize\vbox to\z@{\kern1pt\box\margin \vss}}\fi -\dimen@=\dp#1\relax \unvbox#1\relax -\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi -\ifr@ggedbottom \kern-\dimen@ \vfil \fi} -} - -% Here are the rules for the cropmarks. Note that they are -% offset so that the space between them is truly \outerhsize or \outervsize -% (P. A. MacKay, 12 November, 1986) -% -\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong} -\def\nstop{\vbox - {\hrule height\cornerthick depth\cornerlong width\cornerthick}} -\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong} -\def\nsbot{\vbox - {\hrule height\cornerlong depth\cornerthick width\cornerthick}} - - -% Argument parsing - -% Parse an argument, then pass it to #1. The argument is the rest of -% the input line (except we remove a trailing comment). #1 should be a -% macro which expects an ordinary undelimited TeX argument. -% For example, \def\foo{\parsearg\fooxxx}. -% -\def\parsearg{\parseargusing{}} -\def\parseargusing#1#2{% - \def\argtorun{#2}% - \begingroup - \obeylines - \spaceisspace - #1% - \parseargline\empty% Insert the \empty token, see \finishparsearg below. -} - -{\obeylines % - \gdef\parseargline#1^^M{% - \endgroup % End of the group started in \parsearg. - \argremovecomment #1\comment\ArgTerm% - }% -} - -% First remove any @comment, then any @c comment. Also remove a @texinfoc -% comment (see \scanmacro for details). Pass the result on to \argcheckspaces. -\def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} -\def\argremovec#1\c#2\ArgTerm{\argremovetexinfoc #1\texinfoc\ArgTerm} -\def\argremovetexinfoc#1\texinfoc#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} - -% Each occurrence of `\^^M' or `\^^M' is replaced by a single space. -% -% \argremovec might leave us with trailing space, e.g., -% @end itemize @c foo -% This space token undergoes the same procedure and is eventually removed -% by \finishparsearg. -% -\def\argcheckspaces#1\^^M{\argcheckspacesX#1\^^M \^^M} -\def\argcheckspacesX#1 \^^M{\argcheckspacesY#1\^^M} -\def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% - \def\temp{#3}% - \ifx\temp\empty - % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: - \let\temp\finishparsearg - \else - \let\temp\argcheckspaces - \fi - % Put the space token in: - \temp#1 #3\ArgTerm -} - -% If a _delimited_ argument is enclosed in braces, they get stripped; so -% to get _exactly_ the rest of the line, we had to prevent such situation. -% We prepended an \empty token at the very beginning and we expand it now, -% just before passing the control to \argtorun. -% (Similarly, we have to think about #3 of \argcheckspacesY above: it is -% either the null string, or it ends with \^^M---thus there is no danger -% that a pair of braces would be stripped. -% -% But first, we have to remove the trailing space token. -% -\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} - - -% \parseargdef - define a command taking an argument on the line -% -% \parseargdef\foo{...} -% is roughly equivalent to -% \def\foo{\parsearg\Xfoo} -% \def\Xfoo#1{...} -\def\parseargdef#1{% - \expandafter \doparseargdef \csname\string#1\endcsname #1% -} -\def\doparseargdef#1#2{% - \def#2{\parsearg#1}% - \def#1##1% -} - -% Several utility definitions with active space: -{ - \obeyspaces - \gdef\obeyedspace{ } - - % Make each space character in the input produce a normal interword - % space in the output. Don't allow a line break at this space, as this - % is used only in environments like @example, where each line of input - % should produce a line of output anyway. - % - \gdef\sepspaces{\obeyspaces\let =\tie} - - % If an index command is used in an @example environment, any spaces - % therein should become regular spaces in the raw index file, not the - % expansion of \tie (\leavevmode \penalty \@M \ ). - \gdef\unsepspaces{\let =\space} -} - - -\def\flushcr{\ifx\par\lisppar \def\next##1{}\else \let\next=\relax \fi \next} - -% Define the framework for environments in texinfo.tex. It's used like this: -% -% \envdef\foo{...} -% \def\Efoo{...} -% -% It's the responsibility of \envdef to insert \begingroup before the -% actual body; @end closes the group after calling \Efoo. \envdef also -% defines \thisenv, so the current environment is known; @end checks -% whether the environment name matches. The \checkenv macro can also be -% used to check whether the current environment is the one expected. -% -% Non-false conditionals (@iftex, @ifset) don't fit into this, so they -% are not treated as environments; they don't open a group. (The -% implementation of @end takes care not to call \endgroup in this -% special case.) - - -% At run-time, environments start with this: -\def\startenvironment#1{\begingroup\def\thisenv{#1}} -% initialize -\let\thisenv\empty - -% ... but they get defined via ``\envdef\foo{...}'': -\long\def\envdef#1#2{\def#1{\startenvironment#1#2}} -\def\envparseargdef#1#2{\parseargdef#1{\startenvironment#1#2}} - -% Check whether we're in the right environment: -\def\checkenv#1{% - \def\temp{#1}% - \ifx\thisenv\temp - \else - \badenverr - \fi -} - -% Environment mismatch, #1 expected: -\def\badenverr{% - \errhelp = \EMsimple - \errmessage{This command can appear only \inenvironment\temp, - not \inenvironment\thisenv}% -} -\def\inenvironment#1{% - \ifx#1\empty - outside of any environment% - \else - in environment \expandafter\string#1% - \fi -} - -% @end foo executes the definition of \Efoo. -% But first, it executes a specialized version of \checkenv -% -\parseargdef\end{% - \if 1\csname iscond.#1\endcsname - \else - % The general wording of \badenverr may not be ideal. - \expandafter\checkenv\csname#1\endcsname - \csname E#1\endcsname - \endgroup - \fi -} - -\newhelp\EMsimple{Press RETURN to continue.} - - -% Be sure we're in horizontal mode when doing a tie, since we make space -% equivalent to this in @example-like environments. Otherwise, a space -% at the beginning of a line will start with \penalty -- and -% since \penalty is valid in vertical mode, we'd end up putting the -% penalty on the vertical list instead of in the new paragraph. -{\catcode`@ = 11 - % Avoid using \@M directly, because that causes trouble - % if the definition is written into an index file. - \global\let\tiepenalty = \@M - \gdef\tie{\leavevmode\penalty\tiepenalty\ } -} - -% @: forces normal size whitespace following. -\def\:{\spacefactor=1000 } - -% @* forces a line break. -\def\*{\unskip\hfil\break\hbox{}\ignorespaces} - -% @/ allows a line break. -\let\/=\allowbreak - -% @. is an end-of-sentence period. -\def\.{.\spacefactor=\endofsentencespacefactor\space} - -% @! is an end-of-sentence bang. -\def\!{!\spacefactor=\endofsentencespacefactor\space} - -% @? is an end-of-sentence query. -\def\?{?\spacefactor=\endofsentencespacefactor\space} - -% @frenchspacing on|off says whether to put extra space after punctuation. -% -\def\onword{on} -\def\offword{off} -% -\parseargdef\frenchspacing{% - \def\temp{#1}% - \ifx\temp\onword \plainfrenchspacing - \else\ifx\temp\offword \plainnonfrenchspacing - \else - \errhelp = \EMsimple - \errmessage{Unknown @frenchspacing option `\temp', must be on|off}% - \fi\fi -} - -% @w prevents a word break. Without the \leavevmode, @w at the -% beginning of a paragraph, when TeX is still in vertical mode, would -% produce a whole line of output instead of starting the paragraph. -\def\w#1{\leavevmode\hbox{#1}} - -% @group ... @end group forces ... to be all on one page, by enclosing -% it in a TeX vbox. We use \vtop instead of \vbox to construct the box -% to keep its height that of a normal line. According to the rules for -% \topskip (p.114 of the TeXbook), the glue inserted is -% max (\topskip - \ht (first item), 0). If that height is large, -% therefore, no glue is inserted, and the space between the headline and -% the text is small, which looks bad. -% -% Another complication is that the group might be very large. This can -% cause the glue on the previous page to be unduly stretched, because it -% does not have much material. In this case, it's better to add an -% explicit \vfill so that the extra space is at the bottom. The -% threshold for doing this is if the group is more than \vfilllimit -% percent of a page (\vfilllimit can be changed inside of @tex). -% -\newbox\groupbox -\def\vfilllimit{0.7} -% -\envdef\group{% - \ifnum\catcode`\^^M=\active \else - \errhelp = \groupinvalidhelp - \errmessage{@group invalid in context where filling is enabled}% - \fi - \startsavinginserts - % - \setbox\groupbox = \vtop\bgroup - % Do @comment since we are called inside an environment such as - % @example, where each end-of-line in the input causes an - % end-of-line in the output. We don't want the end-of-line after - % the `@group' to put extra space in the output. Since @group - % should appear on a line by itself (according to the Texinfo - % manual), we don't worry about eating any user text. - \comment -} -% -% The \vtop produces a box with normal height and large depth; thus, TeX puts -% \baselineskip glue before it, and (when the next line of text is done) -% \lineskip glue after it. Thus, space below is not quite equal to space -% above. But it's pretty close. -\def\Egroup{% - % To get correct interline space between the last line of the group - % and the first line afterwards, we have to propagate \prevdepth. - \endgraf % Not \par, as it may have been set to \lisppar. - \global\dimen1 = \prevdepth - \egroup % End the \vtop. - \addgroupbox - \prevdepth = \dimen1 - \checkinserts -} - -\def\addgroupbox{ - % \dimen0 is the vertical size of the group's box. - \dimen0 = \ht\groupbox \advance\dimen0 by \dp\groupbox - % \dimen2 is how much space is left on the page (more or less). - \dimen2 = \pageheight \advance\dimen2 by -\pagetotal - % if the group doesn't fit on the current page, and it's a big big - % group, force a page break. - \ifdim \dimen0 > \dimen2 - \ifdim \pagetotal < \vfilllimit\pageheight - \page - \fi - \fi - \box\groupbox -} - -% -% TeX puts in an \escapechar (i.e., `@') at the beginning of the help -% message, so this ends up printing `@group can only ...'. -% -\newhelp\groupinvalidhelp{% -group can only be used in environments such as @example,^^J% -where each line of input produces a line of output.} - -% @need space-in-mils -% forces a page break if there is not space-in-mils remaining. - -\newdimen\mil \mil=0.001in - -\parseargdef\need{% - % Ensure vertical mode, so we don't make a big box in the middle of a - % paragraph. - \par - % - % If the @need value is less than one line space, it's useless. - \dimen0 = #1\mil - \dimen2 = \ht\strutbox - \advance\dimen2 by \dp\strutbox - \ifdim\dimen0 > \dimen2 - % - % Do a \strut just to make the height of this box be normal, so the - % normal leading is inserted relative to the preceding line. - % And a page break here is fine. - \vtop to #1\mil{\strut\vfil}% - % - % TeX does not even consider page breaks if a penalty added to the - % main vertical list is 10000 or more. But in order to see if the - % empty box we just added fits on the page, we must make it consider - % page breaks. On the other hand, we don't want to actually break the - % page after the empty box. So we use a penalty of 9999. - % - % There is an extremely small chance that TeX will actually break the - % page at this \penalty, if there are no other feasible breakpoints in - % sight. (If the user is using lots of big @group commands, which - % almost-but-not-quite fill up a page, TeX will have a hard time doing - % good page breaking, for example.) However, I could not construct an - % example where a page broke at this \penalty; if it happens in a real - % document, then we can reconsider our strategy. - \penalty9999 - % - % Back up by the size of the box, whether we did a page break or not. - \kern -#1\mil - % - % Do not allow a page break right after this kern. - \nobreak - \fi -} - -% @br forces paragraph break (and is undocumented). - -\let\br = \par - -% @page forces the start of a new page. -% -\def\page{\par\vfill\supereject} - -% @exdent text.... -% outputs text on separate line in roman font, starting at standard page margin - -% This records the amount of indent in the innermost environment. -% That's how much \exdent should take out. -\newskip\exdentamount - -% This defn is used inside fill environments such as @defun. -\parseargdef\exdent{\hfil\break\hbox{\kern -\exdentamount{\rm#1}}\hfil\break} - -% This defn is used inside nofill environments such as @example. -\parseargdef\nofillexdent{{\advance \leftskip by -\exdentamount - \leftline{\hskip\leftskip{\rm#1}}}} - -% @inmargin{WHICH}{TEXT} puts TEXT in the WHICH margin next to the current -% paragraph. For more general purposes, use the \margin insertion -% class. WHICH is `l' or `r'. Not documented, written for gawk manual. -% -\newskip\inmarginspacing \inmarginspacing=1cm -\def\strutdepth{\dp\strutbox} -% -\def\doinmargin#1#2{\strut\vadjust{% - \nobreak - \kern-\strutdepth - \vtop to \strutdepth{% - \baselineskip=\strutdepth - \vss - % if you have multiple lines of stuff to put here, you'll need to - % make the vbox yourself of the appropriate size. - \ifx#1l% - \llap{\ignorespaces #2\hskip\inmarginspacing}% - \else - \rlap{\hskip\hsize \hskip\inmarginspacing \ignorespaces #2}% - \fi - \null - }% -}} -\def\inleftmargin{\doinmargin l} -\def\inrightmargin{\doinmargin r} -% -% @inmargin{TEXT [, RIGHT-TEXT]} -% (if RIGHT-TEXT is given, use TEXT for left page, RIGHT-TEXT for right; -% else use TEXT for both). -% -\def\inmargin#1{\parseinmargin #1,,\finish} -\def\parseinmargin#1,#2,#3\finish{% not perfect, but better than nothing. - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \def\lefttext{#1}% have both texts - \def\righttext{#2}% - \else - \def\lefttext{#1}% have only one text - \def\righttext{#1}% - \fi - % - \ifodd\pageno - \def\temp{\inrightmargin\righttext}% odd page -> outside is right margin - \else - \def\temp{\inleftmargin\lefttext}% - \fi - \temp -} - -% @| inserts a changebar to the left of the current line. It should -% surround any changed text. This approach does *not* work if the -% change spans more than two lines of output. To handle that, we would -% have adopt a much more difficult approach (putting marks into the main -% vertical list for the beginning and end of each change). This command -% is not documented, not supported, and doesn't work. -% -\def\|{% - % \vadjust can only be used in horizontal mode. - \leavevmode - % - % Append this vertical mode material after the current line in the output. - \vadjust{% - % We want to insert a rule with the height and depth of the current - % leading; that is exactly what \strutbox is supposed to record. - \vskip-\baselineskip - % - % \vadjust-items are inserted at the left edge of the type. So - % the \llap here moves out into the left-hand margin. - \llap{% - % - % For a thicker or thinner bar, change the `1pt'. - \vrule height\baselineskip width1pt - % - % This is the space between the bar and the text. - \hskip 12pt - }% - }% -} - -% @include FILE -- \input text of FILE. -% -\def\include{\parseargusing\filenamecatcodes\includezzz} -\def\includezzz#1{% - \pushthisfilestack - \def\thisfile{#1}% - {% - \makevalueexpandable % we want to expand any @value in FILE. - \turnoffactive % and allow special characters in the expansion - \indexnofonts % Allow `@@' and other weird things in file names. - \wlog{texinfo.tex: doing @include of #1^^J}% - \edef\temp{\noexpand\input #1 }% - % - % This trickery is to read FILE outside of a group, in case it makes - % definitions, etc. - \expandafter - }\temp - \popthisfilestack -} -\def\filenamecatcodes{% - \catcode`\\=\other - \catcode`~=\other - \catcode`^=\other - \catcode`_=\other - \catcode`|=\other - \catcode`<=\other - \catcode`>=\other - \catcode`+=\other - \catcode`-=\other - \catcode`\`=\other - \catcode`\'=\other -} - -\def\pushthisfilestack{% - \expandafter\pushthisfilestackX\popthisfilestack\StackTerm -} -\def\pushthisfilestackX{% - \expandafter\pushthisfilestackY\thisfile\StackTerm -} -\def\pushthisfilestackY #1\StackTerm #2\StackTerm {% - \gdef\popthisfilestack{\gdef\thisfile{#1}\gdef\popthisfilestack{#2}}% -} - -\def\popthisfilestack{\errthisfilestackempty} -\def\errthisfilestackempty{\errmessage{Internal error: - the stack of filenames is empty.}} -% -\def\thisfile{} - -% @center line -% outputs that line, centered. -% -\parseargdef\center{% - \ifhmode - \let\centersub\centerH - \else - \let\centersub\centerV - \fi - \centersub{\hfil \ignorespaces#1\unskip \hfil}% - \let\centersub\relax % don't let the definition persist, just in case -} -\def\centerH#1{{% - \hfil\break - \advance\hsize by -\leftskip - \advance\hsize by -\rightskip - \line{#1}% - \break -}} -% -\newcount\centerpenalty -\def\centerV#1{% - % The idea here is the same as in \startdefun, \cartouche, etc.: if - % @center is the first thing after a section heading, we need to wipe - % out the negative parskip inserted by \sectionheading, but still - % prevent a page break here. - \centerpenalty = \lastpenalty - \ifnum\centerpenalty>10000 \vskip\parskip \fi - \ifnum\centerpenalty>9999 \penalty\centerpenalty \fi - \line{\kern\leftskip #1\kern\rightskip}% -} - -% @sp n outputs n lines of vertical space -% -\parseargdef\sp{\vskip #1\baselineskip} - -% @comment ...line which is ignored... -% @c is the same as @comment -% @ignore ... @end ignore is another way to write a comment -% -\def\comment{\begingroup \catcode`\^^M=\active% -\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other\commentxxx}% - -{\catcode`\^^M=\active% -\gdef\commentxxx#1^^M{\endgroup% -\futurelet\nexttoken\commentxxxx}% -\gdef\commentxxxx{\ifx\nexttoken\aftermacro\expandafter\comment\fi}% -} - -\def\c{\begingroup \catcode`\^^M=\active% -\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other% -\cxxx} -{\catcode`\^^M=\active \gdef\cxxx#1^^M{\endgroup}} -% See comment in \scanmacro about why the definitions of @c and @comment differ - -% @paragraphindent NCHARS -% We'll use ems for NCHARS, close enough. -% NCHARS can also be the word `asis' or `none'. -% We cannot feasibly implement @paragraphindent asis, though. -% -\def\asisword{asis} % no translation, these are keywords -\def\noneword{none} -% -\parseargdef\paragraphindent{% - \def\temp{#1}% - \ifx\temp\asisword - \else - \ifx\temp\noneword - \defaultparindent = 0pt - \else - \defaultparindent = #1em - \fi - \fi - \parindent = \defaultparindent -} - -% @exampleindent NCHARS -% We'll use ems for NCHARS like @paragraphindent. -% It seems @exampleindent asis isn't necessary, but -% I preserve it to make it similar to @paragraphindent. -\parseargdef\exampleindent{% - \def\temp{#1}% - \ifx\temp\asisword - \else - \ifx\temp\noneword - \lispnarrowing = 0pt - \else - \lispnarrowing = #1em - \fi - \fi -} - -% @firstparagraphindent WORD -% If WORD is `none', then suppress indentation of the first paragraph -% after a section heading. If WORD is `insert', then do indent at such -% paragraphs. -% -% The paragraph indentation is suppressed or not by calling -% \suppressfirstparagraphindent, which the sectioning commands do. -% We switch the definition of this back and forth according to WORD. -% By default, we suppress indentation. -% -\def\suppressfirstparagraphindent{\dosuppressfirstparagraphindent} -\def\insertword{insert} -% -\parseargdef\firstparagraphindent{% - \def\temp{#1}% - \ifx\temp\noneword - \let\suppressfirstparagraphindent = \dosuppressfirstparagraphindent - \else\ifx\temp\insertword - \let\suppressfirstparagraphindent = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @firstparagraphindent option `\temp'}% - \fi\fi -} - -% Here is how we actually suppress indentation. Redefine \everypar to -% \kern backwards by \parindent, and then reset itself to empty. -% -% We also make \indent itself not actually do anything until the next -% paragraph. -% -\gdef\dosuppressfirstparagraphindent{% - \gdef\indent {\restorefirstparagraphindent \indent}% - \gdef\noindent{\restorefirstparagraphindent \noindent}% - \global\everypar = {\kern -\parindent \restorefirstparagraphindent}% -} -% -\gdef\restorefirstparagraphindent{% - \global\let\indent = \ptexindent - \global\let\noindent = \ptexnoindent - \global\everypar = {}% -} - - -% @refill is a no-op. -\let\refill=\relax - -% @setfilename INFO-FILENAME - ignored -\let\setfilename=\comment - -% @bye. -\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} - - -\message{pdf,} -% adobe `portable' document format -\newcount\tempnum -\newcount\lnkcount -\newtoks\filename -\newcount\filenamelength -\newcount\pgn -\newtoks\toksA -\newtoks\toksB -\newtoks\toksC -\newtoks\toksD -\newbox\boxA -\newbox\boxB -\newcount\countA -\newif\ifpdf -\newif\ifpdfmakepagedest - -% when pdftex is run in dvi mode, \pdfoutput is defined (so \pdfoutput=1 -% can be set). So we test for \relax and 0 as well as being undefined. -\ifx\pdfoutput\thisisundefined -\else - \ifx\pdfoutput\relax - \else - \ifcase\pdfoutput - \else - \pdftrue - \fi - \fi -\fi - -% PDF uses PostScript string constants for the names of xref targets, -% for display in the outlines, and in other places. Thus, we have to -% double any backslashes. Otherwise, a name like "\node" will be -% interpreted as a newline (\n), followed by o, d, e. Not good. -% -% See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and -% related messages. The final outcome is that it is up to the TeX user -% to double the backslashes and otherwise make the string valid, so -% that's what we do. pdftex 1.30.0 (ca.2005) introduced a primitive to -% do this reliably, so we use it. - -% #1 is a control sequence in which to do the replacements, -% which we \xdef. -\def\txiescapepdf#1{% - \ifx\pdfescapestring\thisisundefined - % No primitive available; should we give a warning or log? - % Many times it won't matter. - \else - % The expandable \pdfescapestring primitive escapes parentheses, - % backslashes, and other special chars. - \xdef#1{\pdfescapestring{#1}}% - \fi -} - -\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images -with PDF output, and none of those formats could be found. (.eps cannot -be supported due to the design of the PDF format; use regular TeX (DVI -output) for that.)} - -\ifpdf - % - % Color manipulation macros using ideas from pdfcolor.tex, - % except using rgb instead of cmyk; the latter is said to render as a - % very dark gray on-screen and a very dark halftone in print, instead - % of actual black. The dark red here is dark enough to print on paper as - % nearly black, but still distinguishable for online viewing. We use - % black by default, though. - \def\rgbDarkRed{0.50 0.09 0.12} - \def\rgbBlack{0 0 0} - % - % rg sets the color for filling (usual text, etc.); - % RG sets the color for stroking (thin rules, e.g., normal _'s). - \def\pdfsetcolor#1{\pdfliteral{#1 rg #1 RG}} - % - % Set color, and create a mark which defines \thiscolor accordingly, - % so that \makeheadline knows which color to restore. - \def\setcolor#1{% - \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}% - \domark - \pdfsetcolor{#1}% - } - % - \def\maincolor{\rgbBlack} - \pdfsetcolor{\maincolor} - \edef\thiscolor{\maincolor} - \def\lastcolordefs{} - % - \def\makefootline{% - \baselineskip24pt - \line{\pdfsetcolor{\maincolor}\the\footline}% - } - % - \def\makeheadline{% - \vbox to 0pt{% - \vskip-22.5pt - \line{% - \vbox to8.5pt{}% - % Extract \thiscolor definition from the marks. - \getcolormarks - % Typeset the headline with \maincolor, then restore the color. - \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}% - }% - \vss - }% - \nointerlineskip - } - % - % - \pdfcatalog{/PageMode /UseOutlines} - % - % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). - \def\dopdfimage#1#2#3{% - \def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% - \def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% - % - % pdftex (and the PDF format) support .pdf, .png, .jpg (among - % others). Let's try in that order, PDF first since if - % someone has a scalable image, presumably better to use that than a - % bitmap. - \let\pdfimgext=\empty - \begingroup - \openin 1 #1.pdf \ifeof 1 - \openin 1 #1.PDF \ifeof 1 - \openin 1 #1.png \ifeof 1 - \openin 1 #1.jpg \ifeof 1 - \openin 1 #1.jpeg \ifeof 1 - \openin 1 #1.JPG \ifeof 1 - \errhelp = \nopdfimagehelp - \errmessage{Could not find image file #1 for pdf}% - \else \gdef\pdfimgext{JPG}% - \fi - \else \gdef\pdfimgext{jpeg}% - \fi - \else \gdef\pdfimgext{jpg}% - \fi - \else \gdef\pdfimgext{png}% - \fi - \else \gdef\pdfimgext{PDF}% - \fi - \else \gdef\pdfimgext{pdf}% - \fi - \closein 1 - \endgroup - % - % without \immediate, ancient pdftex seg faults when the same image is - % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.) - \ifnum\pdftexversion < 14 - \immediate\pdfimage - \else - \immediate\pdfximage - \fi - \ifdim \wd0 >0pt width \pdfimagewidth \fi - \ifdim \wd2 >0pt height \pdfimageheight \fi - \ifnum\pdftexversion<13 - #1.\pdfimgext - \else - {#1.\pdfimgext}% - \fi - \ifnum\pdftexversion < 14 \else - \pdfrefximage \pdflastximage - \fi} - % - \def\pdfmkdest#1{{% - % We have to set dummies so commands such as @code, and characters - % such as \, aren't expanded when present in a section title. - \indexnofonts - \turnoffactive - \makevalueexpandable - \def\pdfdestname{#1}% - \txiescapepdf\pdfdestname - \safewhatsit{\pdfdest name{\pdfdestname} xyz}% - }} - % - % used to mark target names; must be expandable. - \def\pdfmkpgn#1{#1} - % - % by default, use black for everything. - \def\urlcolor{\rgbBlack} - \def\linkcolor{\rgbBlack} - \def\endlink{\setcolor{\maincolor}\pdfendlink} - % - % Adding outlines to PDF; macros for calculating structure of outlines - % come from Petr Olsak - \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0% - \else \csname#1\endcsname \fi} - \def\advancenumber#1{\tempnum=\expnumber{#1}\relax - \advance\tempnum by 1 - \expandafter\xdef\csname#1\endcsname{\the\tempnum}} - % - % #1 is the section text, which is what will be displayed in the - % outline by the pdf viewer. #2 is the pdf expression for the number - % of subentries (or empty, for subsubsections). #3 is the node text, - % which might be empty if this toc entry had no corresponding node. - % #4 is the page number - % - \def\dopdfoutline#1#2#3#4{% - % Generate a link to the node text if that exists; else, use the - % page number. We could generate a destination for the section - % text in the case where a section has no node, but it doesn't - % seem worth the trouble, since most documents are normally structured. - \edef\pdfoutlinedest{#3}% - \ifx\pdfoutlinedest\empty - \def\pdfoutlinedest{#4}% - \else - \txiescapepdf\pdfoutlinedest - \fi - % - % Also escape PDF chars in the display string. - \edef\pdfoutlinetext{#1}% - \txiescapepdf\pdfoutlinetext - % - \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}% - } - % - \def\pdfmakeoutlines{% - \begingroup - % Read toc silently, to get counts of subentries for \pdfoutline. - \def\partentry##1##2##3##4{}% ignore parts in the outlines - \def\numchapentry##1##2##3##4{% - \def\thischapnum{##2}% - \def\thissecnum{0}% - \def\thissubsecnum{0}% - }% - \def\numsecentry##1##2##3##4{% - \advancenumber{chap\thischapnum}% - \def\thissecnum{##2}% - \def\thissubsecnum{0}% - }% - \def\numsubsecentry##1##2##3##4{% - \advancenumber{sec\thissecnum}% - \def\thissubsecnum{##2}% - }% - \def\numsubsubsecentry##1##2##3##4{% - \advancenumber{subsec\thissubsecnum}% - }% - \def\thischapnum{0}% - \def\thissecnum{0}% - \def\thissubsecnum{0}% - % - % use \def rather than \let here because we redefine \chapentry et - % al. a second time, below. - \def\appentry{\numchapentry}% - \def\appsecentry{\numsecentry}% - \def\appsubsecentry{\numsubsecentry}% - \def\appsubsubsecentry{\numsubsubsecentry}% - \def\unnchapentry{\numchapentry}% - \def\unnsecentry{\numsecentry}% - \def\unnsubsecentry{\numsubsecentry}% - \def\unnsubsubsecentry{\numsubsubsecentry}% - \readdatafile{toc}% - % - % Read toc second time, this time actually producing the outlines. - % The `-' means take the \expnumber as the absolute number of - % subentries, which we calculated on our first read of the .toc above. - % - % We use the node names as the destinations. - \def\numchapentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% - \def\numsecentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% - \def\numsubsecentry##1##2##3##4{% - \dopdfoutline{##1}{count-\expnumber{subsec##2}}{##3}{##4}}% - \def\numsubsubsecentry##1##2##3##4{% count is always zero - \dopdfoutline{##1}{}{##3}{##4}}% - % - % PDF outlines are displayed using system fonts, instead of - % document fonts. Therefore we cannot use special characters, - % since the encoding is unknown. For example, the eogonek from - % Latin 2 (0xea) gets translated to a | character. Info from - % Staszek Wawrykiewicz, 19 Jan 2004 04:09:24 +0100. - % - % TODO this right, we have to translate 8-bit characters to - % their "best" equivalent, based on the @documentencoding. Too - % much work for too little return. Just use the ASCII equivalents - % we use for the index sort strings. - % - \indexnofonts - \setupdatafile - % We can have normal brace characters in the PDF outlines, unlike - % Texinfo index files. So set that up. - \def\{{\lbracecharliteral}% - \def\}{\rbracecharliteral}% - \catcode`\\=\active \otherbackslash - \input \tocreadfilename - \endgroup - } - {\catcode`[=1 \catcode`]=2 - \catcode`{=\other \catcode`}=\other - \gdef\lbracecharliteral[{]% - \gdef\rbracecharliteral[}]% - ] - % - \def\skipspaces#1{\def\PP{#1}\def\D{|}% - \ifx\PP\D\let\nextsp\relax - \else\let\nextsp\skipspaces - \addtokens{\filename}{\PP}% - \advance\filenamelength by 1 - \fi - \nextsp} - \def\getfilename#1{% - \filenamelength=0 - % If we don't expand the argument now, \skipspaces will get - % snagged on things like "@value{foo}". - \edef\temp{#1}% - \expandafter\skipspaces\temp|\relax - } - \ifnum\pdftexversion < 14 - \let \startlink \pdfannotlink - \else - \let \startlink \pdfstartlink - \fi - % make a live url in pdf output. - \def\pdfurl#1{% - \begingroup - % it seems we really need yet another set of dummies; have not - % tried to figure out what each command should do in the context - % of @url. for now, just make @/ a no-op, that's the only one - % people have actually reported a problem with. - % - \normalturnoffactive - \def\@{@}% - \let\/=\empty - \makevalueexpandable - % do we want to go so far as to use \indexnofonts instead of just - % special-casing \var here? - \def\var##1{##1}% - % - \leavevmode\setcolor{\urlcolor}% - \startlink attr{/Border [0 0 0]}% - user{/Subtype /Link /A << /S /URI /URI (#1) >>}% - \endgroup} - \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} - \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} - \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} - \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}} - \def\maketoks{% - \expandafter\poptoks\the\toksA|ENDTOKS|\relax - \ifx\first0\adn0 - \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3 - \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6 - \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 - \else - \ifnum0=\countA\else\makelink\fi - \ifx\first.\let\next=\done\else - \let\next=\maketoks - \addtokens{\toksB}{\the\toksD} - \ifx\first,\addtokens{\toksB}{\space}\fi - \fi - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \next} - \def\makelink{\addtokens{\toksB}% - {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0} - \def\pdflink#1{% - \startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}} - \setcolor{\linkcolor}#1\endlink} - \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st} -\else - % non-pdf mode - \let\pdfmkdest = \gobble - \let\pdfurl = \gobble - \let\endlink = \relax - \let\setcolor = \gobble - \let\pdfsetcolor = \gobble - \let\pdfmakeoutlines = \relax -\fi % \ifx\pdfoutput - - -\message{fonts,} - -% Change the current font style to #1, remembering it in \curfontstyle. -% For now, we do not accumulate font styles: @b{@i{foo}} prints foo in -% italics, not bold italics. -% -\def\setfontstyle#1{% - \def\curfontstyle{#1}% not as a control sequence, because we are \edef'd. - \csname ten#1\endcsname % change the current font -} - -% Select #1 fonts with the current style. -% -\def\selectfonts#1{\csname #1fonts\endcsname \csname\curfontstyle\endcsname} - -\def\rm{\fam=0 \setfontstyle{rm}} -\def\it{\fam=\itfam \setfontstyle{it}} -\def\sl{\fam=\slfam \setfontstyle{sl}} -\def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} -\def\tt{\fam=\ttfam \setfontstyle{tt}} - -% Unfortunately, we have to override this for titles and the like, since -% in those cases "rm" is bold. Sigh. -\def\rmisbold{\rm\def\curfontstyle{bf}} - -% Texinfo sort of supports the sans serif font style, which plain TeX does not. -% So we set up a \sf. -\newfam\sffam -\def\sf{\fam=\sffam \setfontstyle{sf}} -\let\li = \sf % Sometimes we call it \li, not \sf. - -% We don't need math for this font style. -\def\ttsl{\setfontstyle{ttsl}} - - -% Set the baselineskip to #1, and the lineskip and strut size -% correspondingly. There is no deep meaning behind these magic numbers -% used as factors; they just match (closely enough) what Knuth defined. -% -\def\lineskipfactor{.08333} -\def\strutheightpercent{.70833} -\def\strutdepthpercent {.29167} -% -% can get a sort of poor man's double spacing by redefining this. -\def\baselinefactor{1} -% -\newdimen\textleading -\def\setleading#1{% - \dimen0 = #1\relax - \normalbaselineskip = \baselinefactor\dimen0 - \normallineskip = \lineskipfactor\normalbaselineskip - \normalbaselines - \setbox\strutbox =\hbox{% - \vrule width0pt height\strutheightpercent\baselineskip - depth \strutdepthpercent \baselineskip - }% -} - -% PDF CMaps. See also LaTeX's t1.cmap. -% -% do nothing with this by default. -\expandafter\let\csname cmapOT1\endcsname\gobble -\expandafter\let\csname cmapOT1IT\endcsname\gobble -\expandafter\let\csname cmapOT1TT\endcsname\gobble - -% if we are producing pdf, and we have \pdffontattr, then define cmaps. -% (\pdffontattr was introduced many years ago, but people still run -% older pdftex's; it's easy to conditionalize, so we do.) -\ifpdf \ifx\pdffontattr\thisisundefined \else - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1-0) -%%Title: (TeX-OT1-0 TeX OT1 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1) -/Supplement 0 ->> def -/CMapName /TeX-OT1-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -8 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<23> <26> <0023> -<28> <3B> <0028> -<3F> <5B> <003F> -<5D> <5E> <005D> -<61> <7A> <0061> -<7B> <7C> <2013> -endbfrange -40 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <00660066> -<0C> <00660069> -<0D> <0066006C> -<0E> <006600660069> -<0F> <00660066006C> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<21> <0021> -<22> <201D> -<27> <2019> -<3C> <00A1> -<3D> <003D> -<3E> <00BF> -<5C> <201C> -<5F> <02D9> -<60> <2018> -<7D> <02DD> -<7E> <007E> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -% -% \cmapOT1IT - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1IT-0) -%%Title: (TeX-OT1IT-0 TeX OT1IT 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1IT) -/Supplement 0 ->> def -/CMapName /TeX-OT1IT-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -8 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<25> <26> <0025> -<28> <3B> <0028> -<3F> <5B> <003F> -<5D> <5E> <005D> -<61> <7A> <0061> -<7B> <7C> <2013> -endbfrange -42 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <00660066> -<0C> <00660069> -<0D> <0066006C> -<0E> <006600660069> -<0F> <00660066006C> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<21> <0021> -<22> <201D> -<23> <0023> -<24> <00A3> -<27> <2019> -<3C> <00A1> -<3D> <003D> -<3E> <00BF> -<5C> <201C> -<5F> <02D9> -<60> <2018> -<7D> <02DD> -<7E> <007E> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1IT\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -% -% \cmapOT1TT - \begingroup - \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char. - \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap -%%DocumentNeededResources: ProcSet (CIDInit) -%%IncludeResource: ProcSet (CIDInit) -%%BeginResource: CMap (TeX-OT1TT-0) -%%Title: (TeX-OT1TT-0 TeX OT1TT 0) -%%Version: 1.000 -%%EndComments -/CIDInit /ProcSet findresource begin -12 dict begin -begincmap -/CIDSystemInfo -<< /Registry (TeX) -/Ordering (OT1TT) -/Supplement 0 ->> def -/CMapName /TeX-OT1TT-0 def -/CMapType 2 def -1 begincodespacerange -<00> <7F> -endcodespacerange -5 beginbfrange -<00> <01> <0393> -<09> <0A> <03A8> -<21> <26> <0021> -<28> <5F> <0028> -<61> <7E> <0061> -endbfrange -32 beginbfchar -<02> <0398> -<03> <039B> -<04> <039E> -<05> <03A0> -<06> <03A3> -<07> <03D2> -<08> <03A6> -<0B> <2191> -<0C> <2193> -<0D> <0027> -<0E> <00A1> -<0F> <00BF> -<10> <0131> -<11> <0237> -<12> <0060> -<13> <00B4> -<14> <02C7> -<15> <02D8> -<16> <00AF> -<17> <02DA> -<18> <00B8> -<19> <00DF> -<1A> <00E6> -<1B> <0153> -<1C> <00F8> -<1D> <00C6> -<1E> <0152> -<1F> <00D8> -<20> <2423> -<27> <2019> -<60> <2018> -<7F> <00A8> -endbfchar -endcmap -CMapName currentdict /CMap defineresource pop -end -end -%%EndResource -%%EOF - }\endgroup - \expandafter\edef\csname cmapOT1TT\endcsname#1{% - \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}% - }% -\fi\fi - - -% Set the font macro #1 to the font named \fontprefix#2. -% #3 is the font's design size, #4 is a scale factor, #5 is the CMap -% encoding (only OT1, OT1IT and OT1TT are allowed, or empty to omit). -% Example: -% #1 = \textrm -% #2 = \rmshape -% #3 = 10 -% #4 = \mainmagstep -% #5 = OT1 -% -\def\setfont#1#2#3#4#5{% - \font#1=\fontprefix#2#3 scaled #4 - \csname cmap#5\endcsname#1% -} -% This is what gets called when #5 of \setfont is empty. -\let\cmap\gobble -% -% (end of cmaps) - -% Use cm as the default font prefix. -% To specify the font prefix, you must define \fontprefix -% before you read in texinfo.tex. -\ifx\fontprefix\thisisundefined -\def\fontprefix{cm} -\fi -% Support font families that don't use the same naming scheme as CM. -\def\rmshape{r} -\def\rmbshape{bx} % where the normal face is bold -\def\bfshape{b} -\def\bxshape{bx} -\def\ttshape{tt} -\def\ttbshape{tt} -\def\ttslshape{sltt} -\def\itshape{ti} -\def\itbshape{bxti} -\def\slshape{sl} -\def\slbshape{bxsl} -\def\sfshape{ss} -\def\sfbshape{ss} -\def\scshape{csc} -\def\scbshape{csc} - -% Definitions for a main text size of 11pt. (The default in Texinfo.) -% -\def\definetextfontsizexi{% -% Text fonts (11.2pt, magstep1). -\def\textnominalsize{11pt} -\edef\mainmagstep{\magstephalf} -\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} -\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} -\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} -\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} -\setfont\textsl\slshape{10}{\mainmagstep}{OT1} -\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} -\setfont\textsc\scshape{10}{\mainmagstep}{OT1} -\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep -\def\textecsize{1095} - -% A few fonts for @defun names and args. -\setfont\defbf\bfshape{10}{\magstep1}{OT1} -\setfont\deftt\ttshape{10}{\magstep1}{OT1TT} -\setfont\defsl\slshape{10}{\magstep1}{OT1TT} -\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf -\let\tenttsl=\defttsl \let\tensl=\defsl \bf} - -% Fonts for indices, footnotes, small examples (9pt). -\def\smallnominalsize{9pt} -\setfont\smallrm\rmshape{9}{1000}{OT1} -\setfont\smalltt\ttshape{9}{1000}{OT1TT} -\setfont\smallbf\bfshape{10}{900}{OT1} -\setfont\smallit\itshape{9}{1000}{OT1IT} -\setfont\smallsl\slshape{9}{1000}{OT1} -\setfont\smallsf\sfshape{9}{1000}{OT1} -\setfont\smallsc\scshape{10}{900}{OT1} -\setfont\smallttsl\ttslshape{10}{900}{OT1TT} -\font\smalli=cmmi9 -\font\smallsy=cmsy9 -\def\smallecsize{0900} - -% Fonts for small examples (8pt). -\def\smallernominalsize{8pt} -\setfont\smallerrm\rmshape{8}{1000}{OT1} -\setfont\smallertt\ttshape{8}{1000}{OT1TT} -\setfont\smallerbf\bfshape{10}{800}{OT1} -\setfont\smallerit\itshape{8}{1000}{OT1IT} -\setfont\smallersl\slshape{8}{1000}{OT1} -\setfont\smallersf\sfshape{8}{1000}{OT1} -\setfont\smallersc\scshape{10}{800}{OT1} -\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} -\font\smalleri=cmmi8 -\font\smallersy=cmsy8 -\def\smallerecsize{0800} - -% Fonts for title page (20.4pt): -\def\titlenominalsize{20pt} -\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} -\setfont\titlesl\slbshape{10}{\magstep4}{OT1} -\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} -\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} -\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} -\let\titlebf=\titlerm -\setfont\titlesc\scbshape{10}{\magstep4}{OT1} -\font\titlei=cmmi12 scaled \magstep3 -\font\titlesy=cmsy10 scaled \magstep4 -\def\titleecsize{2074} - -% Chapter (and unnumbered) fonts (17.28pt). -\def\chapnominalsize{17pt} -\setfont\chaprm\rmbshape{12}{\magstep2}{OT1} -\setfont\chapit\itbshape{10}{\magstep3}{OT1IT} -\setfont\chapsl\slbshape{10}{\magstep3}{OT1} -\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT} -\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT} -\setfont\chapsf\sfbshape{17}{1000}{OT1} -\let\chapbf=\chaprm -\setfont\chapsc\scbshape{10}{\magstep3}{OT1} -\font\chapi=cmmi12 scaled \magstep2 -\font\chapsy=cmsy10 scaled \magstep3 -\def\chapecsize{1728} - -% Section fonts (14.4pt). -\def\secnominalsize{14pt} -\setfont\secrm\rmbshape{12}{\magstep1}{OT1} -\setfont\secrmnotbold\rmshape{12}{\magstep1}{OT1} -\setfont\secit\itbshape{10}{\magstep2}{OT1IT} -\setfont\secsl\slbshape{10}{\magstep2}{OT1} -\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT} -\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT} -\setfont\secsf\sfbshape{12}{\magstep1}{OT1} -\let\secbf\secrm -\setfont\secsc\scbshape{10}{\magstep2}{OT1} -\font\seci=cmmi12 scaled \magstep1 -\font\secsy=cmsy10 scaled \magstep2 -\def\sececsize{1440} - -% Subsection fonts (13.15pt). -\def\ssecnominalsize{13pt} -\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1} -\setfont\ssecit\itbshape{10}{1315}{OT1IT} -\setfont\ssecsl\slbshape{10}{1315}{OT1} -\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT} -\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT} -\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1} -\let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{1315}{OT1} -\font\sseci=cmmi12 scaled \magstephalf -\font\ssecsy=cmsy10 scaled 1315 -\def\ssececsize{1200} - -% Reduced fonts for @acro in text (10pt). -\def\reducednominalsize{10pt} -\setfont\reducedrm\rmshape{10}{1000}{OT1} -\setfont\reducedtt\ttshape{10}{1000}{OT1TT} -\setfont\reducedbf\bfshape{10}{1000}{OT1} -\setfont\reducedit\itshape{10}{1000}{OT1IT} -\setfont\reducedsl\slshape{10}{1000}{OT1} -\setfont\reducedsf\sfshape{10}{1000}{OT1} -\setfont\reducedsc\scshape{10}{1000}{OT1} -\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT} -\font\reducedi=cmmi10 -\font\reducedsy=cmsy10 -\def\reducedecsize{1000} - -\textleading = 13.2pt % line spacing for 11pt CM -\textfonts % reset the current fonts -\rm -} % end of 11pt text font size definitions, \definetextfontsizexi - - -% Definitions to make the main text be 10pt Computer Modern, with -% section, chapter, etc., sizes following suit. This is for the GNU -% Press printing of the Emacs 22 manual. Maybe other manuals in the -% future. Used with @smallbook, which sets the leading to 12pt. -% -\def\definetextfontsizex{% -% Text fonts (10pt). -\def\textnominalsize{10pt} -\edef\mainmagstep{1000} -\setfont\textrm\rmshape{10}{\mainmagstep}{OT1} -\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT} -\setfont\textbf\bfshape{10}{\mainmagstep}{OT1} -\setfont\textit\itshape{10}{\mainmagstep}{OT1IT} -\setfont\textsl\slshape{10}{\mainmagstep}{OT1} -\setfont\textsf\sfshape{10}{\mainmagstep}{OT1} -\setfont\textsc\scshape{10}{\mainmagstep}{OT1} -\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT} -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep -\def\textecsize{1000} - -% A few fonts for @defun names and args. -\setfont\defbf\bfshape{10}{\magstephalf}{OT1} -\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} -\setfont\defsl\slshape{10}{\magstephalf}{OT1TT} -\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} -\def\df{\let\tentt=\deftt \let\tenbf = \defbf -\let\tensl=\defsl \let\tenttsl=\defttsl \bf} - -% Fonts for indices, footnotes, small examples (9pt). -\def\smallnominalsize{9pt} -\setfont\smallrm\rmshape{9}{1000}{OT1} -\setfont\smalltt\ttshape{9}{1000}{OT1TT} -\setfont\smallbf\bfshape{10}{900}{OT1} -\setfont\smallit\itshape{9}{1000}{OT1IT} -\setfont\smallsl\slshape{9}{1000}{OT1} -\setfont\smallsf\sfshape{9}{1000}{OT1} -\setfont\smallsc\scshape{10}{900}{OT1} -\setfont\smallttsl\ttslshape{10}{900}{OT1TT} -\font\smalli=cmmi9 -\font\smallsy=cmsy9 -\def\smallecsize{0900} - -% Fonts for small examples (8pt). -\def\smallernominalsize{8pt} -\setfont\smallerrm\rmshape{8}{1000}{OT1} -\setfont\smallertt\ttshape{8}{1000}{OT1TT} -\setfont\smallerbf\bfshape{10}{800}{OT1} -\setfont\smallerit\itshape{8}{1000}{OT1IT} -\setfont\smallersl\slshape{8}{1000}{OT1} -\setfont\smallersf\sfshape{8}{1000}{OT1} -\setfont\smallersc\scshape{10}{800}{OT1} -\setfont\smallerttsl\ttslshape{10}{800}{OT1TT} -\font\smalleri=cmmi8 -\font\smallersy=cmsy8 -\def\smallerecsize{0800} - -% Fonts for title page (20.4pt): -\def\titlenominalsize{20pt} -\setfont\titlerm\rmbshape{12}{\magstep3}{OT1} -\setfont\titleit\itbshape{10}{\magstep4}{OT1IT} -\setfont\titlesl\slbshape{10}{\magstep4}{OT1} -\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT} -\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT} -\setfont\titlesf\sfbshape{17}{\magstep1}{OT1} -\let\titlebf=\titlerm -\setfont\titlesc\scbshape{10}{\magstep4}{OT1} -\font\titlei=cmmi12 scaled \magstep3 -\font\titlesy=cmsy10 scaled \magstep4 -\def\titleecsize{2074} - -% Chapter fonts (14.4pt). -\def\chapnominalsize{14pt} -\setfont\chaprm\rmbshape{12}{\magstep1}{OT1} -\setfont\chapit\itbshape{10}{\magstep2}{OT1IT} -\setfont\chapsl\slbshape{10}{\magstep2}{OT1} -\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT} -\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT} -\setfont\chapsf\sfbshape{12}{\magstep1}{OT1} -\let\chapbf\chaprm -\setfont\chapsc\scbshape{10}{\magstep2}{OT1} -\font\chapi=cmmi12 scaled \magstep1 -\font\chapsy=cmsy10 scaled \magstep2 -\def\chapecsize{1440} - -% Section fonts (12pt). -\def\secnominalsize{12pt} -\setfont\secrm\rmbshape{12}{1000}{OT1} -\setfont\secit\itbshape{10}{\magstep1}{OT1IT} -\setfont\secsl\slbshape{10}{\magstep1}{OT1} -\setfont\sectt\ttbshape{12}{1000}{OT1TT} -\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT} -\setfont\secsf\sfbshape{12}{1000}{OT1} -\let\secbf\secrm -\setfont\secsc\scbshape{10}{\magstep1}{OT1} -\font\seci=cmmi12 -\font\secsy=cmsy10 scaled \magstep1 -\def\sececsize{1200} - -% Subsection fonts (10pt). -\def\ssecnominalsize{10pt} -\setfont\ssecrm\rmbshape{10}{1000}{OT1} -\setfont\ssecit\itbshape{10}{1000}{OT1IT} -\setfont\ssecsl\slbshape{10}{1000}{OT1} -\setfont\ssectt\ttbshape{10}{1000}{OT1TT} -\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT} -\setfont\ssecsf\sfbshape{10}{1000}{OT1} -\let\ssecbf\ssecrm -\setfont\ssecsc\scbshape{10}{1000}{OT1} -\font\sseci=cmmi10 -\font\ssecsy=cmsy10 -\def\ssececsize{1000} - -% Reduced fonts for @acro in text (9pt). -\def\reducednominalsize{9pt} -\setfont\reducedrm\rmshape{9}{1000}{OT1} -\setfont\reducedtt\ttshape{9}{1000}{OT1TT} -\setfont\reducedbf\bfshape{10}{900}{OT1} -\setfont\reducedit\itshape{9}{1000}{OT1IT} -\setfont\reducedsl\slshape{9}{1000}{OT1} -\setfont\reducedsf\sfshape{9}{1000}{OT1} -\setfont\reducedsc\scshape{10}{900}{OT1} -\setfont\reducedttsl\ttslshape{10}{900}{OT1TT} -\font\reducedi=cmmi9 -\font\reducedsy=cmsy9 -\def\reducedecsize{0900} - -\divide\parskip by 2 % reduce space between paragraphs -\textleading = 12pt % line spacing for 10pt CM -\textfonts % reset the current fonts -\rm -} % end of 10pt text font size definitions, \definetextfontsizex - - -% We provide the user-level command -% @fonttextsize 10 -% (or 11) to redefine the text font size. pt is assumed. -% -\def\xiword{11} -\def\xword{10} -\def\xwordpt{10pt} -% -\parseargdef\fonttextsize{% - \def\textsizearg{#1}% - %\wlog{doing @fonttextsize \textsizearg}% - % - % Set \globaldefs so that documents can use this inside @tex, since - % makeinfo 4.8 does not support it, but we need it nonetheless. - % - \begingroup \globaldefs=1 - \ifx\textsizearg\xword \definetextfontsizex - \else \ifx\textsizearg\xiword \definetextfontsizexi - \else - \errhelp=\EMsimple - \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'} - \fi\fi - \endgroup -} - -% In order for the font changes to affect most math symbols and letters, -% we have to define the \textfont of the standard families. We don't -% bother to reset \scriptfont and \scriptscriptfont; awaiting user need. -% -\def\resetmathfonts{% - \textfont0=\tenrm \textfont1=\teni \textfont2=\tensy - \textfont\itfam=\tenit \textfont\slfam=\tensl \textfont\bffam=\tenbf - \textfont\ttfam=\tentt \textfont\sffam=\tensf -} - -% The font-changing commands redefine the meanings of \tenSTYLE, instead -% of just \STYLE. We do this because \STYLE needs to also set the -% current \fam for math mode. Our \STYLE (e.g., \rm) commands hardwire -% \tenSTYLE to set the current font. -% -% Each font-changing command also sets the names \lsize (one size lower) -% and \lllsize (three sizes lower). These relative commands are used -% in, e.g., the LaTeX logo and acronyms. -% -% This all needs generalizing, badly. -% -\def\textfonts{% - \let\tenrm=\textrm \let\tenit=\textit \let\tensl=\textsl - \let\tenbf=\textbf \let\tentt=\texttt \let\smallcaps=\textsc - \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy - \let\tenttsl=\textttsl - \def\curfontsize{text}% - \def\lsize{reduced}\def\lllsize{smaller}% - \resetmathfonts \setleading{\textleading}} -\def\titlefonts{% - \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl - \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc - \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy - \let\tenttsl=\titlettsl - \def\curfontsize{title}% - \def\lsize{chap}\def\lllsize{subsec}% - \resetmathfonts \setleading{27pt}} -\def\titlefont#1{{\titlefonts\rmisbold #1}} -\def\chapfonts{% - \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl - \let\tenbf=\chapbf \let\tentt=\chaptt \let\smallcaps=\chapsc - \let\tensf=\chapsf \let\teni=\chapi \let\tensy=\chapsy - \let\tenttsl=\chapttsl - \def\curfontsize{chap}% - \def\lsize{sec}\def\lllsize{text}% - \resetmathfonts \setleading{19pt}} -\def\secfonts{% - \let\tenrm=\secrm \let\tenit=\secit \let\tensl=\secsl - \let\tenbf=\secbf \let\tentt=\sectt \let\smallcaps=\secsc - \let\tensf=\secsf \let\teni=\seci \let\tensy=\secsy - \let\tenttsl=\secttsl - \def\curfontsize{sec}% - \def\lsize{subsec}\def\lllsize{reduced}% - \resetmathfonts \setleading{17pt}} -\def\subsecfonts{% - \let\tenrm=\ssecrm \let\tenit=\ssecit \let\tensl=\ssecsl - \let\tenbf=\ssecbf \let\tentt=\ssectt \let\smallcaps=\ssecsc - \let\tensf=\ssecsf \let\teni=\sseci \let\tensy=\ssecsy - \let\tenttsl=\ssecttsl - \def\curfontsize{ssec}% - \def\lsize{text}\def\lllsize{small}% - \resetmathfonts \setleading{15pt}} -\let\subsubsecfonts = \subsecfonts -\def\reducedfonts{% - \let\tenrm=\reducedrm \let\tenit=\reducedit \let\tensl=\reducedsl - \let\tenbf=\reducedbf \let\tentt=\reducedtt \let\reducedcaps=\reducedsc - \let\tensf=\reducedsf \let\teni=\reducedi \let\tensy=\reducedsy - \let\tenttsl=\reducedttsl - \def\curfontsize{reduced}% - \def\lsize{small}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallfonts{% - \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl - \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc - \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy - \let\tenttsl=\smallttsl - \def\curfontsize{small}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{10.5pt}} -\def\smallerfonts{% - \let\tenrm=\smallerrm \let\tenit=\smallerit \let\tensl=\smallersl - \let\tenbf=\smallerbf \let\tentt=\smallertt \let\smallcaps=\smallersc - \let\tensf=\smallersf \let\teni=\smalleri \let\tensy=\smallersy - \let\tenttsl=\smallerttsl - \def\curfontsize{smaller}% - \def\lsize{smaller}\def\lllsize{smaller}% - \resetmathfonts \setleading{9.5pt}} - -% Fonts for short table of contents. -\setfont\shortcontrm\rmshape{12}{1000}{OT1} -\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12 -\setfont\shortcontsl\slshape{12}{1000}{OT1} -\setfont\shortconttt\ttshape{12}{1000}{OT1TT} - -% Define these just so they can be easily changed for other fonts. -\def\angleleft{$\langle$} -\def\angleright{$\rangle$} - -% Set the fonts to use with the @small... environments. -\let\smallexamplefonts = \smallfonts - -% About \smallexamplefonts. If we use \smallfonts (9pt), @smallexample -% can fit this many characters: -% 8.5x11=86 smallbook=72 a4=90 a5=69 -% If we use \scriptfonts (8pt), then we can fit this many characters: -% 8.5x11=90+ smallbook=80 a4=90+ a5=77 -% For me, subjectively, the few extra characters that fit aren't worth -% the additional smallness of 8pt. So I'm making the default 9pt. -% -% By the way, for comparison, here's what fits with @example (10pt): -% 8.5x11=71 smallbook=60 a4=75 a5=58 -% --karl, 24jan03. - -% Set up the default fonts, so we can use them for creating boxes. -% -\definetextfontsizexi - - -\message{markup,} - -% Check if we are currently using a typewriter font. Since all the -% Computer Modern typewriter fonts have zero interword stretch (and -% shrink), and it is reasonable to expect all typewriter fonts to have -% this property, we can check that font parameter. -% -\def\ifmonospace{\ifdim\fontdimen3\font=0pt } - -% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will -% define and register \INITMACRO to be called on markup style changes. -% \INITMACRO can check \currentmarkupstyle for the innermost -% style and the set of \ifmarkupSTYLE switches for all styles -% currently in effect. -\newif\ifmarkupvar -\newif\ifmarkupsamp -\newif\ifmarkupkey -%\newif\ifmarkupfile % @file == @samp. -%\newif\ifmarkupoption % @option == @samp. -\newif\ifmarkupcode -\newif\ifmarkupkbd -%\newif\ifmarkupenv % @env == @code. -%\newif\ifmarkupcommand % @command == @code. -\newif\ifmarkuptex % @tex (and part of @math, for now). -\newif\ifmarkupexample -\newif\ifmarkupverb -\newif\ifmarkupverbatim - -\let\currentmarkupstyle\empty - -\def\setupmarkupstyle#1{% - \csname markup#1true\endcsname - \def\currentmarkupstyle{#1}% - \markupstylesetup -} - -\let\markupstylesetup\empty - -\def\defmarkupstylesetup#1{% - \expandafter\def\expandafter\markupstylesetup - \expandafter{\markupstylesetup #1}% - \def#1% -} - -% Markup style setup for left and right quotes. -\defmarkupstylesetup\markupsetuplq{% - \expandafter\let\expandafter \temp - \csname markupsetuplq\currentmarkupstyle\endcsname - \ifx\temp\relax \markupsetuplqdefault \else \temp \fi -} - -\defmarkupstylesetup\markupsetuprq{% - \expandafter\let\expandafter \temp - \csname markupsetuprq\currentmarkupstyle\endcsname - \ifx\temp\relax \markupsetuprqdefault \else \temp \fi -} - -{ -\catcode`\'=\active -\catcode`\`=\active - -\gdef\markupsetuplqdefault{\let`\lq} -\gdef\markupsetuprqdefault{\let'\rq} - -\gdef\markupsetcodequoteleft{\let`\codequoteleft} -\gdef\markupsetcodequoteright{\let'\codequoteright} -} - -\let\markupsetuplqcode \markupsetcodequoteleft -\let\markupsetuprqcode \markupsetcodequoteright -% -\let\markupsetuplqexample \markupsetcodequoteleft -\let\markupsetuprqexample \markupsetcodequoteright -% -\let\markupsetuplqkbd \markupsetcodequoteleft -\let\markupsetuprqkbd \markupsetcodequoteright -% -\let\markupsetuplqsamp \markupsetcodequoteleft -\let\markupsetuprqsamp \markupsetcodequoteright -% -\let\markupsetuplqverb \markupsetcodequoteleft -\let\markupsetuprqverb \markupsetcodequoteright -% -\let\markupsetuplqverbatim \markupsetcodequoteleft -\let\markupsetuprqverbatim \markupsetcodequoteright - -% Allow an option to not use regular directed right quote/apostrophe -% (char 0x27), but instead the undirected quote from cmtt (char 0x0d). -% The undirected quote is ugly, so don't make it the default, but it -% works for pasting with more pdf viewers (at least evince), the -% lilypond developers report. xpdf does work with the regular 0x27. -% -\def\codequoteright{% - \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax - \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax - '% - \else \char'15 \fi - \else \char'15 \fi -} -% -% and a similar option for the left quote char vs. a grave accent. -% Modern fonts display ASCII 0x60 as a grave accent, so some people like -% the code environments to do likewise. -% -\def\codequoteleft{% - \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax - \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax - % [Knuth] pp. 380,381,391 - % \relax disables Spanish ligatures ?` and !` of \tt font. - \relax`% - \else \char'22 \fi - \else \char'22 \fi -} - -% Commands to set the quote options. -% -\parseargdef\codequoteundirected{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxicodequoteundirected\endcsname - = t% - \else\ifx\temp\offword - \expandafter\let\csname SETtxicodequoteundirected\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @codequoteundirected value `\temp', must be on|off}% - \fi\fi -} -% -\parseargdef\codequotebacktick{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxicodequotebacktick\endcsname - = t% - \else\ifx\temp\offword - \expandafter\let\csname SETtxicodequotebacktick\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @codequotebacktick value `\temp', must be on|off}% - \fi\fi -} - -% [Knuth] pp. 380,381,391, disable Spanish ligatures ?` and !` of \tt font. -\def\noligaturesquoteleft{\relax\lq} - -% Count depth in font-changes, for error checks -\newcount\fontdepth \fontdepth=0 - -% Font commands. - -% #1 is the font command (\sl or \it), #2 is the text to slant. -% If we are in a monospaced environment, however, 1) always use \ttsl, -% and 2) do not add an italic correction. -\def\dosmartslant#1#2{% - \ifusingtt - {{\ttsl #2}\let\next=\relax}% - {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% - \next -} -\def\smartslanted{\dosmartslant\sl} -\def\smartitalic{\dosmartslant\it} - -% Output an italic correction unless \next (presumed to be the following -% character) is such as not to need one. -\def\smartitaliccorrection{% - \ifx\next,% - \else\ifx\next-% - \else\ifx\next.% - \else\ifx\next\.% - \else\ifx\next\comma% - \else\ptexslash - \fi\fi\fi\fi\fi - \aftersmartic -} - -% Unconditional use \ttsl, and no ic. @var is set to this for defuns. -\def\ttslanted#1{{\ttsl #1}} - -% @cite is like \smartslanted except unconditionally use \sl. We never want -% ttsl for book titles, do we? -\def\cite#1{{\sl #1}\futurelet\next\smartitaliccorrection} - -\def\aftersmartic{} -\def\var#1{% - \let\saveaftersmartic = \aftersmartic - \def\aftersmartic{\null\let\aftersmartic=\saveaftersmartic}% - \smartslanted{#1}% -} - -\let\i=\smartitalic -\let\slanted=\smartslanted -\let\dfn=\smartslanted -\let\emph=\smartitalic - -% Explicit font changes: @r, @sc, undocumented @ii. -\def\r#1{{\rm #1}} % roman font -\def\sc#1{{\smallcaps#1}} % smallcaps font -\def\ii#1{{\it #1}} % italic font - -% @b, explicit bold. Also @strong. -\def\b#1{{\bf #1}} -\let\strong=\b - -% @sansserif, explicit sans. -\def\sansserif#1{{\sf #1}} - -% We can't just use \exhyphenpenalty, because that only has effect at -% the end of a paragraph. Restore normal hyphenation at the end of the -% group within which \nohyphenation is presumably called. -% -\def\nohyphenation{\hyphenchar\font = -1 \aftergroup\restorehyphenation} -\def\restorehyphenation{\hyphenchar\font = `- } - -% Set sfcode to normal for the chars that usually have another value. -% Can't use plain's \frenchspacing because it uses the `\x notation, and -% sometimes \x has an active definition that messes things up. -% -\catcode`@=11 - \def\plainfrenchspacing{% - \sfcode`\.=\@m \sfcode`\?=\@m \sfcode`\!=\@m - \sfcode`\:=\@m \sfcode`\;=\@m \sfcode`\,=\@m - \def\endofsentencespacefactor{1000}% for @. and friends - } - \def\plainnonfrenchspacing{% - \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000 - \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250 - \def\endofsentencespacefactor{3000}% for @. and friends - } -\catcode`@=\other -\def\endofsentencespacefactor{3000}% default - -% @t, explicit typewriter. -\def\t#1{% - {\tt \rawbackslash \plainfrenchspacing #1}% - \null -} - -% @samp. -\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} - -% @indicateurl is \samp, that is, with quotes. -\let\indicateurl=\samp - -% @code (and similar) prints in typewriter, but with spaces the same -% size as normal in the surrounding text, without hyphenation, etc. -% This is a subroutine for that. -\def\tclose#1{% - {% - % Change normal interword space to be same as for the current font. - \spaceskip = \fontdimen2\font - % - % Switch to typewriter. - \tt - % - % But `\ ' produces the large typewriter interword space. - \def\ {{\spaceskip = 0pt{} }}% - % - % Turn off hyphenation. - \nohyphenation - % - \rawbackslash - \plainfrenchspacing - #1% - }% - \null % reset spacefactor to 1000 -} - -% We *must* turn on hyphenation at `-' and `_' in @code. -% (But see \codedashfinish below.) -% Otherwise, it is too hard to avoid overfull hboxes -% in the Emacs manual, the Library manual, etc. -% -% Unfortunately, TeX uses one parameter (\hyphenchar) to control -% both hyphenation at - and hyphenation within words. -% We must therefore turn them both off (\tclose does that) -% and arrange explicitly to hyphenate at a dash. -- rms. -{ - \catcode`\-=\active \catcode`\_=\active - \catcode`\'=\active \catcode`\`=\active - \global\let'=\rq \global\let`=\lq % default definitions - % - \global\def\code{\begingroup - \setupmarkupstyle{code}% - % The following should really be moved into \setupmarkupstyle handlers. - \catcode\dashChar=\active \catcode\underChar=\active - \ifallowcodebreaks - \let-\codedash - \let_\codeunder - \else - \let-\normaldash - \let_\realunder - \fi - % Given -foo (with a single dash), we do not want to allow a break - % after the hyphen. - \global\let\codedashprev=\codedash - % - \codex - } - % - \gdef\codedash{\futurelet\next\codedashfinish} - \gdef\codedashfinish{% - \normaldash % always output the dash character itself. - % - % Now, output a discretionary to allow a line break, unless - % (a) the next character is a -, or - % (b) the preceding character is a -. - % E.g., given --posix, we do not want to allow a break after either -. - % Given --foo-bar, we do want to allow a break between the - and the b. - \ifx\next\codedash \else - \ifx\codedashprev\codedash - \else \discretionary{}{}{}\fi - \fi - % we need the space after the = for the case when \next itself is a - % space token; it would get swallowed otherwise. As in @code{- a}. - \global\let\codedashprev= \next - } -} -\def\normaldash{-} -% -\def\codex #1{\tclose{#1}\endgroup} - -\def\codeunder{% - % this is all so @math{@code{var_name}+1} can work. In math mode, _ - % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) - % will therefore expand the active definition of _, which is us - % (inside @code that is), therefore an endless loop. - \ifusingtt{\ifmmode - \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_. - \else\normalunderscore \fi - \discretionary{}{}{}}% - {\_}% -} - -% An additional complication: the above will allow breaks after, e.g., -% each of the four underscores in __typeof__. This is bad. -% @allowcodebreaks provides a document-level way to turn breaking at - -% and _ on and off. -% -\newif\ifallowcodebreaks \allowcodebreakstrue - -\def\keywordtrue{true} -\def\keywordfalse{false} - -\parseargdef\allowcodebreaks{% - \def\txiarg{#1}% - \ifx\txiarg\keywordtrue - \allowcodebreakstrue - \else\ifx\txiarg\keywordfalse - \allowcodebreaksfalse - \else - \errhelp = \EMsimple - \errmessage{Unknown @allowcodebreaks option `\txiarg', must be true|false}% - \fi\fi -} - -% For @command, @env, @file, @option quotes seem unnecessary, -% so use \code rather than \samp. -\let\command=\code -\let\env=\code -\let\file=\code -\let\option=\code - -% @uref (abbreviation for `urlref') aka @url takes an optional -% (comma-separated) second argument specifying the text to display and -% an optional third arg as text to display instead of (rather than in -% addition to) the url itself. First (mandatory) arg is the url. - -% TeX-only option to allow changing PDF output to show only the second -% arg (if given), and not the url (which is then just the link target). -\newif\ifurefurlonlylink - -% The main macro is \urefbreak, which allows breaking at expected -% places within the url. (There used to be another version, which -% didn't support automatic breaking.) -\def\urefbreak{\begingroup \urefcatcodes \dourefbreak} -\let\uref=\urefbreak -% -\def\dourefbreak#1{\urefbreakfinish #1,,,\finish} -\def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example - \unsepspaces - \pdfurl{#1}% - \setbox0 = \hbox{\ignorespaces #3}% - \ifdim\wd0 > 0pt - \unhbox0 % third arg given, show only that - \else - \setbox0 = \hbox{\ignorespaces #2}% look for second arg - \ifdim\wd0 > 0pt - \ifpdf - \ifurefurlonlylink - % PDF plus option to not display url, show just arg - \unhbox0 - \else - % PDF, normally display both arg and url for consistency, - % visibility, if the pdf is eventually used to print, etc. - \unhbox0\ (\urefcode{#1})% - \fi - \else - \unhbox0\ (\urefcode{#1})% DVI, always show arg and url - \fi - \else - \urefcode{#1}% only url given, so show it - \fi - \fi - \endlink -\endgroup} - -% Allow line breaks around only a few characters (only). -\def\urefcatcodes{% - \catcode`\&=\active \catcode`\.=\active - \catcode`\#=\active \catcode`\?=\active - \catcode`\/=\active -} -{ - \urefcatcodes - % - \global\def\urefcode{\begingroup - \setupmarkupstyle{code}% - \urefcatcodes - \let&\urefcodeamp - \let.\urefcodedot - \let#\urefcodehash - \let?\urefcodequest - \let/\urefcodeslash - \codex - } - % - % By default, they are just regular characters. - \global\def&{\normalamp} - \global\def.{\normaldot} - \global\def#{\normalhash} - \global\def?{\normalquest} - \global\def/{\normalslash} -} - -% we put a little stretch before and after the breakable chars, to help -% line breaking of long url's. The unequal skips make look better in -% cmtt at least, especially for dots. -\def\urefprestretchamount{.13em} -\def\urefpoststretchamount{.1em} -\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax} -\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax} -% -\def\urefcodeamp{\urefprestretch \&\urefpoststretch} -\def\urefcodedot{\urefprestretch .\urefpoststretch} -\def\urefcodehash{\urefprestretch \#\urefpoststretch} -\def\urefcodequest{\urefprestretch ?\urefpoststretch} -\def\urefcodeslash{\futurelet\next\urefcodeslashfinish} -{ - \catcode`\/=\active - \global\def\urefcodeslashfinish{% - \urefprestretch \slashChar - % Allow line break only after the final / in a sequence of - % slashes, to avoid line break between the slashes in http://. - \ifx\next/\else \urefpoststretch \fi - } -} - -% One more complication: by default we'll break after the special -% characters, but some people like to break before the special chars, so -% allow that. Also allow no breaking at all, for manual control. -% -\parseargdef\urefbreakstyle{% - \def\txiarg{#1}% - \ifx\txiarg\wordnone - \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} - \else\ifx\txiarg\wordbefore - \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} - \else\ifx\txiarg\wordafter - \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} - \else - \errhelp = \EMsimple - \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% - \fi\fi\fi -} -\def\wordafter{after} -\def\wordbefore{before} -\def\wordnone{none} - -\urefbreakstyle after - -% @url synonym for @uref, since that's how everyone uses it. -% -\let\url=\uref - -% rms does not like angle brackets --karl, 17may97. -% So now @email is just like @uref, unless we are pdf. -% -%\def\email#1{\angleleft{\tt #1}\angleright} -\ifpdf - \def\email#1{\doemail#1,,\finish} - \def\doemail#1,#2,#3\finish{\begingroup - \unsepspaces - \pdfurl{mailto:#1}% - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi - \endlink - \endgroup} -\else - \let\email=\uref -\fi - -% @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), -% `example' (@kbd uses ttsl only inside of @example and friends), -% or `code' (@kbd uses normal tty font always). -\parseargdef\kbdinputstyle{% - \def\txiarg{#1}% - \ifx\txiarg\worddistinct - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}% - \else\ifx\txiarg\wordexample - \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}% - \else\ifx\txiarg\wordcode - \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}% - \else - \errhelp = \EMsimple - \errmessage{Unknown @kbdinputstyle setting `\txiarg'}% - \fi\fi\fi -} -\def\worddistinct{distinct} -\def\wordexample{example} -\def\wordcode{code} - -% Default is `distinct'. -\kbdinputstyle distinct - -% @kbd is like @code, except that if the argument is just one @key command, -% then @kbd has no effect. -\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}} - -\def\xkey{\key} -\def\kbdsub#1#2#3\par{% - \def\one{#1}\def\three{#3}\def\threex{??}% - \ifx\one\xkey\ifx\threex\three \key{#2}% - \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi - \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi -} - -% definition of @key that produces a lozenge. Doesn't adjust to text size. -%\setfont\keyrm\rmshape{8}{1000}{OT1} -%\font\keysy=cmsy9 -%\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{% -% \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{% -% \vbox{\hrule\kern-0.4pt -% \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% -% \kern-0.4pt\hrule}% -% \kern-.06em\raise0.4pt\hbox{\angleright}}}} - -% definition of @key with no lozenge. If the current font is already -% monospace, don't change it; that way, we respect @kbdinputstyle. But -% if it isn't monospace, then use \tt. -% -\def\key#1{{\setupmarkupstyle{key}% - \nohyphenation - \ifmonospace\else\tt\fi - #1}\null} - -% @clicksequence{File @click{} Open ...} -\def\clicksequence#1{\begingroup #1\endgroup} - -% @clickstyle @arrow (by default) -\parseargdef\clickstyle{\def\click{#1}} -\def\click{\arrow} - -% Typeset a dimension, e.g., `in' or `pt'. The only reason for the -% argument is to make the input look right: @dmn{pt} instead of @dmn{}pt. -% -\def\dmn#1{\thinspace #1} - -% @acronym for "FBI", "NATO", and the like. -% We print this one point size smaller, since it's intended for -% all-uppercase. -% -\def\acronym#1{\doacronym #1,,\finish} -\def\doacronym#1,#2,#3\finish{% - {\selectfonts\lsize #1}% - \def\temp{#2}% - \ifx\temp\empty \else - \space ({\unsepspaces \ignorespaces \temp \unskip})% - \fi - \null % reset \spacefactor=1000 -} - -% @abbr for "Comput. J." and the like. -% No font change, but don't do end-of-sentence spacing. -% -\def\abbr#1{\doabbr #1,,\finish} -\def\doabbr#1,#2,#3\finish{% - {\plainfrenchspacing #1}% - \def\temp{#2}% - \ifx\temp\empty \else - \space ({\unsepspaces \ignorespaces \temp \unskip})% - \fi - \null % reset \spacefactor=1000 -} - -% @asis just yields its argument. Used with @table, for example. -% -\def\asis#1{#1} - -% @math outputs its argument in math mode. -% -% One complication: _ usually means subscripts, but it could also mean -% an actual _ character, as in @math{@var{some_variable} + 1}. So make -% _ active, and distinguish by seeing if the current family is \slfam, -% which is what @var uses. -{ - \catcode`\_ = \active - \gdef\mathunderscore{% - \catcode`\_=\active - \def_{\ifnum\fam=\slfam \_\else\sb\fi}% - } -} -% Another complication: we want \\ (and @\) to output a math (or tt) \. -% FYI, plain.tex uses \\ as a temporary control sequence (for no -% particular reason), but this is not advertised and we don't care. -% -% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. -\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} -% -\def\math{% - \ifmmode\else % only go into math if not in math mode already - \tex - \mathunderscore - \let\\ = \mathbackslash - \mathactive - % make the texinfo accent commands work in math mode - \let\"=\ddot - \let\'=\acute - \let\==\bar - \let\^=\hat - \let\`=\grave - \let\u=\breve - \let\v=\check - \let\~=\tilde - \let\dotaccent=\dot - % have to provide another name for sup operator - \let\mathopsup=\sup - $\expandafter\finishmath\fi -} -\def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. - -% Some active characters (such as <) are spaced differently in math. -% We have to reset their definitions in case the @math was an argument -% to a command which sets the catcodes (such as @item or @section). -% -{ - \catcode`^ = \active - \catcode`< = \active - \catcode`> = \active - \catcode`+ = \active - \catcode`' = \active - \gdef\mathactive{% - \let^ = \ptexhat - \let< = \ptexless - \let> = \ptexgtr - \let+ = \ptexplus - \let' = \ptexquoteright - } -} - -% for @sub and @sup, if in math mode, just do a normal sub/superscript. -% If in text, use math to place as sub/superscript, but switch -% into text mode, with smaller fonts. This is a different font than the -% one used for real math sub/superscripts (8pt vs. 7pt), but let's not -% fix it (significant additions to font machinery) until someone notices. -% -\def\sub{\ifmmode \expandafter\sb \else \expandafter\finishsub\fi} -\def\finishsub#1{$\sb{\hbox{\selectfonts\lllsize #1}}$}% -% -\def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi} -\def\finishsup#1{$\ptexsp{\hbox{\selectfonts\lllsize #1}}$}% - -% @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. -% Ignore unless FMTNAME == tex; then it is like @iftex and @tex, -% except specified as a normal braced arg, so no newlines to worry about. -% -\def\outfmtnametex{tex} -% -\long\def\inlinefmt#1{\doinlinefmt #1,\finish} -\long\def\doinlinefmt#1,#2,\finish{% - \def\inlinefmtname{#1}% - \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi -} -% -% @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if -% FMTNAME is tex, else ELSE-TEXT. -\long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish} -\long\def\doinlinefmtifelse#1,#2,#3,#4,\finish{% - \def\inlinefmtname{#1}% - \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\else \ignorespaces #3\fi -} -% -% For raw, must switch into @tex before parsing the argument, to avoid -% setting catcodes prematurely. Doing it this way means that, for -% example, @inlineraw{html, foo{bar} gets a parse error instead of being -% ignored. But this isn't important because if people want a literal -% *right* brace they would have to use a command anyway, so they may as -% well use a command to get a left brace too. We could re-use the -% delimiter character idea from \verb, but it seems like overkill. -% -\long\def\inlineraw{\tex \doinlineraw} -\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} -\def\doinlinerawtwo#1,#2,\finish{% - \def\inlinerawname{#1}% - \ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi - \endgroup % close group opened by \tex. -} - -% @inlineifset{VAR, TEXT} expands TEXT if VAR is @set. -% -\long\def\inlineifset#1{\doinlineifset #1,\finish} -\long\def\doinlineifset#1,#2,\finish{% - \def\inlinevarname{#1}% - \expandafter\ifx\csname SET\inlinevarname\endcsname\relax - \else\ignorespaces#2\fi -} - -% @inlineifclear{VAR, TEXT} expands TEXT if VAR is not @set. -% -\long\def\inlineifclear#1{\doinlineifclear #1,\finish} -\long\def\doinlineifclear#1,#2,\finish{% - \def\inlinevarname{#1}% - \expandafter\ifx\csname SET\inlinevarname\endcsname\relax \ignorespaces#2\fi -} - - -\message{glyphs,} -% and logos. - -% @@ prints an @, as does @atchar{}. -\def\@{\char64 } -\let\atchar=\@ - -% @{ @} @lbracechar{} @rbracechar{} all generate brace characters. -% Unless we're in typewriter, use \ecfont because the CM text fonts do -% not have braces, and we don't want to switch into math. -\def\mylbrace{{\ifmonospace\else\ecfont\fi \char123}} -\def\myrbrace{{\ifmonospace\else\ecfont\fi \char125}} -\let\{=\mylbrace \let\lbracechar=\{ -\let\}=\myrbrace \let\rbracechar=\} -\begingroup - % Definitions to produce \{ and \} commands for indices, - % and @{ and @} for the aux/toc files. - \catcode`\{ = \other \catcode`\} = \other - \catcode`\[ = 1 \catcode`\] = 2 - \catcode`\! = 0 \catcode`\\ = \other - !gdef!lbracecmd[\{]% - !gdef!rbracecmd[\}]% - !gdef!lbraceatcmd[@{]% - !gdef!rbraceatcmd[@}]% -!endgroup - -% @comma{} to avoid , parsing problems. -\let\comma = , - -% Accents: @, @dotaccent @ringaccent @ubaraccent @udotaccent -% Others are defined by plain TeX: @` @' @" @^ @~ @= @u @v @H. -\let\, = \ptexc -\let\dotaccent = \ptexdot -\def\ringaccent#1{{\accent23 #1}} -\let\tieaccent = \ptext -\let\ubaraccent = \ptexb -\let\udotaccent = \d - -% Other special characters: @questiondown @exclamdown @ordf @ordm -% Plain TeX defines: @AA @AE @O @OE @L (plus lowercase versions) @ss. -\def\questiondown{?`} -\def\exclamdown{!`} -\def\ordf{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{a}}} -\def\ordm{\leavevmode\raise1ex\hbox{\selectfonts\lllsize \underbar{o}}} - -% Dotless i and dotless j, used for accents. -\def\imacro{i} -\def\jmacro{j} -\def\dotless#1{% - \def\temp{#1}% - \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi - \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi - \else \errmessage{@dotless can be used only with i or j}% - \fi\fi -} - -% The \TeX{} logo, as in plain, but resetting the spacing so that a -% period following counts as ending a sentence. (Idea found in latex.) -% -\edef\TeX{\TeX \spacefactor=1000 } - -% @LaTeX{} logo. Not quite the same results as the definition in -% latex.ltx, since we use a different font for the raised A; it's most -% convenient for us to use an explicitly smaller font, rather than using -% the \scriptstyle font (since we don't reset \scriptstyle and -% \scriptscriptstyle). -% -\def\LaTeX{% - L\kern-.36em - {\setbox0=\hbox{T}% - \vbox to \ht0{\hbox{% - \ifx\textnominalsize\xwordpt - % for 10pt running text, \lllsize (8pt) is too small for the A in LaTeX. - % Revert to plain's \scriptsize, which is 7pt. - \count255=\the\fam $\fam\count255 \scriptstyle A$% - \else - % For 11pt, we can use our lllsize. - \selectfonts\lllsize A% - \fi - }% - \vss - }}% - \kern-.15em - \TeX -} - -% Some math mode symbols. Define \ensuremath to switch into math mode -% unless we are already there. Expansion tricks may not be needed here, -% but safer, and can't hurt. -\def\ensuremath{\ifmmode \expandafter\asis \else\expandafter\ensuredmath \fi} -\def\ensuredmath#1{$\relax#1$} -% -\def\bullet{\ensuremath\ptexbullet} -\def\geq{\ensuremath\ge} -\def\leq{\ensuremath\le} -\def\minus{\ensuremath-} - -% @dots{} outputs an ellipsis using the current font. -% We do .5em per period so that it has the same spacing in the cm -% typewriter fonts as three actual period characters; on the other hand, -% in other typewriter fonts three periods are wider than 1.5em. So do -% whichever is larger. -% -\def\dots{% - \leavevmode - \setbox0=\hbox{...}% get width of three periods - \ifdim\wd0 > 1.5em - \dimen0 = \wd0 - \else - \dimen0 = 1.5em - \fi - \hbox to \dimen0{% - \hskip 0pt plus.25fil - .\hskip 0pt plus1fil - .\hskip 0pt plus1fil - .\hskip 0pt plus.5fil - }% -} - -% @enddots{} is an end-of-sentence ellipsis. -% -\def\enddots{% - \dots - \spacefactor=\endofsentencespacefactor -} - -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. -% -% Since these characters are used in examples, they should be an even number of -% \tt widths. Each \tt character is 1en, so two makes it 1em. -% -\def\point{$\star$} -\def\arrow{\leavevmode\raise.05ex\hbox to 1em{\hfil$\rightarrow$\hfil}} -\def\result{\leavevmode\raise.05ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} -\def\expansion{\leavevmode\hbox to 1em{\hfil$\mapsto$\hfil}} -\def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} -\def\equiv{\leavevmode\hbox to 1em{\hfil$\ptexequiv$\hfil}} - -% The @error{} command. -% Adapted from the TeXbook's \boxit. -% -\newbox\errorbox -% -{\tentt \global\dimen0 = 3em}% Width of the box. -\dimen2 = .55pt % Thickness of rules -% The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \reducedsf \putworderror\kern-1.5pt} -% -\setbox\errorbox=\hbox to \dimen0{\hfil - \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. - \advance\hsize by -2\dimen2 % Rules. - \vbox{% - \hrule height\dimen2 - \hbox{\vrule width\dimen2 \kern3pt % Space to left of text. - \vtop{\kern2.4pt \box0 \kern2.4pt}% Space above/below. - \kern3pt\vrule width\dimen2}% Space to right. - \hrule height\dimen2} - \hfil} -% -\def\error{\leavevmode\lower.7ex\copy\errorbox} - -% @pounds{} is a sterling sign, which Knuth put in the CM italic font. -% -\def\pounds{{\it\$}} - -% @euro{} comes from a separate font, depending on the current style. -% We use the free feym* fonts from the eurosym package by Henrik -% Theiling, which support regular, slanted, bold and bold slanted (and -% "outlined" (blackboard board, sort of) versions, which we don't need). -% It is available from http://www.ctan.org/tex-archive/fonts/eurosym. -% -% Although only regular is the truly official Euro symbol, we ignore -% that. The Euro is designed to be slightly taller than the regular -% font height. -% -% feymr - regular -% feymo - slanted -% feybr - bold -% feybo - bold slanted -% -% There is no good (free) typewriter version, to my knowledge. -% A feymr10 euro is ~7.3pt wide, while a normal cmtt10 char is ~5.25pt wide. -% Hmm. -% -% Also doesn't work in math. Do we need to do math with euro symbols? -% Hope not. -% -% -\def\euro{{\eurofont e}} -\def\eurofont{% - % We set the font at each command, rather than predefining it in - % \textfonts and the other font-switching commands, so that - % installations which never need the symbol don't have to have the - % font installed. - % - % There is only one designed size (nominal 10pt), so we always scale - % that to the current nominal size. - % - % By the way, simply using "at 1em" works for cmr10 and the like, but - % does not work for cmbx10 and other extended/shrunken fonts. - % - \def\eurosize{\csname\curfontsize nominalsize\endcsname}% - % - \ifx\curfontstyle\bfstylename - % bold: - \font\thiseurofont = \ifusingit{feybo10}{feybr10} at \eurosize - \else - % regular: - \font\thiseurofont = \ifusingit{feymo10}{feymr10} at \eurosize - \fi - \thiseurofont -} - -% Glyphs from the EC fonts. We don't use \let for the aliases, because -% sometimes we redefine the original macro, and the alias should reflect -% the redefinition. -% -% Use LaTeX names for the Icelandic letters. -\def\DH{{\ecfont \char"D0}} % Eth -\def\dh{{\ecfont \char"F0}} % eth -\def\TH{{\ecfont \char"DE}} % Thorn -\def\th{{\ecfont \char"FE}} % thorn -% -\def\guillemetleft{{\ecfont \char"13}} -\def\guillemotleft{\guillemetleft} -\def\guillemetright{{\ecfont \char"14}} -\def\guillemotright{\guillemetright} -\def\guilsinglleft{{\ecfont \char"0E}} -\def\guilsinglright{{\ecfont \char"0F}} -\def\quotedblbase{{\ecfont \char"12}} -\def\quotesinglbase{{\ecfont \char"0D}} -% -% This positioning is not perfect (see the ogonek LaTeX package), but -% we have the precomposed glyphs for the most common cases. We put the -% tests to use those glyphs in the single \ogonek macro so we have fewer -% dummy definitions to worry about for index entries, etc. -% -% ogonek is also used with other letters in Lithuanian (IOU), but using -% the precomposed glyphs for those is not so easy since they aren't in -% the same EC font. -\def\ogonek#1{{% - \def\temp{#1}% - \ifx\temp\macrocharA\Aogonek - \else\ifx\temp\macrochara\aogonek - \else\ifx\temp\macrocharE\Eogonek - \else\ifx\temp\macrochare\eogonek - \else - \ecfont \setbox0=\hbox{#1}% - \ifdim\ht0=1ex\accent"0C #1% - \else\ooalign{\unhbox0\crcr\hidewidth\char"0C \hidewidth}% - \fi - \fi\fi\fi\fi - }% -} -\def\Aogonek{{\ecfont \char"81}}\def\macrocharA{A} -\def\aogonek{{\ecfont \char"A1}}\def\macrochara{a} -\def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} -\def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} -% -% Use the European Computer Modern fonts (cm-super in outline format) -% for non-CM glyphs. That is ec* for regular text and tc* for the text -% companion symbols (LaTeX TS1 encoding). Both are part of the ec -% package and follow the same conventions. -% -\def\ecfont{\etcfont{e}} -\def\tcfont{\etcfont{t}} -% -\def\etcfont#1{% - % We can't distinguish serif/sans and italic/slanted, but this - % is used for crude hacks anyway (like adding French and German - % quotes to documents typeset with CM, where we lose kerning), so - % hopefully nobody will notice/care. - \edef\ecsize{\csname\curfontsize ecsize\endcsname}% - \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% - \ifmonospace - % typewriter: - \font\thisecfont = #1ctt\ecsize \space at \nominalsize - \else - \ifx\curfontstyle\bfstylename - % bold: - \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize - \else - % regular: - \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize - \fi - \fi - \thisecfont -} - -% @registeredsymbol - R in a circle. The font for the R should really -% be smaller yet, but lllsize is the best we can do for now. -% Adapted from the plain.tex definition of \copyright. -% -\def\registeredsymbol{% - $^{{\ooalign{\hfil\raise.07ex\hbox{\selectfonts\lllsize R}% - \hfil\crcr\Orb}}% - }$% -} - -% @textdegree - the normal degrees sign. -% -\def\textdegree{$^\circ$} - -% Laurent Siebenmann reports \Orb undefined with: -% Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 -% so we'll define it if necessary. -% -\ifx\Orb\thisisundefined -\def\Orb{\mathhexbox20D} -\fi - -% Quotes. -\chardef\quotedblleft="5C -\chardef\quotedblright=`\" -\chardef\quoteleft=`\` -\chardef\quoteright=`\' - - -\message{page headings,} - -\newskip\titlepagetopglue \titlepagetopglue = 1.5in -\newskip\titlepagebottomglue \titlepagebottomglue = 2pc - -% First the title page. Must do @settitle before @titlepage. -\newif\ifseenauthor -\newif\iffinishedtitlepage - -% Do an implicit @contents or @shortcontents after @end titlepage if the -% user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage. -% -\newif\ifsetcontentsaftertitlepage - \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue -\newif\ifsetshortcontentsaftertitlepage - \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue - -\parseargdef\shorttitlepage{% - \begingroup \hbox{}\vskip 1.5in \chaprm \centerline{#1}% - \endgroup\page\hbox{}\page} - -\envdef\titlepage{% - % Open one extra group, as we want to close it in the middle of \Etitlepage. - \begingroup - \parindent=0pt \textfonts - % Leave some space at the very top of the page. - \vglue\titlepagetopglue - % No rule at page bottom unless we print one at the top with @title. - \finishedtitlepagetrue - % - % Most title ``pages'' are actually two pages long, with space - % at the top of the second. We don't want the ragged left on the second. - \let\oldpage = \page - \def\page{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - \let\page = \oldpage - \page - \null - }% -} - -\def\Etitlepage{% - \iffinishedtitlepage\else - \finishtitlepage - \fi - % It is important to do the page break before ending the group, - % because the headline and footline are only empty inside the group. - % If we use the new definition of \page, we always get a blank page - % after the title page, which we certainly don't want. - \oldpage - \endgroup - % - % Need this before the \...aftertitlepage checks so that if they are - % in effect the toc pages will come out with page numbers. - \HEADINGSon - % - % If they want short, they certainly want long too. - \ifsetshortcontentsaftertitlepage - \shortcontents - \contents - \global\let\shortcontents = \relax - \global\let\contents = \relax - \fi - % - \ifsetcontentsaftertitlepage - \contents - \global\let\contents = \relax - \global\let\shortcontents = \relax - \fi -} - -\def\finishtitlepage{% - \vskip4pt \hrule height 2pt width \hsize - \vskip\titlepagebottomglue - \finishedtitlepagetrue -} - -% Settings used for typesetting titles: no hyphenation, no indentation, -% don't worry much about spacing, ragged right. This should be used -% inside a \vbox, and fonts need to be set appropriately first. Because -% it is always used for titles, nothing else, we call \rmisbold. \par -% should be specified before the end of the \vbox, since a vbox is a group. -% -\def\raggedtitlesettings{% - \rmisbold - \hyphenpenalty=10000 - \parindent=0pt - \tolerance=5000 - \ptexraggedright -} - -% Macros to be used within @titlepage: - -\let\subtitlerm=\tenrm -\def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines} - -\parseargdef\title{% - \checkenv\titlepage - \vbox{\titlefonts \raggedtitlesettings #1\par}% - % print a rule at the page bottom also. - \finishedtitlepagefalse - \vskip4pt \hrule height 4pt width \hsize \vskip4pt -} - -\parseargdef\subtitle{% - \checkenv\titlepage - {\subtitlefont \rightline{#1}}% -} - -% @author should come last, but may come many times. -% It can also be used inside @quotation. -% -\parseargdef\author{% - \def\temp{\quotation}% - \ifx\thisenv\temp - \def\quotationauthor{#1}% printed in \Equotation. - \else - \checkenv\titlepage - \ifseenauthor\else \vskip 0pt plus 1filll \seenauthortrue \fi - {\secfonts\rmisbold \leftline{#1}}% - \fi -} - - -% Set up page headings and footings. - -\let\thispage=\folio - -\newtoks\evenheadline % headline on even pages -\newtoks\oddheadline % headline on odd pages -\newtoks\evenfootline % footline on even pages -\newtoks\oddfootline % footline on odd pages - -% Now make \makeheadline and \makefootline in Plain TeX use those variables -\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline - \else \the\evenheadline \fi}} -\footline={{\textfonts\rm \ifodd\pageno \the\oddfootline - \else \the\evenfootline \fi}\HEADINGShook} -\let\HEADINGShook=\relax - -% Commands to set those variables. -% For example, this is what @headings on does -% @evenheading @thistitle|@thispage|@thischapter -% @oddheading @thischapter|@thispage|@thistitle -% @evenfooting @thisfile|| -% @oddfooting ||@thisfile - - -\def\evenheading{\parsearg\evenheadingxxx} -\def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} -\def\evenheadingyyy #1\|#2\|#3\|#4\finish{% -\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\def\oddheading{\parsearg\oddheadingxxx} -\def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} -\def\oddheadingyyy #1\|#2\|#3\|#4\finish{% -\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% - -\def\evenfooting{\parsearg\evenfootingxxx} -\def\evenfootingxxx #1{\evenfootingyyy #1\|\|\|\|\finish} -\def\evenfootingyyy #1\|#2\|#3\|#4\finish{% -\global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} - -\def\oddfooting{\parsearg\oddfootingxxx} -\def\oddfootingxxx #1{\oddfootingyyy #1\|\|\|\|\finish} -\def\oddfootingyyy #1\|#2\|#3\|#4\finish{% - \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}% - % - % Leave some space for the footline. Hopefully ok to assume - % @evenfooting will not be used by itself. - \global\advance\pageheight by -12pt - \global\advance\vsize by -12pt -} - -\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} - -% @evenheadingmarks top \thischapter <- chapter at the top of a page -% @evenheadingmarks bottom \thischapter <- chapter at the bottom of a page -% -% The same set of arguments for: -% -% @oddheadingmarks -% @evenfootingmarks -% @oddfootingmarks -% @everyheadingmarks -% @everyfootingmarks - -% These define \getoddheadingmarks, \getevenheadingmarks, -% \getoddfootingmarks, and \getevenfootingmarks, each to one of -% \gettopheadingmarks, \getbottomheadingmarks. -% -\def\evenheadingmarks{\headingmarks{even}{heading}} -\def\oddheadingmarks{\headingmarks{odd}{heading}} -\def\evenfootingmarks{\headingmarks{even}{footing}} -\def\oddfootingmarks{\headingmarks{odd}{footing}} -\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1} - \headingmarks{odd}{heading}{#1} } -\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1} - \headingmarks{odd}{footing}{#1} } -% #1 = even/odd, #2 = heading/footing, #3 = top/bottom. -\def\headingmarks#1#2#3 {% - \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname - \global\expandafter\let\csname get#1#2marks\endcsname \temp -} - -\everyheadingmarks bottom -\everyfootingmarks bottom - -% @headings double turns headings on for double-sided printing. -% @headings single turns headings on for single-sided printing. -% @headings off turns them off. -% @headings on same as @headings double, retained for compatibility. -% @headings after turns on double-sided headings after this page. -% @headings doubleafter turns on double-sided headings after this page. -% @headings singleafter turns on single-sided headings after this page. -% By default, they are off at the start of a document, -% and turned `on' after @end titlepage. - -\def\headings #1 {\csname HEADINGS#1\endcsname} - -\def\headingsoff{% non-global headings elimination - \evenheadline={\hfil}\evenfootline={\hfil}% - \oddheadline={\hfil}\oddfootline={\hfil}% -} - -\def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting -\HEADINGSoff % it's the default - -% When we turn headings on, set the page number to 1. -% For double-sided printing, put current file name in lower left corner, -% chapter name on inside top of right hand pages, document -% title on inside top of left hand pages, and page numbers on outside top -% edge of all pages. -\def\HEADINGSdouble{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage -} -\let\contentsalignmacro = \chappager - -% For single-sided printing, chapter title goes across top left of page, -% page number on top right. -\def\HEADINGSsingle{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapterheading\hfil\folio}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} -\global\let\contentsalignmacro = \chappager -} -\def\HEADINGSon{\HEADINGSdouble} - -\def\HEADINGSafter{\let\HEADINGShook=\HEADINGSdoublex} -\let\HEADINGSdoubleafter=\HEADINGSafter -\def\HEADINGSdoublex{% -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage -} - -\def\HEADINGSsingleafter{\let\HEADINGShook=\HEADINGSsinglex} -\def\HEADINGSsinglex{% -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapterheading\hfil\folio}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} -\global\let\contentsalignmacro = \chappager -} - -% Subroutines used in generating headings -% This produces Day Month Year style of output. -% Only define if not already defined, in case a txi-??.tex file has set -% up a different format (e.g., txi-cs.tex does this). -\ifx\today\thisisundefined -\def\today{% - \number\day\space - \ifcase\month - \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr - \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug - \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec - \fi - \space\number\year} -\fi - -% @settitle line... specifies the title of the document, for headings. -% It generates no output of its own. -\def\thistitle{\putwordNoTitle} -\def\settitle{\parsearg{\gdef\thistitle}} - - -\message{tables,} -% Tables -- @table, @ftable, @vtable, @item(x). - -% default indentation of table text -\newdimen\tableindent \tableindent=.8in -% default indentation of @itemize and @enumerate text -\newdimen\itemindent \itemindent=.3in -% margin between end of table item and start of table text. -\newdimen\itemmargin \itemmargin=.1in - -% used internally for \itemindent minus \itemmargin -\newdimen\itemmax - -% Note @table, @ftable, and @vtable define @item, @itemx, etc., with -% these defs. -% They also define \itemindex -% to index the item name in whatever manner is desired (perhaps none). - -\newif\ifitemxneedsnegativevskip - -\def\itemxpar{\par\ifitemxneedsnegativevskip\nobreak\vskip-\parskip\nobreak\fi} - -\def\internalBitem{\smallbreak \parsearg\itemzzz} -\def\internalBitemx{\itemxpar \parsearg\itemzzz} - -\def\itemzzz #1{\begingroup % - \advance\hsize by -\rightskip - \advance\hsize by -\tableindent - \setbox0=\hbox{\itemindicate{#1}}% - \itemindex{#1}% - \nobreak % This prevents a break before @itemx. - % - % If the item text does not fit in the space we have, put it on a line - % by itself, and do not allow a page break either before or after that - % line. We do not start a paragraph here because then if the next - % command is, e.g., @kindex, the whatsit would get put into the - % horizontal list on a line by itself, resulting in extra blank space. - \ifdim \wd0>\itemmax - % - % Make this a paragraph so we get the \parskip glue and wrapping, - % but leave it ragged-right. - \begingroup - \advance\leftskip by-\tableindent - \advance\hsize by\tableindent - \advance\rightskip by0pt plus1fil\relax - \leavevmode\unhbox0\par - \endgroup - % - % We're going to be starting a paragraph, but we don't want the - % \parskip glue -- logically it's part of the @item we just started. - \nobreak \vskip-\parskip - % - % Stop a page break at the \parskip glue coming up. However, if - % what follows is an environment such as @example, there will be no - % \parskip glue; then the negative vskip we just inserted would - % cause the example and the item to crash together. So we use this - % bizarre value of 10001 as a signal to \aboveenvbreak to insert - % \parskip glue after all. Section titles are handled this way also. - % - \penalty 10001 - \endgroup - \itemxneedsnegativevskipfalse - \else - % The item text fits into the space. Start a paragraph, so that the - % following text (if any) will end up on the same line. - \noindent - % Do this with kerns and \unhbox so that if there is a footnote in - % the item text, it can migrate to the main vertical list and - % eventually be printed. - \nobreak\kern-\tableindent - \dimen0 = \itemmax \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0 - \unhbox0 - \nobreak\kern\dimen0 - \endgroup - \itemxneedsnegativevskiptrue - \fi -} - -\def\item{\errmessage{@item while not in a list environment}} -\def\itemx{\errmessage{@itemx while not in a list environment}} - -% @table, @ftable, @vtable. -\envdef\table{% - \let\itemindex\gobble - \tablecheck{table}% -} -\envdef\ftable{% - \def\itemindex ##1{\doind {fn}{\code{##1}}}% - \tablecheck{ftable}% -} -\envdef\vtable{% - \def\itemindex ##1{\doind {vr}{\code{##1}}}% - \tablecheck{vtable}% -} -\def\tablecheck#1{% - \ifnum \the\catcode`\^^M=\active - \endgroup - \errmessage{This command won't work in this context; perhaps the problem is - that we are \inenvironment\thisenv}% - \def\next{\doignore{#1}}% - \else - \let\next\tablex - \fi - \next -} -\def\tablex#1{% - \def\itemindicate{#1}% - \parsearg\tabley -} -\def\tabley#1{% - {% - \makevalueexpandable - \edef\temp{\noexpand\tablez #1\space\space\space}% - \expandafter - }\temp \endtablez -} -\def\tablez #1 #2 #3 #4\endtablez{% - \aboveenvbreak - \ifnum 0#1>0 \advance \leftskip by #1\mil \fi - \ifnum 0#2>0 \tableindent=#2\mil \fi - \ifnum 0#3>0 \advance \rightskip by #3\mil \fi - \itemmax=\tableindent - \advance \itemmax by -\itemmargin - \advance \leftskip by \tableindent - \exdentamount=\tableindent - \parindent = 0pt - \parskip = \smallskipamount - \ifdim \parskip=0pt \parskip=2pt \fi - \let\item = \internalBitem - \let\itemx = \internalBitemx -} -\def\Etable{\endgraf\afterenvbreak} -\let\Eftable\Etable -\let\Evtable\Etable -\let\Eitemize\Etable -\let\Eenumerate\Etable - -% This is the counter used by @enumerate, which is really @itemize - -\newcount \itemno - -\envdef\itemize{\parsearg\doitemize} - -\def\doitemize#1{% - \aboveenvbreak - \itemmax=\itemindent - \advance\itemmax by -\itemmargin - \advance\leftskip by \itemindent - \exdentamount=\itemindent - \parindent=0pt - \parskip=\smallskipamount - \ifdim\parskip=0pt \parskip=2pt \fi - % - % Try typesetting the item mark so that if the document erroneously says - % something like @itemize @samp (intending @table), there's an error - % right away at the @itemize. It's not the best error message in the - % world, but it's better than leaving it to the @item. This means if - % the user wants an empty mark, they have to say @w{} not just @w. - \def\itemcontents{#1}% - \setbox0 = \hbox{\itemcontents}% - % - % @itemize with no arg is equivalent to @itemize @bullet. - \ifx\itemcontents\empty\def\itemcontents{\bullet}\fi - % - \let\item=\itemizeitem -} - -% Definition of @item while inside @itemize and @enumerate. -% -\def\itemizeitem{% - \advance\itemno by 1 % for enumerations - {\let\par=\endgraf \smallbreak}% reasonable place to break - {% - % If the document has an @itemize directly after a section title, a - % \nobreak will be last on the list, and \sectionheading will have - % done a \vskip-\parskip. In that case, we don't want to zero - % parskip, or the item text will crash with the heading. On the - % other hand, when there is normal text preceding the item (as there - % usually is), we do want to zero parskip, or there would be too much - % space. In that case, we won't have a \nobreak before. At least - % that's the theory. - \ifnum\lastpenalty<10000 \parskip=0in \fi - \noindent - \hbox to 0pt{\hss \itemcontents \kern\itemmargin}% - % - \ifinner\else - \vadjust{\penalty 1200}% not good to break after first line of item. - \fi - % We can be in inner vertical mode in a footnote, although an - % @itemize looks awful there. - }% - \flushcr -} - -% \splitoff TOKENS\endmark defines \first to be the first token in -% TOKENS, and \rest to be the remainder. -% -\def\splitoff#1#2\endmark{\def\first{#1}\def\rest{#2}}% - -% Allow an optional argument of an uppercase letter, lowercase letter, -% or number, to specify the first label in the enumerated list. No -% argument is the same as `1'. -% -\envparseargdef\enumerate{\enumeratey #1 \endenumeratey} -\def\enumeratey #1 #2\endenumeratey{% - % If we were given no argument, pretend we were given `1'. - \def\thearg{#1}% - \ifx\thearg\empty \def\thearg{1}\fi - % - % Detect if the argument is a single token. If so, it might be a - % letter. Otherwise, the only valid thing it can be is a number. - % (We will always have one token, because of the test we just made. - % This is a good thing, since \splitoff doesn't work given nothing at - % all -- the first parameter is undelimited.) - \expandafter\splitoff\thearg\endmark - \ifx\rest\empty - % Only one token in the argument. It could still be anything. - % A ``lowercase letter'' is one whose \lccode is nonzero. - % An ``uppercase letter'' is one whose \lccode is both nonzero, and - % not equal to itself. - % Otherwise, we assume it's a number. - % - % We need the \relax at the end of the \ifnum lines to stop TeX from - % continuing to look for a . - % - \ifnum\lccode\expandafter`\thearg=0\relax - \numericenumerate % a number (we hope) - \else - % It's a letter. - \ifnum\lccode\expandafter`\thearg=\expandafter`\thearg\relax - \lowercaseenumerate % lowercase letter - \else - \uppercaseenumerate % uppercase letter - \fi - \fi - \else - % Multiple tokens in the argument. We hope it's a number. - \numericenumerate - \fi -} - -% An @enumerate whose labels are integers. The starting integer is -% given in \thearg. -% -\def\numericenumerate{% - \itemno = \thearg - \startenumeration{\the\itemno}% -} - -% The starting (lowercase) letter is in \thearg. -\def\lowercaseenumerate{% - \itemno = \expandafter`\thearg - \startenumeration{% - % Be sure we're not beyond the end of the alphabet. - \ifnum\itemno=0 - \errmessage{No more lowercase letters in @enumerate; get a bigger - alphabet}% - \fi - \char\lccode\itemno - }% -} - -% The starting (uppercase) letter is in \thearg. -\def\uppercaseenumerate{% - \itemno = \expandafter`\thearg - \startenumeration{% - % Be sure we're not beyond the end of the alphabet. - \ifnum\itemno=0 - \errmessage{No more uppercase letters in @enumerate; get a bigger - alphabet} - \fi - \char\uccode\itemno - }% -} - -% Call \doitemize, adding a period to the first argument and supplying the -% common last two arguments. Also subtract one from the initial value in -% \itemno, since @item increments \itemno. -% -\def\startenumeration#1{% - \advance\itemno by -1 - \doitemize{#1.}\flushcr -} - -% @alphaenumerate and @capsenumerate are abbreviations for giving an arg -% to @enumerate. -% -\def\alphaenumerate{\enumerate{a}} -\def\capsenumerate{\enumerate{A}} -\def\Ealphaenumerate{\Eenumerate} -\def\Ecapsenumerate{\Eenumerate} - - -% @multitable macros -% Amy Hendrickson, 8/18/94, 3/6/96 -% -% @multitable ... @end multitable will make as many columns as desired. -% Contents of each column will wrap at width given in preamble. Width -% can be specified either with sample text given in a template line, -% or in percent of \hsize, the current width of text on page. - -% Table can continue over pages but will only break between lines. - -% To make preamble: -% -% Either define widths of columns in terms of percent of \hsize: -% @multitable @columnfractions .25 .3 .45 -% @item ... -% -% Numbers following @columnfractions are the percent of the total -% current hsize to be used for each column. You may use as many -% columns as desired. - - -% Or use a template: -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item ... -% using the widest term desired in each column. - -% Each new table line starts with @item, each subsequent new column -% starts with @tab. Empty columns may be produced by supplying @tab's -% with nothing between them for as many times as empty columns are needed, -% ie, @tab@tab@tab will produce two empty columns. - -% @item, @tab do not need to be on their own lines, but it will not hurt -% if they are. - -% Sample multitable: - -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item first col stuff @tab second col stuff @tab third col -% @item -% first col stuff -% @tab -% second col stuff -% @tab -% third col -% @item first col stuff @tab second col stuff -% @tab Many paragraphs of text may be used in any column. -% -% They will wrap at the width determined by the template. -% @item@tab@tab This will be in third column. -% @end multitable - -% Default dimensions may be reset by user. -% @multitableparskip is vertical space between paragraphs in table. -% @multitableparindent is paragraph indent in table. -% @multitablecolmargin is horizontal space to be left between columns. -% @multitablelinespace is space to leave between table items, baseline -% to baseline. -% 0pt means it depends on current normal line spacing. -% -\newskip\multitableparskip -\newskip\multitableparindent -\newdimen\multitablecolspace -\newskip\multitablelinespace -\multitableparskip=0pt -\multitableparindent=6pt -\multitablecolspace=12pt -\multitablelinespace=0pt - -% Macros used to set up halign preamble: -% -\let\endsetuptable\relax -\def\xendsetuptable{\endsetuptable} -\let\columnfractions\relax -\def\xcolumnfractions{\columnfractions} -\newif\ifsetpercent - -% #1 is the @columnfraction, usually a decimal number like .5, but might -% be just 1. We just use it, whatever it is. -% -\def\pickupwholefraction#1 {% - \global\advance\colcount by 1 - \expandafter\xdef\csname col\the\colcount\endcsname{#1\hsize}% - \setuptable -} - -\newcount\colcount -\def\setuptable#1{% - \def\firstarg{#1}% - \ifx\firstarg\xendsetuptable - \let\go = \relax - \else - \ifx\firstarg\xcolumnfractions - \global\setpercenttrue - \else - \ifsetpercent - \let\go\pickupwholefraction - \else - \global\advance\colcount by 1 - \setbox0=\hbox{#1\unskip\space}% Add a normal word space as a - % separator; typically that is always in the input, anyway. - \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}% - \fi - \fi - \ifx\go\pickupwholefraction - % Put the argument back for the \pickupwholefraction call, so - % we'll always have a period there to be parsed. - \def\go{\pickupwholefraction#1}% - \else - \let\go = \setuptable - \fi% - \fi - \go -} - -% multitable-only commands. -% -% @headitem starts a heading row, which we typeset in bold. Assignments -% have to be global since we are inside the implicit group of an -% alignment entry. \everycr below resets \everytab so we don't have to -% undo it ourselves. -\def\headitemfont{\b}% for people to use in the template row; not changeable -\def\headitem{% - \checkenv\multitable - \crcr - \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings - \global\everytab={\bf}% can't use \headitemfont since the parsing differs - \the\everytab % for the first item -}% -% -% default for tables with no headings. -\let\headitemcrhook=\relax -% -% A \tab used to include \hskip1sp. But then the space in a template -% line is not enough. That is bad. So let's go back to just `&' until -% we again encounter the problem the 1sp was intended to solve. -% --karl, nathan@acm.org, 20apr99. -\def\tab{\checkenv\multitable &\the\everytab}% - -% @multitable ... @end multitable definitions: -% -\newtoks\everytab % insert after every tab. -% -\envdef\multitable{% - \vskip\parskip - \startsavinginserts - % - % @item within a multitable starts a normal row. - % We use \def instead of \let so that if one of the multitable entries - % contains an @itemize, we don't choke on the \item (seen as \crcr aka - % \endtemplate) expanding \doitemize. - \def\item{\crcr}% - % - \tolerance=9500 - \hbadness=9500 - \setmultitablespacing - \parskip=\multitableparskip - \parindent=\multitableparindent - \overfullrule=0pt - \global\colcount=0 - % - \everycr = {% - \noalign{% - \global\everytab={}% Reset from possible headitem. - \global\colcount=0 % Reset the column counter. - % - % Check for saved footnotes, etc.: - \checkinserts - % - % Perhaps a \nobreak, then reset: - \headitemcrhook - \global\let\headitemcrhook=\relax - }% - }% - % - \parsearg\domultitable -} -\def\domultitable#1{% - % To parse everything between @multitable and @item: - \setuptable#1 \endsetuptable - % - % This preamble sets up a generic column definition, which will - % be used as many times as user calls for columns. - % \vtop will set a single line and will also let text wrap and - % continue for many paragraphs if desired. - \halign\bgroup &% - \global\advance\colcount by 1 - \multistrut - \vtop{% - % Use the current \colcount to find the correct column width: - \hsize=\expandafter\csname col\the\colcount\endcsname - % - % In order to keep entries from bumping into each other - % we will add a \leftskip of \multitablecolspace to all columns after - % the first one. - % - % If a template has been used, we will add \multitablecolspace - % to the width of each template entry. - % - % If the user has set preamble in terms of percent of \hsize we will - % use that dimension as the width of the column, and the \leftskip - % will keep entries from bumping into each other. Table will start at - % left margin and final column will justify at right margin. - % - % Make sure we don't inherit \rightskip from the outer environment. - \rightskip=0pt - \ifnum\colcount=1 - % The first column will be indented with the surrounding text. - \advance\hsize by\leftskip - \else - \ifsetpercent \else - % If user has not set preamble in terms of percent of \hsize - % we will advance \hsize by \multitablecolspace. - \advance\hsize by \multitablecolspace - \fi - % In either case we will make \leftskip=\multitablecolspace: - \leftskip=\multitablecolspace - \fi - % Ignoring space at the beginning and end avoids an occasional spurious - % blank line, when TeX decides to break the line at the space before the - % box from the multistrut, so the strut ends up on a line by itself. - % For example: - % @multitable @columnfractions .11 .89 - % @item @code{#} - % @tab Legal holiday which is valid in major parts of the whole country. - % Is automatically provided with highlighting sequences respectively - % marking characters. - \noindent\ignorespaces##\unskip\multistrut - }\cr -} -\def\Emultitable{% - \crcr - \egroup % end the \halign - \global\setpercentfalse -} - -\def\setmultitablespacing{% - \def\multistrut{\strut}% just use the standard line spacing - % - % Compute \multitablelinespace (if not defined by user) for use in - % \multitableparskip calculation. We used define \multistrut based on - % this, but (ironically) that caused the spacing to be off. - % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. -\ifdim\multitablelinespace=0pt -\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip -\global\advance\multitablelinespace by-\ht0 -\fi -% Test to see if parskip is larger than space between lines of -% table. If not, do nothing. -% If so, set to same dimension as multitablelinespace. -\ifdim\multitableparskip>\multitablelinespace -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller - % than skip between lines in the table. -\fi% -\ifdim\multitableparskip=0pt -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller - % than skip between lines in the table. -\fi} - - -\message{conditionals,} - -% @iftex, @ifnotdocbook, @ifnothtml, @ifnotinfo, @ifnotplaintext, -% @ifnotxml always succeed. They currently do nothing; we don't -% attempt to check whether the conditionals are properly nested. But we -% have to remember that they are conditionals, so that @end doesn't -% attempt to close an environment group. -% -\def\makecond#1{% - \expandafter\let\csname #1\endcsname = \relax - \expandafter\let\csname iscond.#1\endcsname = 1 -} -\makecond{iftex} -\makecond{ifnotdocbook} -\makecond{ifnothtml} -\makecond{ifnotinfo} -\makecond{ifnotplaintext} -\makecond{ifnotxml} - -% Ignore @ignore, @ifhtml, @ifinfo, and the like. -% -\def\direntry{\doignore{direntry}} -\def\documentdescription{\doignore{documentdescription}} -\def\docbook{\doignore{docbook}} -\def\html{\doignore{html}} -\def\ifdocbook{\doignore{ifdocbook}} -\def\ifhtml{\doignore{ifhtml}} -\def\ifinfo{\doignore{ifinfo}} -\def\ifnottex{\doignore{ifnottex}} -\def\ifplaintext{\doignore{ifplaintext}} -\def\ifxml{\doignore{ifxml}} -\def\ignore{\doignore{ignore}} -\def\menu{\doignore{menu}} -\def\xml{\doignore{xml}} - -% Ignore text until a line `@end #1', keeping track of nested conditionals. -% -% A count to remember the depth of nesting. -\newcount\doignorecount - -\def\doignore#1{\begingroup - % Scan in ``verbatim'' mode: - \obeylines - \catcode`\@ = \other - \catcode`\{ = \other - \catcode`\} = \other - % - % Make sure that spaces turn into tokens that match what \doignoretext wants. - \spaceisspace - % - % Count number of #1's that we've seen. - \doignorecount = 0 - % - % Swallow text until we reach the matching `@end #1'. - \dodoignore{#1}% -} - -{ \catcode`_=11 % We want to use \_STOP_ which cannot appear in texinfo source. - \obeylines % - % - \gdef\dodoignore#1{% - % #1 contains the command name as a string, e.g., `ifinfo'. - % - % Define a command to find the next `@end #1'. - \long\def\doignoretext##1^^M@end #1{% - \doignoretextyyy##1^^M@#1\_STOP_}% - % - % And this command to find another #1 command, at the beginning of a - % line. (Otherwise, we would consider a line `@c @ifset', for - % example, to count as an @ifset for nesting.) - \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% - % - % And now expand that command. - \doignoretext ^^M% - }% -} - -\def\doignoreyyy#1{% - \def\temp{#1}% - \ifx\temp\empty % Nothing found. - \let\next\doignoretextzzz - \else % Found a nested condition, ... - \advance\doignorecount by 1 - \let\next\doignoretextyyy % ..., look for another. - % If we're here, #1 ends with ^^M\ifinfo (for example). - \fi - \next #1% the token \_STOP_ is present just after this macro. -} - -% We have to swallow the remaining "\_STOP_". -% -\def\doignoretextzzz#1{% - \ifnum\doignorecount = 0 % We have just found the outermost @end. - \let\next\enddoignore - \else % Still inside a nested condition. - \advance\doignorecount by -1 - \let\next\doignoretext % Look for the next @end. - \fi - \next -} - -% Finish off ignored text. -{ \obeylines% - % Ignore anything after the last `@end #1'; this matters in verbatim - % environments, where otherwise the newline after an ignored conditional - % would result in a blank line in the output. - \gdef\enddoignore#1^^M{\endgroup\ignorespaces}% -} - - -% @set VAR sets the variable VAR to an empty value. -% @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE. -% -% Since we want to separate VAR from REST-OF-LINE (which might be -% empty), we can't just use \parsearg; we have to insert a space of our -% own to delimit the rest of the line, and then take it out again if we -% didn't need it. -% We rely on the fact that \parsearg sets \catcode`\ =10. -% -\parseargdef\set{\setyyy#1 \endsetyyy} -\def\setyyy#1 #2\endsetyyy{% - {% - \makevalueexpandable - \def\temp{#2}% - \edef\next{\gdef\makecsname{SET#1}}% - \ifx\temp\empty - \next{}% - \else - \setzzz#2\endsetzzz - \fi - }% -} -% Remove the trailing space \setxxx inserted. -\def\setzzz#1 \endsetzzz{\next{#1}} - -% @clear VAR clears (i.e., unsets) the variable VAR. -% -\parseargdef\clear{% - {% - \makevalueexpandable - \global\expandafter\let\csname SET#1\endcsname=\relax - }% -} - -% @value{foo} gets the text saved in variable foo. -\def\value{\begingroup\makevalueexpandable\valuexxx} -\def\valuexxx#1{\expandablevalue{#1}\endgroup} -{ - \catcode`\-=\active \catcode`\_=\active - % - \gdef\makevalueexpandable{% - \let\value = \expandablevalue - % We don't want these characters active, ... - \catcode`\-=\other \catcode`\_=\other - % ..., but we might end up with active ones in the argument if - % we're called from @code, as @code{@value{foo-bar_}}, though. - % So \let them to their normal equivalents. - \let-\normaldash \let_\normalunderscore - } -} - -% We have this subroutine so that we can handle at least some @value's -% properly in indexes (we call \makevalueexpandable in \indexdummies). -% The command has to be fully expandable (if the variable is set), since -% the result winds up in the index file. This means that if the -% variable's value contains other Texinfo commands, it's almost certain -% it will fail (although perhaps we could fix that with sufficient work -% to do a one-level expansion on the result, instead of complete). -% -% Unfortunately, this has the consequence that when _ is in the *value* -% of an @set, it does not print properly in the roman fonts (get the cmr -% dot accent at position 126 instead). No fix comes to mind, and it's -% been this way since 2003 or earlier, so just ignore it. -% -\def\expandablevalue#1{% - \expandafter\ifx\csname SET#1\endcsname\relax - {[No value for ``#1'']}% - \message{Variable `#1', used in @value, is not set.}% - \else - \csname SET#1\endcsname - \fi -} - -% @ifset VAR ... @end ifset reads the `...' iff VAR has been defined -% with @set. -% -% To get the special treatment we need for `@end ifset,' we call -% \makecond and then redefine. -% -\makecond{ifset} -\def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} -\def\doifset#1#2{% - {% - \makevalueexpandable - \let\next=\empty - \expandafter\ifx\csname SET#2\endcsname\relax - #1% If not set, redefine \next. - \fi - \expandafter - }\next -} -\def\ifsetfail{\doignore{ifset}} - -% @ifclear VAR ... @end executes the `...' iff VAR has never been -% defined with @set, or has been undefined with @clear. -% -% The `\else' inside the `\doifset' parameter is a trick to reuse the -% above code: if the variable is not set, do nothing, if it is set, -% then redefine \next to \ifclearfail. -% -\makecond{ifclear} -\def\ifclear{\parsearg{\doifset{\else \let\next=\ifclearfail}}} -\def\ifclearfail{\doignore{ifclear}} - -% @ifcommandisdefined CMD ... @end executes the `...' if CMD (written -% without the @) is in fact defined. We can only feasibly check at the -% TeX level, so something like `mathcode' is going to considered -% defined even though it is not a Texinfo command. -% -\makecond{ifcommanddefined} -\def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} -% -\def\doifcmddefined#1#2{{% - \makevalueexpandable - \let\next=\empty - \expandafter\ifx\csname #2\endcsname\relax - #1% If not defined, \let\next as above. - \fi - \expandafter - }\next -} -\def\ifcmddefinedfail{\doignore{ifcommanddefined}} - -% @ifcommandnotdefined CMD ... handled similar to @ifclear above. -\makecond{ifcommandnotdefined} -\def\ifcommandnotdefined{% - \parsearg{\doifcmddefined{\else \let\next=\ifcmdnotdefinedfail}}} -\def\ifcmdnotdefinedfail{\doignore{ifcommandnotdefined}} - -% Set the `txicommandconditionals' variable, so documents have a way to -% test if the @ifcommand...defined conditionals are available. -\set txicommandconditionals - -% @dircategory CATEGORY -- specify a category of the dir file -% which this file should belong to. Ignore this in TeX. -\let\dircategory=\comment - -% @defininfoenclose. -\let\definfoenclose=\comment - - -\message{indexing,} -% Index generation facilities - -% Define \newwrite to be identical to plain tex's \newwrite -% except not \outer, so it can be used within macros and \if's. -\edef\newwrite{\makecsname{ptexnewwrite}} - -% \newindex {foo} defines an index named IX. -% It automatically defines \IXindex such that -% \IXindex ...rest of line... puts an entry in the index IX. -% It also defines \IXindfile to be the number of the output channel for -% the file that accumulates this index. The file's extension is IX. -% The name of an index should be no more than 2 characters long -% for the sake of vms. -% -\def\newindex#1{% - \expandafter\chardef\csname#1indfile\endcsname=0 - \expandafter\xdef\csname#1index\endcsname{% % Define @#1index - \noexpand\doindex{#1}} -} - -% @defindex foo == \newindex{foo} -% -\def\defindex{\parsearg\newindex} - -% Define @defcodeindex, like @defindex except put all entries in @code. -% -\def\defcodeindex{\parsearg\newcodeindex} -% -\def\newcodeindex#1{% - \expandafter\chardef\csname#1indfile\endcsname=0 - \expandafter\xdef\csname#1index\endcsname{% - \noexpand\docodeindex{#1}}% -} - -% The default indices: -\newindex{cp}% concepts, -\newcodeindex{fn}% functions, -\newcodeindex{vr}% variables, -\newcodeindex{tp}% types, -\newcodeindex{ky}% keys -\newcodeindex{pg}% and programs. - - -% @synindex foo bar makes index foo feed into index bar. -% Do this instead of @defindex foo if you don't want it as a separate index. -% -% @syncodeindex foo bar similar, but put all entries made for index foo -% inside @code. -% -\def\synindex#1 #2 {\dosynindex\doindex{#1}{#2}} -\def\syncodeindex#1 #2 {\dosynindex\docodeindex{#1}{#2}} - -% #1 is \doindex or \docodeindex, #2 the index getting redefined (foo), -% #3 the target index (bar). -\def\dosynindex#1#2#3{% - % Only do \closeout if we haven't already done it, else we'll end up - % closing the target index. - \expandafter \ifx\csname donesynindex#2\endcsname \relax - % The \closeout helps reduce unnecessary open files; the limit on the - % Acorn RISC OS is a mere 16 files. - \expandafter\closeout\csname#2indfile\endcsname - \expandafter\let\csname donesynindex#2\endcsname = 1 - \fi - % redefine \fooindfile: - \expandafter\let\expandafter\temp\expandafter=\csname#3indfile\endcsname - \expandafter\let\csname#2indfile\endcsname=\temp - % redefine \fooindex: - \expandafter\xdef\csname#2index\endcsname{\noexpand#1{#3}}% -} - -% Define \doindex, the driver for all index macros. -% Argument #1 is generated by the calling \fooindex macro, -% and it the two-letter name of the index. - -\def\doindex#1{\edef\indexname{#1}\parsearg\doindexxxx} -\def\doindexxxx #1{\doind{\indexname}{#1}} - -% like the previous two, but they put @code around the argument. -\def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} -\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}} - -% Used when writing an index entry out to an index file, to prevent -% expansion of Texinfo commands that can appear in an index entry. -% -\def\indexdummies{% - \escapechar = `\\ % use backslash in output files. - \def\@{@}% change to @@ when we switch to @ as escape char in index files. - \def\ {\realbackslash\space }% - % - % Need these unexpandable (because we define \tt as a dummy) - % definitions when @{ or @} appear in index entry text. Also, more - % complicated, when \tex is in effect and \{ is a \delimiter again. - % We can't use \lbracecmd and \rbracecmd because texindex assumes - % braces and backslashes are used only as delimiters. Perhaps we - % should use @lbracechar and @rbracechar? - \def\{{{\tt\char123}}% - \def\}{{\tt\char125}}% - % - % Do the redefinitions. - \commondummies -} - -% For the aux and toc files, @ is the escape character. So we want to -% redefine everything using @ as the escape character (instead of -% \realbackslash, still used for index files). When everything uses @, -% this will be simpler. -% -\def\atdummies{% - \def\@{@@}% - \def\ {@ }% - \let\{ = \lbraceatcmd - \let\} = \rbraceatcmd - % - % Do the redefinitions. - \commondummies - \otherbackslash -} - -% Called from \indexdummies and \atdummies. -% -\def\commondummies{% - % \definedummyword defines \#1 as \string\#1\space, thus effectively - % preventing its expansion. This is used only for control words, - % not control letters, because the \space would be incorrect for - % control characters, but is needed to separate the control word - % from whatever follows. - % - % For control letters, we have \definedummyletter, which omits the - % space. - % - % These can be used both for control words that take an argument and - % those that do not. If it is followed by {arg} in the input, then - % that will dutifully get written to the index (or wherever). - % - \def\definedummyword ##1{\def##1{\string##1\space}}% - \def\definedummyletter##1{\def##1{\string##1}}% - \let\definedummyaccent\definedummyletter - % - \commondummiesnofonts - % - \definedummyletter\_% - \definedummyletter\-% - % - % Non-English letters. - \definedummyword\AA - \definedummyword\AE - \definedummyword\DH - \definedummyword\L - \definedummyword\O - \definedummyword\OE - \definedummyword\TH - \definedummyword\aa - \definedummyword\ae - \definedummyword\dh - \definedummyword\exclamdown - \definedummyword\l - \definedummyword\o - \definedummyword\oe - \definedummyword\ordf - \definedummyword\ordm - \definedummyword\questiondown - \definedummyword\ss - \definedummyword\th - % - % Although these internal commands shouldn't show up, sometimes they do. - \definedummyword\bf - \definedummyword\gtr - \definedummyword\hat - \definedummyword\less - \definedummyword\sf - \definedummyword\sl - \definedummyword\tclose - \definedummyword\tt - % - \definedummyword\LaTeX - \definedummyword\TeX - % - % Assorted special characters. - \definedummyword\arrow - \definedummyword\bullet - \definedummyword\comma - \definedummyword\copyright - \definedummyword\registeredsymbol - \definedummyword\dots - \definedummyword\enddots - \definedummyword\entrybreak - \definedummyword\equiv - \definedummyword\error - \definedummyword\euro - \definedummyword\expansion - \definedummyword\geq - \definedummyword\guillemetleft - \definedummyword\guillemetright - \definedummyword\guilsinglleft - \definedummyword\guilsinglright - \definedummyword\lbracechar - \definedummyword\leq - \definedummyword\mathopsup - \definedummyword\minus - \definedummyword\ogonek - \definedummyword\pounds - \definedummyword\point - \definedummyword\print - \definedummyword\quotedblbase - \definedummyword\quotedblleft - \definedummyword\quotedblright - \definedummyword\quoteleft - \definedummyword\quoteright - \definedummyword\quotesinglbase - \definedummyword\rbracechar - \definedummyword\result - \definedummyword\sub - \definedummyword\sup - \definedummyword\textdegree - % - % We want to disable all macros so that they are not expanded by \write. - \macrolist - % - \normalturnoffactive - % - % Handle some cases of @value -- where it does not contain any - % (non-fully-expandable) commands. - \makevalueexpandable -} - -% \commondummiesnofonts: common to \commondummies and \indexnofonts. -% Define \definedumyletter, \definedummyaccent and \definedummyword before -% using. -% -\def\commondummiesnofonts{% - % Control letters and accents. - \definedummyletter\!% - \definedummyaccent\"% - \definedummyaccent\'% - \definedummyletter\*% - \definedummyaccent\,% - \definedummyletter\.% - \definedummyletter\/% - \definedummyletter\:% - \definedummyaccent\=% - \definedummyletter\?% - \definedummyaccent\^% - \definedummyaccent\`% - \definedummyaccent\~% - \definedummyword\u - \definedummyword\v - \definedummyword\H - \definedummyword\dotaccent - \definedummyword\ogonek - \definedummyword\ringaccent - \definedummyword\tieaccent - \definedummyword\ubaraccent - \definedummyword\udotaccent - \definedummyword\dotless - % - % Texinfo font commands. - \definedummyword\b - \definedummyword\i - \definedummyword\r - \definedummyword\sansserif - \definedummyword\sc - \definedummyword\slanted - \definedummyword\t - % - % Commands that take arguments. - \definedummyword\abbr - \definedummyword\acronym - \definedummyword\anchor - \definedummyword\cite - \definedummyword\code - \definedummyword\command - \definedummyword\dfn - \definedummyword\dmn - \definedummyword\email - \definedummyword\emph - \definedummyword\env - \definedummyword\file - \definedummyword\image - \definedummyword\indicateurl - \definedummyword\inforef - \definedummyword\kbd - \definedummyword\key - \definedummyword\math - \definedummyword\option - \definedummyword\pxref - \definedummyword\ref - \definedummyword\samp - \definedummyword\strong - \definedummyword\tie - \definedummyword\U - \definedummyword\uref - \definedummyword\url - \definedummyword\var - \definedummyword\verb - \definedummyword\w - \definedummyword\xref -} - -% For testing: output @{ and @} in index sort strings as \{ and \}. -\newif\ifusebracesinindexes - -\let\indexlbrace\relax -\let\indexrbrace\relax - -{\catcode`\@=0 -\catcode`\\=13 - @gdef@backslashdisappear{@def\{}} -} - -{ -\catcode`\<=13 -\catcode`\-=13 -\catcode`\`=13 - \gdef\indexnonalnumdisappear{% - \expandafter\ifx\csname SETtxiindexlquoteignore\endcsname\relax\else - % @set txiindexlquoteignore makes us ignore left quotes in the sort term. - % (Introduced for FSFS 2nd ed.) - \let`=\empty - \fi - % - \expandafter\ifx\csname SETtxiindexbackslashignore\endcsname\relax\else - \backslashdisappear - \fi - % - \expandafter\ifx\csname SETtxiindexhyphenignore\endcsname\relax\else - \def-{}% - \fi - \expandafter\ifx\csname SETtxiindexlessthanignore\endcsname\relax\else - \def<{}% - \fi - \expandafter\ifx\csname SETtxiindexatsignignore\endcsname\relax\else - \def\@{}% - \fi - } - - \gdef\indexnonalnumreappear{% - \useindexbackslash - \let-\normaldash - \let<\normalless - \def\@{@}% - } -} - - -% \indexnofonts is used when outputting the strings to sort the index -% by, and when constructing control sequence names. It eliminates all -% control sequences and just writes whatever the best ASCII sort string -% would be for a given command (usually its argument). -% -\def\indexnofonts{% - % Accent commands should become @asis. - \def\definedummyaccent##1{\let##1\asis}% - % We can just ignore other control letters. - \def\definedummyletter##1{\let##1\empty}% - % All control words become @asis by default; overrides below. - \let\definedummyword\definedummyaccent - \commondummiesnofonts - % - % Don't no-op \tt, since it isn't a user-level command - % and is used in the definitions of the active chars like <, >, |, etc. - % Likewise with the other plain tex font commands. - %\let\tt=\asis - % - \def\ { }% - \def\@{@}% - \def\_{\normalunderscore}% - \def\-{}% @- shouldn't affect sorting - % - \uccode`\1=`\{ \uppercase{\def\{{1}}% - \uccode`\1=`\} \uppercase{\def\}{1}}% - \let\lbracechar\{ - \let\rbracechar\} - % - % Non-English letters. - \def\AA{AA}% - \def\AE{AE}% - \def\DH{DZZ}% - \def\L{L}% - \def\OE{OE}% - \def\O{O}% - \def\TH{TH}% - \def\aa{aa}% - \def\ae{ae}% - \def\dh{dzz}% - \def\exclamdown{!}% - \def\l{l}% - \def\oe{oe}% - \def\ordf{a}% - \def\ordm{o}% - \def\o{o}% - \def\questiondown{?}% - \def\ss{ss}% - \def\th{th}% - % - \def\LaTeX{LaTeX}% - \def\TeX{TeX}% - % - % Assorted special characters. - % (The following {} will end up in the sort string, but that's ok.) - \def\arrow{->}% - \def\bullet{bullet}% - \def\comma{,}% - \def\copyright{copyright}% - \def\dots{...}% - \def\enddots{...}% - \def\equiv{==}% - \def\error{error}% - \def\euro{euro}% - \def\expansion{==>}% - \def\geq{>=}% - \def\guillemetleft{<<}% - \def\guillemetright{>>}% - \def\guilsinglleft{<}% - \def\guilsinglright{>}% - \def\leq{<=}% - \def\minus{-}% - \def\point{.}% - \def\pounds{pounds}% - \def\print{-|}% - \def\quotedblbase{"}% - \def\quotedblleft{"}% - \def\quotedblright{"}% - \def\quoteleft{`}% - \def\quoteright{'}% - \def\quotesinglbase{,}% - \def\registeredsymbol{R}% - \def\result{=>}% - \def\textdegree{o}% - % - % We need to get rid of all macros, leaving only the arguments (if present). - % Of course this is not nearly correct, but it is the best we can do for now. - % makeinfo does not expand macros in the argument to @deffn, which ends up - % writing an index entry, and texindex isn't prepared for an index sort entry - % that starts with \. - % - % Since macro invocations are followed by braces, we can just redefine them - % to take a single TeX argument. The case of a macro invocation that - % goes to end-of-line is not handled. - % - \macrolist -} - - -\let\SETmarginindex=\relax % put index entries in margin (undocumented)? - -% Most index entries go through here, but \dosubind is the general case. -% #1 is the index name, #2 is the entry text. -\def\doind#1#2{\dosubind{#1}{#2}{}} - -% There is also \dosubind {index}{topic}{subtopic} -% which makes an entry in a two-level index such as the operation index. -% TODO: Two-level index? Operation index? - -% Workhorse for all indexes. -% #1 is name of index, #2 is stuff to put there, #3 is subentry -- -% empty if called from \doind, as we usually are (the main exception -% is with most defuns, which call us directly). -% -\def\dosubind#1#2#3{% - \iflinks - {% - \requireopenindexfile{#1}% - % Store the main index entry text (including the third arg). - \toks0 = {#2}% - % If third arg is present, precede it with a space. - \def\thirdarg{#3}% - \ifx\thirdarg\empty \else - \toks0 = \expandafter{\the\toks0 \space #3}% - \fi - % - \edef\writeto{\csname#1indfile\endcsname}% - % - \safewhatsit\dosubindwrite - }% - \fi -} - -% Check if an index file has been opened, and if not, open it. -\def\requireopenindexfile#1{% -\ifnum\csname #1indfile\endcsname=0 - \expandafter\newwrite \csname#1indfile\endcsname - \edef\suffix{#1}% - % A .fls suffix would conflict with the file extension for the output - % of -recorder, so use .f1s instead. - \ifx\suffix\indexisfl\def\suffix{f1}\fi - % Open the file - \immediate\openout\csname#1indfile\endcsname \jobname.\suffix - % Using \immediate here prevents an object entering into the current box, - % which could confound checks such as those in \safewhatsit for preceding - % skips. -\fi} -\def\indexisfl{fl} - -% Output \ as {\indexbackslash}, because \ is an escape character in -% the index files. -\let\indexbackslash=\relax -{\catcode`\@=0 \catcode`\\=\active - @gdef@useindexbackslash{@def\{{@indexbackslash}}} -} - -% Definition for writing index entry text. -\def\sortas#1{\ignorespaces}% - -% Definition for writing index entry sort key. Should occur at the at -% the beginning of the index entry, like -% @cindex @sortas{september} \september -% The \ignorespaces takes care of following space, but there's no way -% to remove space before it. -{ -\catcode`\-=13 -\gdef\indexwritesortas{% - \begingroup - \indexnonalnumreappear - \indexwritesortasxxx} -\gdef\indexwritesortasxxx#1{% - \xdef\indexsortkey{#1}\endgroup} -} - - -% Write the entry in \toks0 to the index file. -% -\def\dosubindwrite{% - % Put the index entry in the margin if desired. - \ifx\SETmarginindex\relax\else - \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% - \fi - % - % Remember, we are within a group. - \indexdummies % Must do this here, since \bf, etc expand at this stage - \useindexbackslash % \indexbackslash isn't defined now so it will be output - % as is; and it will print as backslash. - % The braces around \indexbrace are recognized by texindex. - % - % Get the string to sort by, by processing the index entry with all - % font commands turned off. - {\indexnofonts - \def\lbracechar{{\indexlbrace}}% - \def\rbracechar{{\indexrbrace}}% - \let\{=\lbracechar - \let\}=\rbracechar - \indexnonalnumdisappear - \xdef\indexsortkey{}% - \let\sortas=\indexwritesortas - \edef\temp{\the\toks0}% - \setbox\dummybox = \hbox{\temp}% Make sure to execute any \sortas - \ifx\indexsortkey\empty - \xdef\indexsortkey{\temp}% - \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi - \fi - }% - % - % Set up the complete index entry, with both the sort key and - % the original text, including any font commands. We write - % three arguments to \entry to the .?? file (four in the - % subentry case), texindex reduces to two when writing the .??s - % sorted result. - \edef\temp{% - \write\writeto{% - \string\entry{\indexsortkey}{\noexpand\folio}{\the\toks0}}% - }% - \temp -} -\newbox\dummybox % used above - -% Take care of unwanted page breaks/skips around a whatsit: -% -% If a skip is the last thing on the list now, preserve it -% by backing up by \lastskip, doing the \write, then inserting -% the skip again. Otherwise, the whatsit generated by the -% \write or \pdfdest will make \lastskip zero. The result is that -% sequences like this: -% @end defun -% @tindex whatever -% @defun ... -% will have extra space inserted, because the \medbreak in the -% start of the @defun won't see the skip inserted by the @end of -% the previous defun. -% -% But don't do any of this if we're not in vertical mode. We -% don't want to do a \vskip and prematurely end a paragraph. -% -% Avoid page breaks due to these extra skips, too. -% -% But wait, there is a catch there: -% We'll have to check whether \lastskip is zero skip. \ifdim is not -% sufficient for this purpose, as it ignores stretch and shrink parts -% of the skip. The only way seems to be to check the textual -% representation of the skip. -% -% The following is almost like \def\zeroskipmacro{0.0pt} except that -% the ``p'' and ``t'' characters have catcode \other, not 11 (letter). -% -\edef\zeroskipmacro{\expandafter\the\csname z@skip\endcsname} -% -\newskip\whatsitskip -\newcount\whatsitpenalty -% -% ..., ready, GO: -% -\def\safewhatsit#1{\ifhmode - #1% - \else - % \lastskip and \lastpenalty cannot both be nonzero simultaneously. - \whatsitskip = \lastskip - \edef\lastskipmacro{\the\lastskip}% - \whatsitpenalty = \lastpenalty - % - % If \lastskip is nonzero, that means the last item was a - % skip. And since a skip is discardable, that means this - % -\whatsitskip glue we're inserting is preceded by a - % non-discardable item, therefore it is not a potential - % breakpoint, therefore no \nobreak needed. - \ifx\lastskipmacro\zeroskipmacro - \else - \vskip-\whatsitskip - \fi - % - #1% - % - \ifx\lastskipmacro\zeroskipmacro - % If \lastskip was zero, perhaps the last item was a penalty, and - % perhaps it was >=10000, e.g., a \nobreak. In that case, we want - % to re-insert the same penalty (values >10000 are used for various - % signals); since we just inserted a non-discardable item, any - % following glue (such as a \parskip) would be a breakpoint. For example: - % @deffn deffn-whatever - % @vindex index-whatever - % Description. - % would allow a break between the index-whatever whatsit - % and the "Description." paragraph. - \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi - \else - % On the other hand, if we had a nonzero \lastskip, - % this make-up glue would be preceded by a non-discardable item - % (the whatsit from the \write), so we must insert a \nobreak. - \nobreak\vskip\whatsitskip - \fi -\fi} - -% The index entry written in the file actually looks like -% \entry {sortstring}{page}{topic} -% or -% \entry {sortstring}{page}{topic}{subtopic} -% The texindex program reads in these files and writes files -% containing these kinds of lines: -% \initial {c} -% before the first topic whose initial is c -% \entry {topic}{pagelist} -% for a topic that is used without subtopics -% \primary {topic} -% for the beginning of a topic that is used with subtopics -% \secondary {subtopic}{pagelist} -% for each subtopic. - -% Define the user-accessible indexing commands -% @findex, @vindex, @kindex, @cindex. - -\def\findex {\fnindex} -\def\kindex {\kyindex} -\def\cindex {\cpindex} -\def\vindex {\vrindex} -\def\tindex {\tpindex} -\def\pindex {\pgindex} - -\def\cindexsub {\begingroup\obeylines\cindexsub} -{\obeylines % -\gdef\cindexsub "#1" #2^^M{\endgroup % -\dosubind{cp}{#2}{#1}}} - -% Define the macros used in formatting output of the sorted index material. - -% @printindex causes a particular index (the ??s file) to get printed. -% It does not print any chapter heading (usually an @unnumbered). -% -\parseargdef\printindex{\begingroup - \dobreak \chapheadingskip{10000}% - % - \smallfonts \rm - \tolerance = 9500 - \plainfrenchspacing - \everypar = {}% don't want the \kern\-parindent from indentation suppression. - % - % See if the index file exists and is nonempty. - % Change catcode of @ here so that if the index file contains - % \initial {@} - % as its first line, TeX doesn't complain about mismatched braces - % (because it thinks @} is a control sequence). - \catcode`\@ = 11 - % See comment in \requireopenindexfile. - \def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi - \openin 1 \jobname.\indexname s - \ifeof 1 - % \enddoublecolumns gets confused if there is no text in the index, - % and it loses the chapter title and the aux file entries for the - % index. The easiest way to prevent this problem is to make sure - % there is some text. - \putwordIndexNonexistent - \else - \catcode`\\ = 0 - \escapechar = `\\ - % - % If the index file exists but is empty, then \openin leaves \ifeof - % false. We have to make TeX try to read something from the file, so - % it can discover if there is anything in it. - \read 1 to \thisline - \ifeof 1 - \putwordIndexIsEmpty - \else - % Index files are almost Texinfo source, but we use \ as the escape - % character. It would be better to use @, but that's too big a change - % to make right now. - \def\indexbackslash{\ttbackslash}% - \let\indexlbrace\{ % Likewise, set these sequences for braces - \let\indexrbrace\} % used in the sort key. - \begindoublecolumns - \let\entryorphanpenalty=\indexorphanpenalty - % - % Read input from the index file line by line. - \loopdo - \ifeof1 - \let\firsttoken\relax - \else - \read 1 to \nextline - \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}% - \act - \fi - \thisline - % - \ifeof1\else - \let\thisline\nextline - \repeat - %% - \enddoublecolumns - \fi - \fi - \closein 1 -\endgroup} - -\def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken} -\long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1} - -\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx} -\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next} - -% These macros are used by the sorted index file itself. -% Change them to control the appearance of the index. - -{\catcode`\/=13 \catcode`\-=13 \catcode`\^=13 \catcode`\~=13 \catcode`\_=13 -\catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13 -\catcode`\$=3 -\gdef\initialglyphs{% - % Some changes for non-alphabetic characters. Using the glyphs from the - % math fonts looks more consistent than the typewriter font used elsewhere - % for these characters. - \def\indexbackslash{\math{\backslash}}% - \let\\=\indexbackslash - % - % Can't get bold backslash so don't use bold forward slash - \catcode`\/=13 - \def/{{\secrmnotbold \normalslash}}% - \def-{{\normaldash\normaldash}}% en dash `--' - \def^{{\chapbf \normalcaret}}% - \def~{{\chapbf \normaltilde}}% - \def\_{% - \leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }% - \def|{$\vert$}% - \def<{$\less$}% - \def>{$\gtr$}% - \def+{$\normalplus$}% -}} - -\def\initial{% - \bgroup - \initialglyphs - \initialx -} - -\def\initialx#1{% - % Remove any glue we may have, we'll be inserting our own. - \removelastskip - % - % We like breaks before the index initials, so insert a bonus. - % The glue before the bonus allows a little bit of space at the - % bottom of a column to reduce an increase in inter-line spacing. - \nobreak - \vskip 0pt plus 5\baselineskip - \penalty -300 - \vskip 0pt plus -5\baselineskip - % - % Typeset the initial. Making this add up to a whole number of - % baselineskips increases the chance of the dots lining up from column - % to column. It still won't often be perfect, because of the stretch - % we need before each entry, but it's better. - % - % No shrink because it confuses \balancecolumns. - \vskip 1.67\baselineskip plus 1\baselineskip - \leftline{\secfonts \kern-0.05em \secbf #1}% - % \secfonts is inside the argument of \leftline so that the change of - % \baselineskip will not affect any glue inserted before the vbox that - % \leftline creates. - % Do our best not to break after the initial. - \nobreak - \vskip .33\baselineskip plus .1\baselineskip - \egroup % \initialglyphs -} - -\newdimen\entryrightmargin -\entryrightmargin=0pt - -% \entry typesets a paragraph consisting of the text (#1), dot leaders, and -% then page number (#2) flushed to the right margin. It is used for index -% and table of contents entries. The paragraph is indented by \leftskip. -% -\def\entry{% - \begingroup - % - % Start a new paragraph if necessary, so our assignments below can't - % affect previous text. - \par - % - % No extra space above this paragraph. - \parskip = 0in - % - % When reading the text of entry, convert explicit line breaks - % from @* into spaces. The user might give these in long section - % titles, for instance. - \def\*{\unskip\space\ignorespaces}% - \def\entrybreak{\hfil\break}% An undocumented command - % - % A bit of stretch before each entry for the benefit of balancing - % columns. - \vskip 0pt plus0.5pt - % - % Swallow the left brace of the text (first parameter): - \afterassignment\doentry - \let\temp = -} -\def\entrybreak{\unskip\space\ignorespaces}% -\def\doentry{% - % Save the text of the entry - \global\setbox\boxA=\hbox\bgroup - \bgroup % Instead of the swallowed brace. - \noindent - \aftergroup\finishentry - % And now comes the text of the entry. - % Not absorbing as a macro argument reduces the chance of problems - % with catcodes occurring. -} -{\catcode`\@=11 -\gdef\finishentry#1{% - \egroup % end box A - \dimen@ = \wd\boxA % Length of text of entry - \global\setbox\boxA=\hbox\bgroup\unhbox\boxA - % #1 is the page number. - % - % Get the width of the page numbers, and only use - % leaders if they are present. - \global\setbox\boxB = \hbox{#1}% - \ifdim\wd\boxB = 0pt - \null\nobreak\hfill\ % - \else - % - \null\nobreak\indexdotfill % Have leaders before the page number. - % - \ifpdf - \pdfgettoks#1.% - \bgroup\let\domark\relax - \hskip\skip\thinshrinkable\the\toksA - \egroup - % The redefinion of \domark stops marks being added in \pdflink to - % preserve coloured links across page boundaries. Otherwise the marks - % would get in the way of \lastbox in \insertindexentrybox. - \else - \hskip\skip\thinshrinkable #1% - \fi - \fi - \egroup % end \boxA - \ifdim\wd\boxB = 0pt - \global\setbox\entryindexbox=\vbox{\unhbox\boxA}% - \else - \global\setbox\entryindexbox=\vbox\bgroup - \prevdepth=\entrylinedepth - \noindent - % We want the text of the entries to be aligned to the left, and the - % page numbers to be aligned to the right. - % - \advance\leftskip by 0pt plus 1fil - \advance\leftskip by 0pt plus -1fill - \rightskip = 0pt plus -1fil - \advance\rightskip by 0pt plus 1fill - % Cause last line, which could consist of page numbers on their own - % if the list of page numbers is long, to be aligned to the right. - \parfillskip=0pt plus -1fill - % - \hangindent=1em - % - \advance\rightskip by \entryrightmargin - % Determine how far we can stretch into the margin. - % This allows, e.g., "Appendix H GNU Free Documentation License" to - % fit on one line in @letterpaper format. - \ifdim\entryrightmargin>2.1em - \dimen@i=2.1em - \else - \dimen@i=0em - \fi - \advance \parfillskip by 0pt minus 1\dimen@i - % - \dimen@ii = \hsize - \advance\dimen@ii by -1\leftskip - \advance\dimen@ii by -1\entryrightmargin - \advance\dimen@ii by 1\dimen@i - \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line - \ifdim\dimen@ > 0.8\dimen@ii % due to long index text - \dimen@ = 0.7\dimen@ % Try to split the text roughly evenly - \dimen@ii = \hsize - \advance \dimen@ii by -1em - \ifnum\dimen@>\dimen@ii - % If the entry is too long, use the whole line - \dimen@ = \dimen@ii - \fi - \advance\leftskip by 0pt plus 1fill % ragged right - \advance \dimen@ by 1\rightskip - \parshape = 2 0pt \dimen@ 1em \dimen@ii - % Ideally we'd add a finite glue at the end of the first line only, but - % TeX doesn't seem to provide a way to do such a thing. - \fi\fi - \unhbox\boxA - % - % Do not prefer a separate line ending with a hyphen to fewer lines. - \finalhyphendemerits = 0 - % - % Word spacing - no stretch - \spaceskip=\fontdimen2\font minus \fontdimen4\font - % - \linepenalty=1000 % Discourage line breaks. - \hyphenpenalty=5000 % Discourage hyphenation. - % - \par % format the paragraph - \egroup % The \vbox - \fi - \endgroup - % delay text of entry until after penalty - \bgroup\aftergroup\insertindexentrybox - \entryorphanpenalty -}} - -\newskip\thinshrinkable -\skip\thinshrinkable=.15em minus .15em - -\newbox\entryindexbox -\def\insertindexentrybox{% - \copy\entryindexbox - % The following gets the depth of the last box. This is for even - % line spacing when entries span several lines. - \setbox\dummybox\vbox{% - \unvbox\entryindexbox - \nointerlineskip - \lastbox - \global\entrylinedepth=\prevdepth - }% - % Note that we couldn't simply \unvbox\entryindexbox followed by - % \nointerlineskip\lastbox to remove the last box and then reinstate it, - % because this resets how far the box has been \moveleft'ed to 0. \unvbox - % doesn't affect \prevdepth either. -} -\newdimen\entrylinedepth - -% Default is no penalty -\let\entryorphanpenalty\egroup - -% Used from \printindex. \firsttoken should be the first token -% after the \entry. If it's not another \entry, we are at the last -% line of a group of index entries, so insert a penalty to discourage -% orphaned index entries. -\long\def\indexorphanpenalty{% - \def\isentry{\entry}% - \ifx\firsttoken\isentry - \else - \unskip\penalty 9000 - % The \unskip here stops breaking before the glue. It relies on the - % \vskip above being there, otherwise there is an error - % "You can't use `\unskip' in vertical mode". There has to be glue - % in the current vertical list that hasn't been added to the - % "current page". See Chapter 24 of the TeXbook. This contradicts - % Section 8.3.7 in "TeX by Topic," though. - \fi - \egroup % now comes the box added with \aftergroup -} - -% Like plain.tex's \dotfill, except uses up at least 1 em. -% The filll stretch here overpowers both the fil and fill stretch to push -% the page number to the right. -\def\indexdotfill{\cleaders - \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1filll} - - -\def\primary #1{\line{#1\hfil}} - -\newskip\secondaryindent \secondaryindent=0.5cm -\def\secondary#1#2{{% - \parfillskip=0in - \parskip=0in - \hangindent=1in - \hangafter=1 - \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill - \ifpdf - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. - \else - #2 - \fi - \par -}} - -% Define two-column mode, which we use to typeset indexes. -% Adapted from the TeXbook, page 416, which is to say, -% the manmac.tex format used to print the TeXbook itself. -\catcode`\@=11 % private names - -\newbox\partialpage -\newdimen\doublecolumnhsize -\newdimen\doublecolumntopgap -\doublecolumntopgap = 0pt - -% Use inside an output routine to save \topmark and \firstmark -\def\savemarks{% - \global\savedtopmark=\expandafter{\topmark }% - \global\savedfirstmark=\expandafter{\firstmark }% -} -\newtoks\savedtopmark -\newtoks\savedfirstmark - -% Set \topmark and \firstmark for next time \output runs. -% Can't be run from withinside \output (because any material -% added while an output routine is active, including -% penalties, is saved for after it finishes). The page so far -% should be empty, otherwise what's on it will be thrown away. -\def\restoremarks{% - \mark{\the\savedtopmark}% - \bgroup\output = {% - \setbox\dummybox=\box\PAGE - }abc\eject\egroup - % "abc" because output routine doesn't fire for a completely empty page. - \mark{\the\savedfirstmark}% -} - -\def\begindoublecolumns{\begingroup % ended by \enddoublecolumns - % If not much space left on page, start a new page. - \ifdim\pagetotal>0.8\vsize\vfill\eject\fi - % - % Grab any single-column material above us. - \output = {% - % - % Here is a possibility not foreseen in manmac: if we accumulate a - % whole lot of material, we might end up calling this \output - % routine twice in a row (see the doublecol-lose test, which is - % essentially a couple of indexes with @setchapternewpage off). In - % that case we just ship out what is in \partialpage with the normal - % output routine. Generally, \partialpage will be empty when this - % runs and this will be a no-op. See the indexspread.tex test case. - \ifvoid\partialpage \else - \onepageout{\pagecontents\partialpage}% - \fi - % - \global\setbox\partialpage = \vbox{% - % Unvbox the main output page. - \unvbox\PAGE - \kern-\topskip \kern\baselineskip - }% - \savemarks - }% - \eject % run that output routine to set \partialpage - \restoremarks - % - % We recover the two marks that the last output routine saved in order - % to propagate the information in marks added around a chapter heading, - % which could be otherwise be lost by the time the final page is output. - % - % - % Use the double-column output routine for subsequent pages. - \output = {\doublecolumnout}% - % - % Change the page size parameters. We could do this once outside this - % routine, in each of @smallbook, @afourpaper, and the default 8.5x11 - % format, but then we repeat the same computation. Repeating a couple - % of assignments once per index is clearly meaningless for the - % execution time, so we may as well do it in one place. - % - % First we halve the line length, less a little for the gutter between - % the columns. We compute the gutter based on the line length, so it - % changes automatically with the paper format. The magic constant - % below is chosen so that the gutter has the same value (well, +-<1pt) - % as it did when we hard-coded it. - % - % We put the result in a separate register, \doublecolumhsize, so we - % can restore it in \pagesofar, after \hsize itself has (potentially) - % been clobbered. - % - \doublecolumnhsize = \hsize - \advance\doublecolumnhsize by -.04154\hsize - \divide\doublecolumnhsize by 2 - \hsize = \doublecolumnhsize - % - % Double the \vsize as well. (We don't need a separate register here, - % since nobody clobbers \vsize.) - \global\doublecolumntopgap = \topskip - \global\advance\doublecolumntopgap by -1\baselineskip - \advance\vsize by -1\doublecolumntopgap - \vsize = 2\vsize - \topskip=0pt - \global\entrylinedepth=0pt\relax -} - -% The double-column output routine for all double-column pages except -% the last, which is done by \balancecolumns. -% -\def\doublecolumnout{% - % - \splittopskip=\topskip \splitmaxdepth=\maxdepth - % Get the available space for the double columns -- the normal - % (undoubled) page height minus any material left over from the - % previous page. - \dimen@ = \vsize - \divide\dimen@ by 2 - \advance\dimen@ by -\ht\partialpage - % - % box0 will be the left-hand column, box2 the right. - \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@ - \onepageout\pagesofar - \unvbox255 - \penalty\outputpenalty -} -% -% Re-output the contents of the output page -- any previous material, -% followed by the two boxes we just split, in box0 and box2. -\def\pagesofar{% - \unvbox\partialpage - % - \hsize = \doublecolumnhsize - \wd0=\hsize \wd2=\hsize - \vbox{% - \vskip\doublecolumntopgap - \hbox to\pagewidth{\box0\hfil\box2}}% -} - - -% Finished with with double columns. -\def\enddoublecolumns{% - % The following penalty ensures that the page builder is exercised - % _before_ we change the output routine. This is necessary in the - % following situation: - % - % The last section of the index consists only of a single entry. - % Before this section, \pagetotal is less than \pagegoal, so no - % break occurs before the last section starts. However, the last - % section, consisting of \initial and the single \entry, does not - % fit on the page and has to be broken off. Without the following - % penalty the page builder will not be exercised until \eject - % below, and by that time we'll already have changed the output - % routine to the \balancecolumns version, so the next-to-last - % double-column page will be processed with \balancecolumns, which - % is wrong: The two columns will go to the main vertical list, with - % the broken-off section in the recent contributions. As soon as - % the output routine finishes, TeX starts reconsidering the page - % break. The two columns and the broken-off section both fit on the - % page, because the two columns now take up only half of the page - % goal. When TeX sees \eject from below which follows the final - % section, it invokes the new output routine that we've set after - % \balancecolumns below; \onepageout will try to fit the two columns - % and the final section into the vbox of \pageheight (see - % \pagebody), causing an overfull box. - % - % Note that glue won't work here, because glue does not exercise the - % page builder, unlike penalties (see The TeXbook, pp. 280-281). - \penalty0 - % - \output = {% - % Split the last of the double-column material. - \savemarks - \balancecolumns - % - % Having called \balancecolumns once, we do not - % want to call it again. Therefore, reset \output to its normal - % definition right away. - \global\output = {\onepageout{\pagecontents\PAGE}}% - }% - \eject - \endgroup % started in \begindoublecolumns - \restoremarks - % Leave the double-column material on the current page, no automatic - % page break. - \box\balancedcolumns - % - % \pagegoal was set to the doubled \vsize above, since we restarted - % the current page. We're now back to normal single-column - % typesetting, so reset \pagegoal to the normal \vsize (after the - % \endgroup where \vsize got restored). - \pagegoal = \vsize -} -\newbox\balancedcolumns -\setbox\balancedcolumns=\vbox{shouldnt see this}% -% -% Only called for the last of the double column material. \doublecolumnout -% does the others. -\def\balancecolumns{% - \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120. - \dimen@ = \ht0 - \advance\dimen@ by \topskip - \advance\dimen@ by-\baselineskip - \ifdim\dimen@<14\baselineskip - % Don't split a short final column in two. - \setbox2=\vbox{}% - \else - \divide\dimen@ by 2 % target to split to - \dimen@ii = \dimen@ - \splittopskip = \topskip - % Loop until the second column is no higher than the first - {% - \vbadness = 10000 - \loop - \global\setbox3 = \copy0 - \global\setbox1 = \vsplit3 to \dimen@ - % Remove glue from bottom of first column to - % make sure it is higher than the second. - \global\setbox1 = \vbox{\unvbox1\unpenalty\unskip}% - \ifdim\ht3>\ht1 - \global\advance\dimen@ by 1pt - \repeat - }% - \multiply\dimen@ii by 4 - \divide\dimen@ii by 5 - \ifdim\ht3<\dimen@ii - % Column heights are too different, so don't make their bottoms - % flush with each other. The glue at the end of the second column - % allows a second column to stretch, reducing the difference in - % height between the two. - \setbox0=\vbox to\dimen@{\unvbox1\vfill}% - \setbox2=\vbox to\dimen@{\unvbox3\vskip 0pt plus 0.3\ht0}% - \else - \setbox0=\vbox to\dimen@{\unvbox1}% - \setbox2=\vbox to\dimen@{\unvbox3}% - \fi - \fi - % - \global\setbox\balancedcolumns=\vbox{\pagesofar}% -} -\catcode`\@ = \other - - -\message{sectioning,} -% Chapters, sections, etc. - -% Let's start with @part. -\outer\parseargdef\part{\partzzz{#1}} -\def\partzzz#1{% - \chapoddpage - \null - \vskip.3\vsize % move it down on the page a bit - \begingroup - \noindent \titlefonts\rmisbold #1\par % the text - \let\lastnode=\empty % no node to associate with - \writetocentry{part}{#1}{}% but put it in the toc - \headingsoff % no headline or footline on the part page - % This outputs a mark at the end of the page that clears \thischapter - % and \thissection, as is done in \startcontents. - \let\pchapsepmacro\relax - \chapmacro{}{Yomitfromtoc}{}% - \chapoddpage - \endgroup -} - -% \unnumberedno is an oxymoron. But we count the unnumbered -% sections so that we can refer to them unambiguously in the pdf -% outlines by their "section number". We avoid collisions with chapter -% numbers by starting them at 10000. (If a document ever has 10000 -% chapters, we're in trouble anyway, I'm sure.) -\newcount\unnumberedno \unnumberedno = 10000 -\newcount\chapno -\newcount\secno \secno=0 -\newcount\subsecno \subsecno=0 -\newcount\subsubsecno \subsubsecno=0 - -% This counter is funny since it counts through charcodes of letters A, B, ... -\newcount\appendixno \appendixno = `\@ -% -% \def\appendixletter{\char\the\appendixno} -% We do the following ugly conditional instead of the above simple -% construct for the sake of pdftex, which needs the actual -% letter in the expansion, not just typeset. -% -\def\appendixletter{% - \ifnum\appendixno=`A A% - \else\ifnum\appendixno=`B B% - \else\ifnum\appendixno=`C C% - \else\ifnum\appendixno=`D D% - \else\ifnum\appendixno=`E E% - \else\ifnum\appendixno=`F F% - \else\ifnum\appendixno=`G G% - \else\ifnum\appendixno=`H H% - \else\ifnum\appendixno=`I I% - \else\ifnum\appendixno=`J J% - \else\ifnum\appendixno=`K K% - \else\ifnum\appendixno=`L L% - \else\ifnum\appendixno=`M M% - \else\ifnum\appendixno=`N N% - \else\ifnum\appendixno=`O O% - \else\ifnum\appendixno=`P P% - \else\ifnum\appendixno=`Q Q% - \else\ifnum\appendixno=`R R% - \else\ifnum\appendixno=`S S% - \else\ifnum\appendixno=`T T% - \else\ifnum\appendixno=`U U% - \else\ifnum\appendixno=`V V% - \else\ifnum\appendixno=`W W% - \else\ifnum\appendixno=`X X% - \else\ifnum\appendixno=`Y Y% - \else\ifnum\appendixno=`Z Z% - % The \the is necessary, despite appearances, because \appendixletter is - % expanded while writing the .toc file. \char\appendixno is not - % expandable, thus it is written literally, thus all appendixes come out - % with the same letter (or @) in the toc without it. - \else\char\the\appendixno - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi - \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi} - -% Each @chapter defines these (using marks) as the number+name, number -% and name of the chapter. Page headings and footings can use -% these. @section does likewise. -\def\thischapter{} -\def\thischapternum{} -\def\thischaptername{} -\def\thissection{} -\def\thissectionnum{} -\def\thissectionname{} - -\newcount\absseclevel % used to calculate proper heading level -\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count - -% @raisesections: treat @section as chapter, @subsection as section, etc. -\def\raisesections{\global\advance\secbase by -1} -\let\up=\raisesections % original BFox name - -% @lowersections: treat @chapter as section, @section as subsection, etc. -\def\lowersections{\global\advance\secbase by 1} -\let\down=\lowersections % original BFox name - -% we only have subsub. -\chardef\maxseclevel = 3 -% -% A numbered section within an unnumbered changes to unnumbered too. -% To achieve this, remember the "biggest" unnum. sec. we are currently in: -\chardef\unnlevel = \maxseclevel -% -% Trace whether the current chapter is an appendix or not: -% \chapheadtype is "N" or "A", unnumbered chapters are ignored. -\def\chapheadtype{N} - -% Choose a heading macro -% #1 is heading type -% #2 is heading level -% #3 is text for heading -\def\genhead#1#2#3{% - % Compute the abs. sec. level: - \absseclevel=#2 - \advance\absseclevel by \secbase - % Make sure \absseclevel doesn't fall outside the range: - \ifnum \absseclevel < 0 - \absseclevel = 0 - \else - \ifnum \absseclevel > 3 - \absseclevel = 3 - \fi - \fi - % The heading type: - \def\headtype{#1}% - \if \headtype U% - \ifnum \absseclevel < \unnlevel - \chardef\unnlevel = \absseclevel - \fi - \else - % Check for appendix sections: - \ifnum \absseclevel = 0 - \edef\chapheadtype{\headtype}% - \else - \if \headtype A\if \chapheadtype N% - \errmessage{@appendix... within a non-appendix chapter}% - \fi\fi - \fi - % Check for numbered within unnumbered: - \ifnum \absseclevel > \unnlevel - \def\headtype{U}% - \else - \chardef\unnlevel = 3 - \fi - \fi - % Now print the heading: - \if \headtype U% - \ifcase\absseclevel - \unnumberedzzz{#3}% - \or \unnumberedseczzz{#3}% - \or \unnumberedsubseczzz{#3}% - \or \unnumberedsubsubseczzz{#3}% - \fi - \else - \if \headtype A% - \ifcase\absseclevel - \appendixzzz{#3}% - \or \appendixsectionzzz{#3}% - \or \appendixsubseczzz{#3}% - \or \appendixsubsubseczzz{#3}% - \fi - \else - \ifcase\absseclevel - \chapterzzz{#3}% - \or \seczzz{#3}% - \or \numberedsubseczzz{#3}% - \or \numberedsubsubseczzz{#3}% - \fi - \fi - \fi - \suppressfirstparagraphindent -} - -% an interface: -\def\numhead{\genhead N} -\def\apphead{\genhead A} -\def\unnmhead{\genhead U} - -% @chapter, @appendix, @unnumbered. Increment top-level counter, reset -% all lower-level sectioning counters to zero. -% -% Also set \chaplevelprefix, which we prepend to @float sequence numbers -% (e.g., figures), q.v. By default (before any chapter), that is empty. -\let\chaplevelprefix = \empty -% -\outer\parseargdef\chapter{\numhead0{#1}} % normally numhead0 calls chapterzzz -\def\chapterzzz#1{% - % section resetting is \global in case the chapter is in a group, such - % as an @include file. - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\chapno by 1 - % - % Used for \float. - \gdef\chaplevelprefix{\the\chapno.}% - \resetallfloatnos - % - % \putwordChapter can contain complex things in translations. - \toks0=\expandafter{\putwordChapter}% - \message{\the\toks0 \space \the\chapno}% - % - % Write the actual heading. - \chapmacro{#1}{Ynumbered}{\the\chapno}% - % - % So @section and the like are numbered underneath this chapter. - \global\let\section = \numberedsec - \global\let\subsection = \numberedsubsec - \global\let\subsubsection = \numberedsubsubsec -} - -\outer\parseargdef\appendix{\apphead0{#1}} % normally calls appendixzzz -% -\def\appendixzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\appendixno by 1 - \gdef\chaplevelprefix{\appendixletter.}% - \resetallfloatnos - % - % \putwordAppendix can contain complex things in translations. - \toks0=\expandafter{\putwordAppendix}% - \message{\the\toks0 \space \appendixletter}% - % - \chapmacro{#1}{Yappendix}{\appendixletter}% - % - \global\let\section = \appendixsec - \global\let\subsection = \appendixsubsec - \global\let\subsubsection = \appendixsubsubsec -} - -% normally unnmhead0 calls unnumberedzzz: -\outer\parseargdef\unnumbered{\unnmhead0{#1}} -\def\unnumberedzzz#1{% - \global\secno=0 \global\subsecno=0 \global\subsubsecno=0 - \global\advance\unnumberedno by 1 - % - % Since an unnumbered has no number, no prefix for figures. - \global\let\chaplevelprefix = \empty - \resetallfloatnos - % - % This used to be simply \message{#1}, but TeX fully expands the - % argument to \message. Therefore, if #1 contained @-commands, TeX - % expanded them. For example, in `@unnumbered The @cite{Book}', TeX - % expanded @cite (which turns out to cause errors because \cite is meant - % to be executed, not expanded). - % - % Anyway, we don't want the fully-expanded definition of @cite to appear - % as a result of the \message, we just want `@cite' itself. We use - % \the to achieve this: TeX expands \the only once, - % simply yielding the contents of . (We also do this for - % the toc entries.) - \toks0 = {#1}% - \message{(\the\toks0)}% - % - \chapmacro{#1}{Ynothing}{\the\unnumberedno}% - % - \global\let\section = \unnumberedsec - \global\let\subsection = \unnumberedsubsec - \global\let\subsubsection = \unnumberedsubsubsec -} - -% @centerchap is like @unnumbered, but the heading is centered. -\outer\parseargdef\centerchap{% - \let\centerparametersmaybe = \centerparameters - \unnmhead0{#1}% - \let\centerparametersmaybe = \relax -} - -% @top is like @unnumbered. -\let\top\unnumbered - -% Sections. -% -\outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz -\def\seczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynumbered}{\the\chapno.\the\secno}% -} - -% normally calls appendixsectionzzz: -\outer\parseargdef\appendixsection{\apphead1{#1}} -\def\appendixsectionzzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Yappendix}{\appendixletter.\the\secno}% -} -\let\appendixsec\appendixsection - -% normally calls unnumberedseczzz: -\outer\parseargdef\unnumberedsec{\unnmhead1{#1}} -\def\unnumberedseczzz#1{% - \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 - \sectionheading{#1}{sec}{Ynothing}{\the\unnumberedno.\the\secno}% -} - -% Subsections. -% -% normally calls numberedsubseczzz: -\outer\parseargdef\numberedsubsec{\numhead2{#1}} -\def\numberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynumbered}{\the\chapno.\the\secno.\the\subsecno}% -} - -% normally calls appendixsubseczzz: -\outer\parseargdef\appendixsubsec{\apphead2{#1}} -\def\appendixsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Yappendix}% - {\appendixletter.\the\secno.\the\subsecno}% -} - -% normally calls unnumberedsubseczzz: -\outer\parseargdef\unnumberedsubsec{\unnmhead2{#1}} -\def\unnumberedsubseczzz#1{% - \global\subsubsecno=0 \global\advance\subsecno by 1 - \sectionheading{#1}{subsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno}% -} - -% Subsubsections. -% -% normally numberedsubsubseczzz: -\outer\parseargdef\numberedsubsubsec{\numhead3{#1}} -\def\numberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynumbered}% - {\the\chapno.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% normally appendixsubsubseczzz: -\outer\parseargdef\appendixsubsubsec{\apphead3{#1}} -\def\appendixsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Yappendix}% - {\appendixletter.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% normally unnumberedsubsubseczzz: -\outer\parseargdef\unnumberedsubsubsec{\unnmhead3{#1}} -\def\unnumberedsubsubseczzz#1{% - \global\advance\subsubsecno by 1 - \sectionheading{#1}{subsubsec}{Ynothing}% - {\the\unnumberedno.\the\secno.\the\subsecno.\the\subsubsecno}% -} - -% These macros control what the section commands do, according -% to what kind of chapter we are in (ordinary, appendix, or unnumbered). -% Define them by default for a numbered chapter. -\let\section = \numberedsec -\let\subsection = \numberedsubsec -\let\subsubsection = \numberedsubsubsec - -% Define @majorheading, @heading and @subheading - -\def\majorheading{% - {\advance\chapheadingskip by 10pt \chapbreak }% - \parsearg\chapheadingzzz -} - -\def\chapheading{\chapbreak \parsearg\chapheadingzzz} -\def\chapheadingzzz#1{% - \vbox{\chapfonts \raggedtitlesettings #1\par}% - \nobreak\bigskip \nobreak - \suppressfirstparagraphindent -} - -% @heading, @subheading, @subsubheading. -\parseargdef\heading{\sectionheading{#1}{sec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} -\parseargdef\subheading{\sectionheading{#1}{subsec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} -\parseargdef\subsubheading{\sectionheading{#1}{subsubsec}{Yomitfromtoc}{} - \suppressfirstparagraphindent} - -% These macros generate a chapter, section, etc. heading only -% (including whitespace, linebreaking, etc. around it), -% given all the information in convenient, parsed form. - -% Args are the skip and penalty (usually negative) -\def\dobreak#1#2{\par\ifdim\lastskip<#1\removelastskip\penalty#2\vskip#1\fi} - -% Parameter controlling skip before chapter headings (if needed) -\newskip\chapheadingskip - -% Define plain chapter starts, and page on/off switching for it. -\def\chapbreak{\dobreak \chapheadingskip {-4000}} - -% Start a new page -\def\chappager{\par\vfill\supereject} - -% \chapoddpage - start on an odd page for a new chapter -% Because \domark is called before \chapoddpage, the filler page will -% get the headings for the next chapter, which is wrong. But we don't -% care -- we just disable all headings on the filler page. -\def\chapoddpage{% - \chappager - \ifodd\pageno \else - \begingroup - \headingsoff - \null - \chappager - \endgroup - \fi -} - -\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname} - -\def\CHAPPAGoff{% -\global\let\contentsalignmacro = \chappager -\global\let\pchapsepmacro=\chapbreak -\global\let\pagealignmacro=\chappager} - -\def\CHAPPAGon{% -\global\let\contentsalignmacro = \chappager -\global\let\pchapsepmacro=\chappager -\global\let\pagealignmacro=\chappager -\global\def\HEADINGSon{\HEADINGSsingle}} - -\def\CHAPPAGodd{% -\global\let\contentsalignmacro = \chapoddpage -\global\let\pchapsepmacro=\chapoddpage -\global\let\pagealignmacro=\chapoddpage -\global\def\HEADINGSon{\HEADINGSdouble}} - -\CHAPPAGon - -% \chapmacro - Chapter opening. -% -% #1 is the text, #2 is the section type (Ynumbered, Ynothing, -% Yappendix, Yomitfromtoc), #3 the chapter number. -% Not used for @heading series. -% -% To test against our argument. -\def\Ynothingkeyword{Ynothing} -\def\Yappendixkeyword{Yappendix} -\def\Yomitfromtockeyword{Yomitfromtoc} -% -\def\chapmacro#1#2#3{% - \checkenv{}% chapters, etc., should not start inside an environment. - % - % Insert the first mark before the heading break (see notes for \domark). - \let\prevchapterdefs=\lastchapterdefs - \let\prevsectiondefs=\lastsectiondefs - \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% - \gdef\thissection{}}% - % - \def\temptype{#2}% - \ifx\temptype\Ynothingkeyword - \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% - \gdef\thischapter{\thischaptername}}% - \else\ifx\temptype\Yomitfromtockeyword - \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% - \gdef\thischapter{}}% - \else\ifx\temptype\Yappendixkeyword - \toks0={#1}% - \xdef\lastchapterdefs{% - \gdef\noexpand\thischaptername{\the\toks0}% - \gdef\noexpand\thischapternum{\appendixletter}% - % \noexpand\putwordAppendix avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thischapter{\noexpand\putwordAppendix{} - \noexpand\thischapternum: - \noexpand\thischaptername}% - }% - \else - \toks0={#1}% - \xdef\lastchapterdefs{% - \gdef\noexpand\thischaptername{\the\toks0}% - \gdef\noexpand\thischapternum{\the\chapno}% - % \noexpand\putwordChapter avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thischapter{\noexpand\putwordChapter{} - \noexpand\thischapternum: - \noexpand\thischaptername}% - }% - \fi\fi\fi - % - % Output the mark. Pass it through \safewhatsit, to take care of - % the preceding space. - \safewhatsit\domark - % - % Insert the chapter heading break. - \pchapsepmacro - % - % Now the second mark, after the heading break. No break points - % between here and the heading. - \let\prevchapterdefs=\lastchapterdefs - \let\prevsectiondefs=\lastsectiondefs - \domark - % - {% - \chapfonts \rmisbold - \let\footnote=\errfootnoteheading % give better error message - % - % Have to define \lastsection before calling \donoderef, because the - % xref code eventually uses it. On the other hand, it has to be called - % after \pchapsepmacro, or the headline will change too soon. - \gdef\lastsection{#1}% - % - % Only insert the separating space if we have a chapter/appendix - % number, and don't print the unnumbered ``number''. - \ifx\temptype\Ynothingkeyword - \setbox0 = \hbox{}% - \def\toctype{unnchap}% - \else\ifx\temptype\Yomitfromtockeyword - \setbox0 = \hbox{}% contents like unnumbered, but no toc entry - \def\toctype{omit}% - \else\ifx\temptype\Yappendixkeyword - \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% - \def\toctype{app}% - \else - \setbox0 = \hbox{#3\enspace}% - \def\toctype{numchap}% - \fi\fi\fi - % - % Write the toc entry for this chapter. Must come before the - % \donoderef, because we include the current node name in the toc - % entry, and \donoderef resets it to empty. - \writetocentry{\toctype}{#1}{#3}% - % - % For pdftex, we have to write out the node definition (aka, make - % the pdfdest) after any page break, but before the actual text has - % been typeset. If the destination for the pdf outline is after the - % text, then jumping from the outline may wind up with the text not - % being visible, for instance under high magnification. - \donoderef{#2}% - % - % Typeset the actual heading. - \nobreak % Avoid page breaks at the interline glue. - \vbox{\raggedtitlesettings \hangindent=\wd0 \centerparametersmaybe - \unhbox0 #1\par}% - }% - \nobreak\bigskip % no page break after a chapter title - \nobreak -} - -% @centerchap -- centered and unnumbered. -\let\centerparametersmaybe = \relax -\def\centerparameters{% - \advance\rightskip by 3\rightskip - \leftskip = \rightskip - \parfillskip = 0pt -} - - -% I don't think this chapter style is supported any more, so I'm not -% updating it with the new noderef stuff. We'll see. --karl, 11aug03. -% -\def\setchapterstyle #1 {\csname CHAPF#1\endcsname} -% -\def\unnchfopen #1{% - \chapoddpage - \vbox{\chapfonts \raggedtitlesettings #1\par}% - \nobreak\bigskip\nobreak -} -\def\chfopen #1#2{\chapoddpage {\chapfonts -\vbox to 3in{\vfil \hbox to\hsize{\hfil #2} \hbox to\hsize{\hfil #1} \vfil}}% -\par\penalty 5000 % -} -\def\centerchfopen #1{% - \chapoddpage - \vbox{\chapfonts \raggedtitlesettings \hfill #1\hfill}% - \nobreak\bigskip \nobreak -} -\def\CHAPFopen{% - \global\let\chapmacro=\chfopen - \global\let\centerchapmacro=\centerchfopen} - - -% Section titles. These macros combine the section number parts and -% call the generic \sectionheading to do the printing. -% -\newskip\secheadingskip -\def\secheadingbreak{\dobreak \secheadingskip{-1000}} - -% Subsection titles. -\newskip\subsecheadingskip -\def\subsecheadingbreak{\dobreak \subsecheadingskip{-500}} - -% Subsubsection titles. -\def\subsubsecheadingskip{\subsecheadingskip} -\def\subsubsecheadingbreak{\subsecheadingbreak} - - -% Print any size, any type, section title. -% -% #1 is the text of the title, -% #2 is the section level (sec/subsec/subsubsec), -% #3 is the section type (Ynumbered, Ynothing, Yappendix, Yomitfromtoc), -% #4 is the section number. -% -\def\seckeyword{sec} -% -\def\sectionheading#1#2#3#4{% - {% - \def\sectionlevel{#2}% - \def\temptype{#3}% - % - % It is ok for the @heading series commands to appear inside an - % environment (it's been historically allowed, though the logic is - % dubious), but not the others. - \ifx\temptype\Yomitfromtockeyword\else - \checkenv{}% non-@*heading should not be in an environment. - \fi - \let\footnote=\errfootnoteheading - % - % Switch to the right set of fonts. - \csname #2fonts\endcsname \rmisbold - % - % Insert first mark before the heading break (see notes for \domark). - \let\prevsectiondefs=\lastsectiondefs - \ifx\temptype\Ynothingkeyword - \ifx\sectionlevel\seckeyword - \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% - \gdef\thissection{\thissectionname}}% - \fi - \else\ifx\temptype\Yomitfromtockeyword - % Don't redefine \thissection. - \else\ifx\temptype\Yappendixkeyword - \ifx\sectionlevel\seckeyword - \toks0={#1}% - \xdef\lastsectiondefs{% - \gdef\noexpand\thissectionname{\the\toks0}% - \gdef\noexpand\thissectionnum{#4}% - % \noexpand\putwordSection avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thissection{\noexpand\putwordSection{} - \noexpand\thissectionnum: - \noexpand\thissectionname}% - }% - \fi - \else - \ifx\sectionlevel\seckeyword - \toks0={#1}% - \xdef\lastsectiondefs{% - \gdef\noexpand\thissectionname{\the\toks0}% - \gdef\noexpand\thissectionnum{#4}% - % \noexpand\putwordSection avoids expanding indigestible - % commands in some of the translations. - \gdef\noexpand\thissection{\noexpand\putwordSection{} - \noexpand\thissectionnum: - \noexpand\thissectionname}% - }% - \fi - \fi\fi\fi - % - % Go into vertical mode. Usually we'll already be there, but we - % don't want the following whatsit to end up in a preceding paragraph - % if the document didn't happen to have a blank line. - \par - % - % Output the mark. Pass it through \safewhatsit, to take care of - % the preceding space. - \safewhatsit\domark - % - % Insert space above the heading. - \csname #2headingbreak\endcsname - % - % Now the second mark, after the heading break. No break points - % between here and the heading. - \global\let\prevsectiondefs=\lastsectiondefs - \domark - % - % Only insert the space after the number if we have a section number. - \ifx\temptype\Ynothingkeyword - \setbox0 = \hbox{}% - \def\toctype{unn}% - \gdef\lastsection{#1}% - \else\ifx\temptype\Yomitfromtockeyword - % for @headings -- no section number, don't include in toc, - % and don't redefine \lastsection. - \setbox0 = \hbox{}% - \def\toctype{omit}% - \let\sectionlevel=\empty - \else\ifx\temptype\Yappendixkeyword - \setbox0 = \hbox{#4\enspace}% - \def\toctype{app}% - \gdef\lastsection{#1}% - \else - \setbox0 = \hbox{#4\enspace}% - \def\toctype{num}% - \gdef\lastsection{#1}% - \fi\fi\fi - % - % Write the toc entry (before \donoderef). See comments in \chapmacro. - \writetocentry{\toctype\sectionlevel}{#1}{#4}% - % - % Write the node reference (= pdf destination for pdftex). - % Again, see comments in \chapmacro. - \donoderef{#3}% - % - % Interline glue will be inserted when the vbox is completed. - % That glue will be a valid breakpoint for the page, since it'll be - % preceded by a whatsit (usually from the \donoderef, or from the - % \writetocentry if there was no node). We don't want to allow that - % break, since then the whatsits could end up on page n while the - % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000. - \nobreak - % - % Output the actual section heading. - \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \ptexraggedright - \hangindent=\wd0 % zero if no section number - \unhbox0 #1}% - }% - % Add extra space after the heading -- half of whatever came above it. - % Don't allow stretch, though. - \kern .5 \csname #2headingskip\endcsname - % - % Do not let the kern be a potential breakpoint, as it would be if it - % was followed by glue. - \nobreak - % - % We'll almost certainly start a paragraph next, so don't let that - % glue accumulate. (Not a breakpoint because it's preceded by a - % discardable item.) However, when a paragraph is not started next - % (\startdefun, \cartouche, \center, etc.), this needs to be wiped out - % or the negative glue will cause weirdly wrong output, typically - % obscuring the section heading with something else. - \vskip-\parskip - % - % This is so the last item on the main vertical list is a known - % \penalty > 10000, so \startdefun, etc., can recognize the situation - % and do the needful. - \penalty 10001 -} - - -\message{toc,} -% Table of contents. -\newwrite\tocfile - -% Write an entry to the toc file, opening it if necessary. -% Called from @chapter, etc. -% -% Example usage: \writetocentry{sec}{Section Name}{\the\chapno.\the\secno} -% We append the current node name (if any) and page number as additional -% arguments for the \{chap,sec,...}entry macros which will eventually -% read this. The node name is used in the pdf outlines as the -% destination to jump to. -% -% We open the .toc file for writing here instead of at @setfilename (or -% any other fixed time) so that @contents can be anywhere in the document. -% But if #1 is `omit', then we don't do anything. This is used for the -% table of contents chapter openings themselves. -% -\newif\iftocfileopened -\def\omitkeyword{omit}% -% -\def\writetocentry#1#2#3{% - \edef\writetoctype{#1}% - \ifx\writetoctype\omitkeyword \else - \iftocfileopened\else - \immediate\openout\tocfile = \jobname.toc - \global\tocfileopenedtrue - \fi - % - \iflinks - {\atdummies - \edef\temp{% - \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}% - \temp - }% - \fi - \fi - % - % Tell \shipout to create a pdf destination on each page, if we're - % writing pdf. These are used in the table of contents. We can't - % just write one on every page because the title pages are numbered - % 1 and 2 (the page numbers aren't printed), and so are the first - % two pages of the document. Thus, we'd have two destinations named - % `1', and two named `2'. - \ifpdf \global\pdfmakepagedesttrue \fi -} - - -% These characters do not print properly in the Computer Modern roman -% fonts, so we must take special care. This is more or less redundant -% with the Texinfo input format setup at the end of this file. -% -\def\activecatcodes{% - \catcode`\"=\active - \catcode`\$=\active - \catcode`\<=\active - \catcode`\>=\active - \catcode`\\=\active - \catcode`\^=\active - \catcode`\_=\active - \catcode`\|=\active - \catcode`\~=\active -} - - -% Read the toc file, which is essentially Texinfo input. -\def\readtocfile{% - \setupdatafile - \activecatcodes - \input \tocreadfilename -} - -\newskip\contentsrightmargin \contentsrightmargin=1in -\newcount\savepageno -\newcount\lastnegativepageno \lastnegativepageno = -1 - -% Prepare to read what we've written to \tocfile. -% -\def\startcontents#1{% - % If @setchapternewpage on, and @headings double, the contents should - % start on an odd page, unlike chapters. Thus, we maintain - % \contentsalignmacro in parallel with \pagealignmacro. - % From: Torbjorn Granlund - \contentsalignmacro - \immediate\closeout\tocfile - % - % Don't need to put `Contents' or `Short Contents' in the headline. - % It is abundantly clear what they are. - \chapmacro{#1}{Yomitfromtoc}{}% - % - \savepageno = \pageno - \begingroup % Set up to handle contents files properly. - \raggedbottom % Worry more about breakpoints than the bottom. - \entryrightmargin=\contentsrightmargin % Don't use the full line length. - % - % Roman numerals for page numbers. - \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi -} - -% redefined for the two-volume lispref. We always output on -% \jobname.toc even if this is redefined. -% -\def\tocreadfilename{\jobname.toc} - -% Normal (long) toc. -% -\def\contents{% - \startcontents{\putwordTOC}% - \openin 1 \tocreadfilename\space - \ifeof 1 \else - \readtocfile - \fi - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \ifeof 1 \else - \pdfmakeoutlines - \fi - \closein 1 - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno -} - -% And just the chapters. -\def\summarycontents{% - \startcontents{\putwordShortTOC}% - % - \let\partentry = \shortpartentry - \let\numchapentry = \shortchapentry - \let\appentry = \shortchapentry - \let\unnchapentry = \shortunnchapentry - % We want a true roman here for the page numbers. - \secfonts - \let\rm=\shortcontrm \let\bf=\shortcontbf - \let\sl=\shortcontsl \let\tt=\shortconttt - \rm - \hyphenpenalty = 10000 - \advance\baselineskip by 1pt % Open it up a little. - \def\numsecentry##1##2##3##4{} - \let\appsecentry = \numsecentry - \let\unnsecentry = \numsecentry - \let\numsubsecentry = \numsecentry - \let\appsubsecentry = \numsecentry - \let\unnsubsecentry = \numsecentry - \let\numsubsubsecentry = \numsecentry - \let\appsubsubsecentry = \numsecentry - \let\unnsubsubsecentry = \numsecentry - \openin 1 \tocreadfilename\space - \ifeof 1 \else - \readtocfile - \fi - \closein 1 - \vfill \eject - \contentsalignmacro % in case @setchapternewpage odd is in effect - \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno -} -\let\shortcontents = \summarycontents - -% Typeset the label for a chapter or appendix for the short contents. -% The arg is, e.g., `A' for an appendix, or `3' for a chapter. -% -\def\shortchaplabel#1{% - % This space should be enough, since a single number is .5em, and the - % widest letter (M) is 1em, at least in the Computer Modern fonts. - % But use \hss just in case. - % (This space doesn't include the extra space that gets added after - % the label; that gets put in by \shortchapentry above.) - % - % We'd like to right-justify chapter numbers, but that looks strange - % with appendix letters. And right-justifying numbers and - % left-justifying letters looks strange when there is less than 10 - % chapters. Have to read the whole toc once to know how many chapters - % there are before deciding ... - \hbox to 1em{#1\hss}% -} - -% These macros generate individual entries in the table of contents. -% The first argument is the chapter or section name. -% The last argument is the page number. -% The arguments in between are the chapter number, section number, ... - -% Parts, in the main contents. Replace the part number, which doesn't -% exist, with an empty box. Let's hope all the numbers have the same width. -% Also ignore the page number, which is conventionally not printed. -\def\numeralbox{\setbox0=\hbox{8}\hbox to \wd0{\hfil}} -\def\partentry#1#2#3#4{\dochapentry{\numeralbox\labelspace#1}{}} -% -% Parts, in the short toc. -\def\shortpartentry#1#2#3#4{% - \penalty-300 - \vskip.5\baselineskip plus.15\baselineskip minus.1\baselineskip - \shortchapentry{{\bf #1}}{\numeralbox}{}{}% -} - -% Chapters, in the main contents. -\def\numchapentry#1#2#3#4{\dochapentry{#2\labelspace#1}{#4}} - -% Chapters, in the short toc. -% See comments in \dochapentry re vbox and related settings. -\def\shortchapentry#1#2#3#4{% - \tocentry{\shortchaplabel{#2}\labelspace #1}{\doshortpageno\bgroup#4\egroup}% -} - -% Appendices, in the main contents. -% Need the word Appendix, and a fixed-size box. -% -\def\appendixbox#1{% - % We use M since it's probably the widest letter. - \setbox0 = \hbox{\putwordAppendix{} M}% - \hbox to \wd0{\putwordAppendix{} #1\hss}} -% -\def\appentry#1#2#3#4{\dochapentry{\appendixbox{#2}\hskip.7em#1}{#4}} - -% Unnumbered chapters. -\def\unnchapentry#1#2#3#4{\dochapentry{#1}{#4}} -\def\shortunnchapentry#1#2#3#4{\tocentry{#1}{\doshortpageno\bgroup#4\egroup}} - -% Sections. -\def\numsecentry#1#2#3#4{\dosecentry{#2\labelspace#1}{#4}} -\let\appsecentry=\numsecentry -\def\unnsecentry#1#2#3#4{\dosecentry{#1}{#4}} - -% Subsections. -\def\numsubsecentry#1#2#3#4{\dosubsecentry{#2\labelspace#1}{#4}} -\let\appsubsecentry=\numsubsecentry -\def\unnsubsecentry#1#2#3#4{\dosubsecentry{#1}{#4}} - -% And subsubsections. -\def\numsubsubsecentry#1#2#3#4{\dosubsubsecentry{#2\labelspace#1}{#4}} -\let\appsubsubsecentry=\numsubsubsecentry -\def\unnsubsubsecentry#1#2#3#4{\dosubsubsecentry{#1}{#4}} - -% This parameter controls the indentation of the various levels. -% Same as \defaultparindent. -\newdimen\tocindent \tocindent = 15pt - -% Now for the actual typesetting. In all these, #1 is the text and #2 is the -% page number. -% -% If the toc has to be broken over pages, we want it to be at chapters -% if at all possible; hence the \penalty. -\def\dochapentry#1#2{% - \penalty-300 \vskip1\baselineskip plus.33\baselineskip minus.25\baselineskip - \begingroup - % Move the page numbers slightly to the right - \advance\entryrightmargin by -0.05em - \chapentryfonts - \tocentry{#1}{\dopageno\bgroup#2\egroup}% - \endgroup - \nobreak\vskip .25\baselineskip plus.1\baselineskip -} - -\def\dosecentry#1#2{\begingroup - \secentryfonts \leftskip=\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -\def\dosubsecentry#1#2{\begingroup - \subsecentryfonts \leftskip=2\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -\def\dosubsubsecentry#1#2{\begingroup - \subsubsecentryfonts \leftskip=3\tocindent - \tocentry{#1}{\dopageno\bgroup#2\egroup}% -\endgroup} - -% We use the same \entry macro as for the index entries. -\let\tocentry = \entry - -% Space between chapter (or whatever) number and the title. -\def\labelspace{\hskip1em \relax} - -\def\dopageno#1{{\rm #1}} -\def\doshortpageno#1{{\rm #1}} - -\def\chapentryfonts{\secfonts \rm} -\def\secentryfonts{\textfonts} -\def\subsecentryfonts{\textfonts} -\def\subsubsecentryfonts{\textfonts} - - -\message{environments,} -% @foo ... @end foo. - -% @tex ... @end tex escapes into raw TeX temporarily. -% One exception: @ is still an escape character, so that @end tex works. -% But \@ or @@ will get a plain @ character. - -\envdef\tex{% - \setupmarkupstyle{tex}% - \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 - \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 - \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie - \catcode `\%=14 - \catcode `\+=\other - \catcode `\"=\other - \catcode `\|=\other - \catcode `\<=\other - \catcode `\>=\other - \catcode `\`=\other - \catcode `\'=\other - \escapechar=`\\ - % - % ' is active in math mode (mathcode"8000). So reset it, and all our - % other math active characters (just in case), to plain's definitions. - \mathactive - % - % Inverse of the list at the beginning of the file. - \let\b=\ptexb - \let\bullet=\ptexbullet - \let\c=\ptexc - \let\,=\ptexcomma - \let\.=\ptexdot - \let\dots=\ptexdots - \let\equiv=\ptexequiv - \let\!=\ptexexclam - \let\i=\ptexi - \let\indent=\ptexindent - \let\noindent=\ptexnoindent - \let\{=\ptexlbrace - \let\+=\tabalign - \let\}=\ptexrbrace - \let\/=\ptexslash - \let\sp=\ptexsp - \let\*=\ptexstar - %\let\sup=\ptexsup % do not redefine, we want @sup to work in math mode - \let\t=\ptext - \expandafter \let\csname top\endcsname=\ptextop % we've made it outer - \let\frenchspacing=\plainfrenchspacing - % - \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% - \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}% - \def\@{@}% -} -% There is no need to define \Etex. - -% Define @lisp ... @end lisp. -% @lisp environment forms a group so it can rebind things, -% including the definition of @end lisp (which normally is erroneous). - -% Amount to narrow the margins by for @lisp. -\newskip\lispnarrowing \lispnarrowing=0.4in - -% This is the definition that ^^M gets inside @lisp, @example, and other -% such environments. \null is better than a space, since it doesn't -% have any width. -\def\lisppar{\null\endgraf} - -% This space is always present above and below environments. -\newskip\envskipamount \envskipamount = 0pt - -% Make spacing and below environment symmetrical. We use \parskip here -% to help in doing that, since in @example-like environments \parskip -% is reset to zero; thus the \afterenvbreak inserts no space -- but the -% start of the next paragraph will insert \parskip. -% -\def\aboveenvbreak{{% - % =10000 instead of <10000 because of a special case in \itemzzz and - % \sectionheading, q.v. - \ifnum \lastpenalty=10000 \else - \advance\envskipamount by \parskip - \endgraf - \ifdim\lastskip<\envskipamount - \removelastskip - \ifnum\lastpenalty<10000 - % Penalize breaking before the environment, because preceding text - % often leads into it. - \penalty100 - \fi - \vskip\envskipamount - \fi - \fi -}} - -\def\afterenvbreak{{% - % =10000 instead of <10000 because of a special case in \itemzzz and - % \sectionheading, q.v. - \ifnum \lastpenalty=10000 \else - \advance\envskipamount by \parskip - \endgraf - \ifdim\lastskip<\envskipamount - \removelastskip - % it's not a good place to break if the last penalty was \nobreak - % or better ... - \ifnum\lastpenalty<10000 \penalty-50 \fi - \vskip\envskipamount - \fi - \fi -}} - -% \nonarrowing is a flag. If "set", @lisp etc don't narrow margins; it will -% also clear it, so that its embedded environments do the narrowing again. -\let\nonarrowing=\relax - -% @cartouche ... @end cartouche: draw rectangle w/rounded corners around -% environment contents. -\font\circle=lcircle10 -\newdimen\circthick -\newdimen\cartouter\newdimen\cartinner -\newskip\normbskip\newskip\normpskip\newskip\normlskip -\circthick=\fontdimen8\circle -% -\def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth -\def\ctr{{\hskip 6pt\circle\char'010}} -\def\cbl{{\circle\char'012\hskip -6pt}} -\def\cbr{{\hskip 6pt\circle\char'011}} -\def\carttop{\hbox to \cartouter{\hskip\lskip - \ctl\leaders\hrule height\circthick\hfil\ctr - \hskip\rskip}} -\def\cartbot{\hbox to \cartouter{\hskip\lskip - \cbl\leaders\hrule height\circthick\hfil\cbr - \hskip\rskip}} -% -\newskip\lskip\newskip\rskip - -\envdef\cartouche{% - \ifhmode\par\fi % can't be in the midst of a paragraph. - \startsavinginserts - \lskip=\leftskip \rskip=\rightskip - \leftskip=0pt\rightskip=0pt % we want these *outside*. - \cartinner=\hsize \advance\cartinner by-\lskip - \advance\cartinner by-\rskip - \cartouter=\hsize - \advance\cartouter by 18.4pt % allow for 3pt kerns on either - % side, and for 6pt waste from - % each corner char, and rule thickness - \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip - % - % If this cartouche directly follows a sectioning command, we need the - % \parskip glue (backspaced over by default) or the cartouche can - % collide with the section heading. - \ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi - % - \setbox\groupbox=\vbox\bgroup - \baselineskip=0pt\parskip=0pt\lineskip=0pt - \carttop - \hbox\bgroup - \hskip\lskip - \vrule\kern3pt - \vbox\bgroup - \kern3pt - \hsize=\cartinner - \baselineskip=\normbskip - \lineskip=\normlskip - \parskip=\normpskip - \vskip -\parskip - \comment % For explanation, see the end of def\group. -} -\def\Ecartouche{% - \ifhmode\par\fi - \kern3pt - \egroup - \kern3pt\vrule - \hskip\rskip - \egroup - \cartbot - \egroup - \addgroupbox - \checkinserts -} - - -% This macro is called at the beginning of all the @example variants, -% inside a group. -\newdimen\nonfillparindent -\def\nonfillstart{% - \aboveenvbreak - \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy - \sepspaces % Make spaces be word-separators rather than space tokens. - \let\par = \lisppar % don't ignore blank lines - \obeylines % each line of input is a line of output - \parskip = 0pt - % Turn off paragraph indentation but redefine \indent to emulate - % the normal \indent. - \nonfillparindent=\parindent - \parindent = 0pt - \let\indent\nonfillindent - % - \emergencystretch = 0pt % don't try to avoid overfull boxes - \ifx\nonarrowing\relax - \advance \leftskip by \lispnarrowing - \exdentamount=\lispnarrowing - \else - \let\nonarrowing = \relax - \fi - \let\exdent=\nofillexdent -} - -\begingroup -\obeyspaces -% We want to swallow spaces (but not other tokens) after the fake -% @indent in our nonfill-environments, where spaces are normally -% active and set to @tie, resulting in them not being ignored after -% @indent. -\gdef\nonfillindent{\futurelet\temp\nonfillindentcheck}% -\gdef\nonfillindentcheck{% -\ifx\temp % -\expandafter\nonfillindentgobble% -\else% -\leavevmode\nonfillindentbox% -\fi% -}% -\endgroup -\def\nonfillindentgobble#1{\nonfillindent} -\def\nonfillindentbox{\hbox to \nonfillparindent{\hss}} - -% If you want all examples etc. small: @set dispenvsize small. -% If you want even small examples the full size: @set dispenvsize nosmall. -% This affects the following displayed environments: -% @example, @display, @format, @lisp -% -\def\smallword{small} -\def\nosmallword{nosmall} -\let\SETdispenvsize\relax -\def\setnormaldispenv{% - \ifx\SETdispenvsize\smallword - % end paragraph for sake of leading, in case document has no blank - % line. This is redundant with what happens in \aboveenvbreak, but - % we need to do it before changing the fonts, and it's inconvenient - % to change the fonts afterward. - \ifnum \lastpenalty=10000 \else \endgraf \fi - \smallexamplefonts \rm - \fi -} -\def\setsmalldispenv{% - \ifx\SETdispenvsize\nosmallword - \else - \ifnum \lastpenalty=10000 \else \endgraf \fi - \smallexamplefonts \rm - \fi -} - -% We often define two environments, @foo and @smallfoo. -% Let's do it in one command. #1 is the env name, #2 the definition. -\def\makedispenvdef#1#2{% - \expandafter\envdef\csname#1\endcsname {\setnormaldispenv #2}% - \expandafter\envdef\csname small#1\endcsname {\setsmalldispenv #2}% - \expandafter\let\csname E#1\endcsname \afterenvbreak - \expandafter\let\csname Esmall#1\endcsname \afterenvbreak -} - -% Define two environment synonyms (#1 and #2) for an environment. -\def\maketwodispenvdef#1#2#3{% - \makedispenvdef{#1}{#3}% - \makedispenvdef{#2}{#3}% -} -% -% @lisp: indented, narrowed, typewriter font; -% @example: same as @lisp. -% -% @smallexample and @smalllisp: use smaller fonts. -% Originally contributed by Pavel@xerox. -% -\maketwodispenvdef{lisp}{example}{% - \nonfillstart - \tt\setupmarkupstyle{example}% - \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. - \gobble % eat return -} -% @display/@smalldisplay: same as @lisp except keep current font. -% -\makedispenvdef{display}{% - \nonfillstart - \gobble -} - -% @format/@smallformat: same as @display except don't narrow margins. -% -\makedispenvdef{format}{% - \let\nonarrowing = t% - \nonfillstart - \gobble -} - -% @flushleft: same as @format, but doesn't obey \SETdispenvsize. -\envdef\flushleft{% - \let\nonarrowing = t% - \nonfillstart - \gobble -} -\let\Eflushleft = \afterenvbreak - -% @flushright. -% -\envdef\flushright{% - \let\nonarrowing = t% - \nonfillstart - \advance\leftskip by 0pt plus 1fill\relax - \gobble -} -\let\Eflushright = \afterenvbreak - - -% @raggedright does more-or-less normal line breaking but no right -% justification. From plain.tex. Don't stretch around special -% characters in urls in this environment, since the stretch at the right -% should be enough. -\envdef\raggedright{% - \rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax - \def\urefprestretchamount{0pt}% - \def\urefpoststretchamount{0pt}% -} -\let\Eraggedright\par - -\envdef\raggedleft{% - \parindent=0pt \leftskip0pt plus2em - \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt - \hbadness=10000 % Last line will usually be underfull, so turn off - % badness reporting. -} -\let\Eraggedleft\par - -\envdef\raggedcenter{% - \parindent=0pt \rightskip0pt plus1em \leftskip0pt plus1em - \spaceskip.3333em \xspaceskip.5em \parfillskip=0pt - \hbadness=10000 % Last line will usually be underfull, so turn off - % badness reporting. -} -\let\Eraggedcenter\par - - -% @quotation does normal linebreaking (hence we can't use \nonfillstart) -% and narrows the margins. We keep \parskip nonzero in general, since -% we're doing normal filling. So, when using \aboveenvbreak and -% \afterenvbreak, temporarily make \parskip 0. -% -\makedispenvdef{quotation}{\quotationstart} -% -\def\quotationstart{% - \indentedblockstart % same as \indentedblock, but increase right margin too. - \ifx\nonarrowing\relax - \advance\rightskip by \lispnarrowing - \fi - \parsearg\quotationlabel -} - -% We have retained a nonzero parskip for the environment, since we're -% doing normal filling. -% -\def\Equotation{% - \par - \ifx\quotationauthor\thisisundefined\else - % indent a bit. - \leftline{\kern 2\leftskip \sl ---\quotationauthor}% - \fi - {\parskip=0pt \afterenvbreak}% -} -\def\Esmallquotation{\Equotation} - -% If we're given an argument, typeset it in bold with a colon after. -\def\quotationlabel#1{% - \def\temp{#1}% - \ifx\temp\empty \else - {\bf #1: }% - \fi -} - -% @indentedblock is like @quotation, but indents only on the left and -% has no optional argument. -% -\makedispenvdef{indentedblock}{\indentedblockstart} -% -\def\indentedblockstart{% - {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip - \parindent=0pt - % - % @cartouche defines \nonarrowing to inhibit narrowing at next level down. - \ifx\nonarrowing\relax - \advance\leftskip by \lispnarrowing - \exdentamount = \lispnarrowing - \else - \let\nonarrowing = \relax - \fi -} - -% Keep a nonzero parskip for the environment, since we're doing normal filling. -% -\def\Eindentedblock{% - \par - {\parskip=0pt \afterenvbreak}% -} -\def\Esmallindentedblock{\Eindentedblock} - - -% LaTeX-like @verbatim...@end verbatim and @verb{...} -% If we want to allow any as delimiter, -% we need the curly braces so that makeinfo sees the @verb command, eg: -% `@verbx...x' would look like the '@verbx' command. --janneke@gnu.org -% -% [Knuth]: Donald Ervin Knuth, 1996. The TeXbook. -% -% [Knuth] p.344; only we need to do the other characters Texinfo sets -% active too. Otherwise, they get lost as the first character on a -% verbatim line. -\def\dospecials{% - \do\ \do\\\do\{\do\}\do\$\do\&% - \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% - \do\<\do\>\do\|\do\@\do+\do\"% - % Don't do the quotes -- if we do, @set txicodequoteundirected and - % @set txicodequotebacktick will not have effect on @verb and - % @verbatim, and ?` and !` ligatures won't get disabled. - %\do\`\do\'% -} -% -% [Knuth] p. 380 -\def\uncatcodespecials{% - \def\do##1{\catcode`##1=\other}\dospecials} -% -% Setup for the @verb command. -% -% Eight spaces for a tab -\begingroup - \catcode`\^^I=\active - \gdef\tabeightspaces{\catcode`\^^I=\active\def^^I{\ \ \ \ \ \ \ \ }} -\endgroup -% -\def\setupverb{% - \tt % easiest (and conventionally used) font for verbatim - \def\par{\leavevmode\endgraf}% - \setupmarkupstyle{verb}% - \tabeightspaces - % Respect line breaks, - % print special symbols as themselves, and - % make each space count - % must do in this order: - \obeylines \uncatcodespecials \sepspaces -} - -% Setup for the @verbatim environment -% -% Real tab expansion. -\newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount -% -% We typeset each line of the verbatim in an \hbox, so we can handle -% tabs. The \global is in case the verbatim line starts with an accent, -% or some other command that starts with a begin-group. Otherwise, the -% entire \verbbox would disappear at the corresponding end-group, before -% it is typeset. Meanwhile, we can't have nested verbatim commands -% (can we?), so the \global won't be overwriting itself. -\newbox\verbbox -\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} -% -\begingroup - \catcode`\^^I=\active - \gdef\tabexpand{% - \catcode`\^^I=\active - \def^^I{\leavevmode\egroup - \dimen\verbbox=\wd\verbbox % the width so far, or since the previous tab - \divide\dimen\verbbox by\tabw - \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw - \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw - \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox - }% - } -\endgroup - -% start the verbatim environment. -\def\setupverbatim{% - \let\nonarrowing = t% - \nonfillstart - \tt % easiest (and conventionally used) font for verbatim - % The \leavevmode here is for blank lines. Otherwise, we would - % never \starttabox and the \egroup would end verbatim mode. - \def\par{\leavevmode\egroup\box\verbbox\endgraf}% - \tabexpand - \setupmarkupstyle{verbatim}% - % Respect line breaks, - % print special symbols as themselves, and - % make each space count. - % Must do in this order: - \obeylines \uncatcodespecials \sepspaces - \everypar{\starttabbox}% -} - -% Do the @verb magic: verbatim text is quoted by unique -% delimiter characters. Before first delimiter expect a -% right brace, after last delimiter expect closing brace: -% -% \def\doverb'{'#1'}'{#1} -% -% [Knuth] p. 382; only eat outer {} -\begingroup - \catcode`[=1\catcode`]=2\catcode`\{=\other\catcode`\}=\other - \gdef\doverb{#1[\def\next##1#1}[##1\endgroup]\next] -\endgroup -% -\def\verb{\begingroup\setupverb\doverb} -% -% -% Do the @verbatim magic: define the macro \doverbatim so that -% the (first) argument ends when '@end verbatim' is reached, ie: -% -% \def\doverbatim#1@end verbatim{#1} -% -% For Texinfo it's a lot easier than for LaTeX, -% because texinfo's \verbatim doesn't stop at '\end{verbatim}': -% we need not redefine '\', '{' and '}'. -% -% Inspired by LaTeX's verbatim command set [latex.ltx] -% -\begingroup - \catcode`\ =\active - \obeylines % - % ignore everything up to the first ^^M, that's the newline at the end - % of the @verbatim input line itself. Otherwise we get an extra blank - % line in the output. - \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% - % We really want {...\end verbatim} in the body of the macro, but - % without the active space; thus we have to use \xdef and \gobble. -\endgroup -% -\envdef\verbatim{% - \setupverbatim\doverbatim -} -\let\Everbatim = \afterenvbreak - - -% @verbatiminclude FILE - insert text of file in verbatim environment. -% -\def\verbatiminclude{\parseargusing\filenamecatcodes\doverbatiminclude} -% -\def\doverbatiminclude#1{% - {% - \makevalueexpandable - \setupverbatim - \indexnofonts % Allow `@@' and other weird things in file names. - \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% - \input #1 - \afterenvbreak - }% -} - -% @copying ... @end copying. -% Save the text away for @insertcopying later. -% -% We save the uninterpreted tokens, rather than creating a box. -% Saving the text in a box would be much easier, but then all the -% typesetting commands (@smallbook, font changes, etc.) have to be done -% beforehand -- and a) we want @copying to be done first in the source -% file; b) letting users define the frontmatter in as flexible order as -% possible is desirable. -% -\def\copying{\checkenv{}\begingroup\scanargctxt\docopying} -\def\docopying#1@end copying{\endgroup\def\copyingtext{#1}} -% -\def\insertcopying{% - \begingroup - \parindent = 0pt % paragraph indentation looks wrong on title page - \scanexp\copyingtext - \endgroup -} - - -\message{defuns,} -% @defun etc. - -\newskip\defbodyindent \defbodyindent=.4in -\newskip\defargsindent \defargsindent=50pt -\newskip\deflastargmargin \deflastargmargin=18pt -\newcount\defunpenalty - -% Start the processing of @deffn: -\def\startdefun{% - \ifnum\lastpenalty<10000 - \medbreak - \defunpenalty=10003 % Will keep this @deffn together with the - % following @def command, see below. - \else - % If there are two @def commands in a row, we'll have a \nobreak, - % which is there to keep the function description together with its - % header. But if there's nothing but headers, we need to allow a - % break somewhere. Check specifically for penalty 10002, inserted - % by \printdefunline, instead of 10000, since the sectioning - % commands also insert a nobreak penalty, and we don't want to allow - % a break between a section heading and a defun. - % - % As a further refinement, we avoid "club" headers by signalling - % with penalty of 10003 after the very first @deffn in the - % sequence (see above), and penalty of 10002 after any following - % @def command. - \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi - % - % Similarly, after a section heading, do not allow a break. - % But do insert the glue. - \medskip % preceded by discardable penalty, so not a breakpoint - \fi - % - \parindent=0in - \advance\leftskip by \defbodyindent - \exdentamount=\defbodyindent -} - -\def\dodefunx#1{% - % First, check whether we are in the right environment: - \checkenv#1% - % - % As above, allow line break if we have multiple x headers in a row. - % It's not a great place, though. - \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi - % - % And now, it's time to reuse the body of the original defun: - \expandafter\gobbledefun#1% -} -\def\gobbledefun#1\startdefun{} - -% \printdefunline \deffnheader{text} -% -\def\printdefunline#1#2{% - \begingroup - % call \deffnheader: - #1#2 \endheader - % common ending: - \interlinepenalty = 10000 - \advance\rightskip by 0pt plus 1fil\relax - \endgraf - \nobreak\vskip -\parskip - \penalty\defunpenalty % signal to \startdefun and \dodefunx - % Some of the @defun-type tags do not enable magic parentheses, - % rendering the following check redundant. But we don't optimize. - \checkparencounts - \endgroup -} - -\def\Edefun{\endgraf\medbreak} - -% \makedefun{deffn} creates \deffn, \deffnx and \Edeffn; -% the only thing remaining is to define \deffnheader. -% -\def\makedefun#1{% - \expandafter\let\csname E#1\endcsname = \Edefun - \edef\temp{\noexpand\domakedefun - \makecsname{#1}\makecsname{#1x}\makecsname{#1header}}% - \temp -} - -% \domakedefun \deffn \deffnx \deffnheader { (defn. of \deffnheader) } -% -% Define \deffn and \deffnx, without parameters. -% \deffnheader has to be defined explicitly. -% -\def\domakedefun#1#2#3{% - \envdef#1{% - \startdefun - \doingtypefnfalse % distinguish typed functions from all else - \parseargusing\activeparens{\printdefunline#3}% - }% - \def#2{\dodefunx#1}% - \def#3% -} - -\newif\ifdoingtypefn % doing typed function? -\newif\ifrettypeownline % typeset return type on its own line? - -% @deftypefnnewline on|off says whether the return type of typed functions -% are printed on their own line. This affects @deftypefn, @deftypefun, -% @deftypeop, and @deftypemethod. -% -\parseargdef\deftypefnnewline{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETtxideftypefnnl\endcsname - = \empty - \else\ifx\temp\offword - \expandafter\let\csname SETtxideftypefnnl\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @txideftypefnnl value `\temp', - must be on|off}% - \fi\fi -} - -% Untyped functions: - -% @deffn category name args -\makedefun{deffn}{\deffngeneral{}} - -% @deffn category class name args -\makedefun{defop}#1 {\defopon{#1\ \putwordon}} - -% \defopon {category on}class name args -\def\defopon#1#2 {\deffngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deffngeneral {subind}category name args -% -\def\deffngeneral#1#2 #3 #4\endheader{% - % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}. - \dosubind{fn}{\code{#3}}{#1}% - \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% -} - -% Typed functions: - -% @deftypefn category type name args -\makedefun{deftypefn}{\deftypefngeneral{}} - -% @deftypeop category class type name args -\makedefun{deftypeop}#1 {\deftypeopon{#1\ \putwordon}} - -% \deftypeopon {category on}class type name args -\def\deftypeopon#1#2 {\deftypefngeneral{\putwordon\ \code{#2}}{#1\ \code{#2}} } - -% \deftypefngeneral {subind}category type name args -% -\def\deftypefngeneral#1#2 #3 #4 #5\endheader{% - \dosubind{fn}{\code{#4}}{#1}% - \doingtypefntrue - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% -} - -% Typed variables: - -% @deftypevr category type var args -\makedefun{deftypevr}{\deftypecvgeneral{}} - -% @deftypecv category class type var args -\makedefun{deftypecv}#1 {\deftypecvof{#1\ \putwordof}} - -% \deftypecvof {category of}class type var args -\def\deftypecvof#1#2 {\deftypecvgeneral{\putwordof\ \code{#2}}{#1\ \code{#2}} } - -% \deftypecvgeneral {subind}category type var args -% -\def\deftypecvgeneral#1#2 #3 #4 #5\endheader{% - \dosubind{vr}{\code{#4}}{#1}% - \defname{#2}{#3}{#4}\defunargs{#5\unskip}% -} - -% Untyped variables: - -% @defvr category var args -\makedefun{defvr}#1 {\deftypevrheader{#1} {} } - -% @defcv category class var args -\makedefun{defcv}#1 {\defcvof{#1\ \putwordof}} - -% \defcvof {category of}class var args -\def\defcvof#1#2 {\deftypecvof{#1}#2 {} } - -% Types: - -% @deftp category name args -\makedefun{deftp}#1 #2 #3\endheader{% - \doind{tp}{\code{#2}}% - \defname{#1}{}{#2}\defunargs{#3\unskip}% -} - -% Remaining @defun-like shortcuts: -\makedefun{defun}{\deffnheader{\putwordDeffunc} } -\makedefun{defmac}{\deffnheader{\putwordDefmac} } -\makedefun{defspec}{\deffnheader{\putwordDefspec} } -\makedefun{deftypefun}{\deftypefnheader{\putwordDeffunc} } -\makedefun{defvar}{\defvrheader{\putwordDefvar} } -\makedefun{defopt}{\defvrheader{\putwordDefopt} } -\makedefun{deftypevar}{\deftypevrheader{\putwordDefvar} } -\makedefun{defmethod}{\defopon\putwordMethodon} -\makedefun{deftypemethod}{\deftypeopon\putwordMethodon} -\makedefun{defivar}{\defcvof\putwordInstanceVariableof} -\makedefun{deftypeivar}{\deftypecvof\putwordInstanceVariableof} - -% \defname, which formats the name of the @def (not the args). -% #1 is the category, such as "Function". -% #2 is the return type, if any. -% #3 is the function name. -% -% We are followed by (but not passed) the arguments, if any. -% -\def\defname#1#2#3{% - \par - % Get the values of \leftskip and \rightskip as they were outside the @def... - \advance\leftskip by -\defbodyindent - % - % Determine if we are typesetting the return type of a typed function - % on a line by itself. - \rettypeownlinefalse - \ifdoingtypefn % doing a typed function specifically? - % then check user option for putting return type on its own line: - \expandafter\ifx\csname SETtxideftypefnnl\endcsname\relax \else - \rettypeownlinetrue - \fi - \fi - % - % How we'll format the category name. Putting it in brackets helps - % distinguish it from the body text that may end up on the next line - % just below it. - \def\temp{#1}% - \setbox0=\hbox{\kern\deflastargmargin \ifx\temp\empty\else [\rm\temp]\fi} - % - % Figure out line sizes for the paragraph shape. We'll always have at - % least two. - \tempnum = 2 - % - % The first line needs space for \box0; but if \rightskip is nonzero, - % we need only space for the part of \box0 which exceeds it: - \dimen0=\hsize \advance\dimen0 by -\wd0 \advance\dimen0 by \rightskip - % - % If doing a return type on its own line, we'll have another line. - \ifrettypeownline - \advance\tempnum by 1 - \def\maybeshapeline{0in \hsize}% - \else - \def\maybeshapeline{}% - \fi - % - % The continuations: - \dimen2=\hsize \advance\dimen2 by -\defargsindent - % - % The final paragraph shape: - \parshape \tempnum 0in \dimen0 \maybeshapeline \defargsindent \dimen2 - % - % Put the category name at the right margin. - \noindent - \hbox to 0pt{% - \hfil\box0 \kern-\hsize - % \hsize has to be shortened this way: - \kern\leftskip - % Intentionally do not respect \rightskip, since we need the space. - }% - % - % Allow all lines to be underfull without complaint: - \tolerance=10000 \hbadness=10000 - \exdentamount=\defbodyindent - {% - % defun fonts. We use typewriter by default (used to be bold) because: - % . we're printing identifiers, they should be in tt in principle. - % . in languages with many accents, such as Czech or French, it's - % common to leave accents off identifiers. The result looks ok in - % tt, but exceedingly strange in rm. - % . we don't want -- and --- to be treated as ligatures. - % . this still does not fix the ?` and !` ligatures, but so far no - % one has made identifiers using them :). - \df \tt - \def\temp{#2}% text of the return type - \ifx\temp\empty\else - \tclose{\temp}% typeset the return type - \ifrettypeownline - % put return type on its own line; prohibit line break following: - \hfil\vadjust{\nobreak}\break - \else - \space % type on same line, so just followed by a space - \fi - \fi % no return type - #3% output function name - }% - {\rm\enskip}% hskip 0.5 em of \tenrm - % - \boldbrax - % arguments will be output next, if any. -} - -% Print arguments in slanted roman (not ttsl), inconsistently with using -% tt for the name. This is because literal text is sometimes needed in -% the argument list (groff manual), and ttsl and tt are not very -% distinguishable. Prevent hyphenation at `-' chars. -% -\def\defunargs#1{% - % use sl by default (not ttsl), - % tt for the names. - \df \sl \hyphenchar\font=0 - % - % On the other hand, if an argument has two dashes (for instance), we - % want a way to get ttsl. We used to recommend @var for that, so - % leave the code in, but it's strange for @var to lead to typewriter. - % Nowadays we recommend @code, since the difference between a ttsl hyphen - % and a tt hyphen is pretty tiny. @code also disables ?` !`. - \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% - #1% - \sl\hyphenchar\font=45 -} - -% We want ()&[] to print specially on the defun line. -% -\def\activeparens{% - \catcode`\(=\active \catcode`\)=\active - \catcode`\[=\active \catcode`\]=\active - \catcode`\&=\active -} - -% Make control sequences which act like normal parenthesis chars. -\let\lparen = ( \let\rparen = ) - -% Be sure that we always have a definition for `(', etc. For example, -% if the fn name has parens in it, \boldbrax will not be in effect yet, -% so TeX would otherwise complain about undefined control sequence. -{ - \activeparens - \global\let(=\lparen \global\let)=\rparen - \global\let[=\lbrack \global\let]=\rbrack - \global\let& = \& - - \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} - \gdef\magicamp{\let&=\amprm} -} - -\newcount\parencount - -% If we encounter &foo, then turn on ()-hacking afterwards -\newif\ifampseen -\def\amprm#1 {\ampseentrue{\bf\ }} - -\def\parenfont{% - \ifampseen - % At the first level, print parens in roman, - % otherwise use the default font. - \ifnum \parencount=1 \rm \fi - \else - % The \sf parens (in \boldbrax) actually are a little bolder than - % the contained text. This is especially needed for [ and ] . - \sf - \fi -} -\def\infirstlevel#1{% - \ifampseen - \ifnum\parencount=1 - #1% - \fi - \fi -} -\def\bfafterword#1 {#1 \bf} - -\def\opnr{% - \global\advance\parencount by 1 - {\parenfont(}% - \infirstlevel \bfafterword -} -\def\clnr{% - {\parenfont)}% - \infirstlevel \sl - \global\advance\parencount by -1 -} - -\newcount\brackcount -\def\lbrb{% - \global\advance\brackcount by 1 - {\bf[}% -} -\def\rbrb{% - {\bf]}% - \global\advance\brackcount by -1 -} - -\def\checkparencounts{% - \ifnum\parencount=0 \else \badparencount \fi - \ifnum\brackcount=0 \else \badbrackcount \fi -} -% these should not use \errmessage; the glibc manual, at least, actually -% has such constructs (when documenting function pointers). -\def\badparencount{% - \message{Warning: unbalanced parentheses in @def...}% - \global\parencount=0 -} -\def\badbrackcount{% - \message{Warning: unbalanced square brackets in @def...}% - \global\brackcount=0 -} - - -\message{macros,} -% @macro. - -% To do this right we need a feature of e-TeX, \scantokens, -% which we arrange to emulate with a temporary file in ordinary TeX. -\ifx\eTeXversion\thisisundefined - \newwrite\macscribble - \def\scantokens#1{% - \toks0={#1}% - \immediate\openout\macscribble=\jobname.tmp - \immediate\write\macscribble{\the\toks0}% - \immediate\closeout\macscribble - \input \jobname.tmp - } -\fi - -\let\aftermacroxxx\relax -\def\aftermacro{\aftermacroxxx} - -% alias because \c means cedilla in @tex or @math -\let\texinfoc=\c - -% Used at the time of macro expansion. -% Argument is macro body with arguments substituted -\def\scanmacro#1{% - \newlinechar`\^^M - \def\xprocessmacroarg{\eatspaces}% - % - % Process the macro body under the current catcode regime. - \scantokens{#1\texinfoc}\aftermacro% - % - % The \c is to remove the \newlinechar added by \scantokens, and - % can be noticed by \parsearg. - % The \aftermacro allows a \comment at the end of the macro definition - % to duplicate itself past the final \newlinechar added by \scantokens: - % this is used in the definition of \group to comment out a newline. We - % don't do the same for \c to support Texinfo files with macros that ended - % with a @c, which should no longer be necessary. - % We avoid surrounding the call to \scantokens with \bgroup and \egroup - % to allow macros to open or close groups themselves. -} - -% Used for copying and captions -\def\scanexp#1{% - \bgroup - % Undo catcode changes of \startcontents and \printindex - % When called from @insertcopying or (short)caption, we need active - % backslash to get it printed correctly. - % FIXME: This may not be needed. - %\catcode`\@=0 \catcode`\\=\active \escapechar=`\@ - \edef\temp{\noexpand\scanmacro{#1}}% - \temp - \egroup -} - -\newcount\paramno % Count of parameters -\newtoks\macname % Macro name -\newif\ifrecursive % Is it recursive? - -% List of all defined macros in the form -% \definedummyword\macro1\definedummyword\macro2... -% Currently is also contains all @aliases; the list can be split -% if there is a need. -\def\macrolist{} - -% Add the macro to \macrolist -\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname} -\def\addtomacrolistxxx#1{% - \toks0 = \expandafter{\macrolist\definedummyword#1}% - \xdef\macrolist{\the\toks0}% -} - -% Utility routines. -% This does \let #1 = #2, with \csnames; that is, -% \let \csname#1\endcsname = \csname#2\endcsname -% (except of course we have to play expansion games). -% -\def\cslet#1#2{% - \expandafter\let - \csname#1\expandafter\endcsname - \csname#2\endcsname -} - -% Trim leading and trailing spaces off a string. -% Concepts from aro-bend problem 15 (see CTAN). -{\catcode`\@=11 -\gdef\eatspaces #1{\expandafter\trim@\expandafter{#1 }} -\gdef\trim@ #1{\trim@@ @#1 @ #1 @ @@} -\gdef\trim@@ #1@ #2@ #3@@{\trim@@@\empty #2 @} -\def\unbrace#1{#1} -\unbrace{\gdef\trim@@@ #1 } #2@{#1} -} - -% Trim a single trailing ^^M off a string. -{\catcode`\^^M=\other \catcode`\Q=3% -\gdef\eatcr #1{\eatcra #1Q^^MQ}% -\gdef\eatcra#1^^MQ{\eatcrb#1Q}% -\gdef\eatcrb#1Q#2Q{#1}% -} - -% Macro bodies are absorbed as an argument in a context where -% all characters are catcode 10, 11 or 12, except \ which is active -% (as in normal texinfo). It is necessary to change the definition of \ -% to recognize macro arguments; this is the job of \mbodybackslash. -% -% Non-ASCII encodings make 8-bit characters active, so un-activate -% them to avoid their expansion. Must do this non-globally, to -% confine the change to the current group. -% -% It's necessary to have hard CRs when the macro is executed. This is -% done by making ^^M (\endlinechar) catcode 12 when reading the macro -% body, and then making it the \newlinechar in \scanmacro. -% -\def\scanctxt{% used as subroutine - \catcode`\"=\other - \catcode`\+=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\^=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\~=\other - \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi -} - -\def\scanargctxt{% used for copying and captions, not macros. - \scanctxt - \catcode`\@=\other - \catcode`\\=\other - \catcode`\^^M=\other -} - -\def\macrobodyctxt{% used for @macro definitions - \scanctxt - \catcode`\ =\other - \catcode`\@=\other - \catcode`\{=\other - \catcode`\}=\other - \catcode`\^^M=\other - \usembodybackslash -} - -% Used when scanning braced macro arguments. Note, however, that catcode -% changes here are ineffectual if the macro invocation was nested inside -% an argument to another Texinfo command. -\def\macroargctxt{% - \scanctxt - \catcode`\ =\active - \catcode`\^^M=\other - \catcode`\\=\active -} - -\def\macrolineargctxt{% used for whole-line arguments without braces - \scanctxt - \catcode`\{=\other - \catcode`\}=\other -} - -% \mbodybackslash is the definition of \ in @macro bodies. -% It maps \foo\ => \csname macarg.foo\endcsname => #N -% where N is the macro parameter number. -% We define \csname macarg.\endcsname to be \realbackslash, so -% \\ in macro replacement text gets you a backslash. -% -{\catcode`@=0 @catcode`@\=@active - @gdef@usembodybackslash{@let\=@mbodybackslash} - @gdef@mbodybackslash#1\{@csname macarg.#1@endcsname} -} -\expandafter\def\csname macarg.\endcsname{\realbackslash} - -\def\margbackslash#1{\char`\#1 } - -\def\macro{\recursivefalse\parsearg\macroxxx} -\def\rmacro{\recursivetrue\parsearg\macroxxx} - -\def\macroxxx#1{% - \getargs{#1}% now \macname is the macname and \argl the arglist - \ifx\argl\empty % no arguments - \paramno=0\relax - \else - \expandafter\parsemargdef \argl;% - \if\paramno>256\relax - \ifx\eTeXversion\thisisundefined - \errhelp = \EMsimple - \errmessage{You need eTeX to compile a file with macros with more than 256 arguments} - \fi - \fi - \fi - \if1\csname ismacro.\the\macname\endcsname - \message{Warning: redefining \the\macname}% - \else - \expandafter\ifx\csname \the\macname\endcsname \relax - \else \errmessage{Macro name \the\macname\space already defined}\fi - \global\cslet{macsave.\the\macname}{\the\macname}% - \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% - \addtomacrolist{\the\macname}% - \fi - \begingroup \macrobodyctxt - \ifrecursive \expandafter\parsermacbody - \else \expandafter\parsemacbody - \fi} - -\parseargdef\unmacro{% - \if1\csname ismacro.#1\endcsname - \global\cslet{#1}{macsave.#1}% - \global\expandafter\let \csname ismacro.#1\endcsname=0% - % Remove the macro name from \macrolist: - \begingroup - \expandafter\let\csname#1\endcsname \relax - \let\definedummyword\unmacrodo - \xdef\macrolist{\macrolist}% - \endgroup - \else - \errmessage{Macro #1 not defined}% - \fi -} - -% Called by \do from \dounmacro on each macro. The idea is to omit any -% macro definitions that have been changed to \relax. -% -\def\unmacrodo#1{% - \ifx #1\relax - % remove this - \else - \noexpand\definedummyword \noexpand#1% - \fi -} - -% \getargs -- Parse the arguments to a @macro line. Set \macname to -% the name of the macro, and \argl to the braced argument list. -\def\getargs#1{\getargsxxx#1{}} -\def\getargsxxx#1#{\getmacname #1 \relax\getmacargs} -\def\getmacname#1 #2\relax{\macname={#1}} -\def\getmacargs#1{\def\argl{#1}} -% This made use of the feature that if the last token of a -% is #, then the preceding argument is delimited by -% an opening brace, and that opening brace is not consumed. - -% Parse the optional {params} list to @macro or @rmacro. -% Set \paramno to the number of arguments, -% and \paramlist to a parameter text for the macro (e.g. #1,#2,#3 for a -% three-param macro.) Define \macarg.BLAH for each BLAH in the params -% list to some hook where the argument is to be expanded. If there are -% less than 10 arguments that hook is to be replaced by ##N where N -% is the position in that list, that is to say the macro arguments are to be -% defined `a la TeX in the macro body. -% -% That gets used by \mbodybackslash (above). -% -% If there are 10 or more arguments, a different technique is used: see -% \parsemmanyargdef. -% -\def\parsemargdef#1;{% - \paramno=0\def\paramlist{}% - \let\hash\relax - % \hash is redefined to `#' later to get it into definitions - \let\processmacroarg\relax - \parsemargdefxxx#1,;,% - \ifnum\paramno<10\relax\else - \paramno0\relax - \parsemmanyargdef@@#1,;,% 10 or more arguments - \fi -} -\def\parsemargdefxxx#1,{% - \if#1;\let\next=\relax - \else \let\next=\parsemargdefxxx - \advance\paramno by 1 - \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname - {\processmacroarg{\hash\the\paramno}}% - \edef\paramlist{\paramlist\hash\the\paramno,}% - \fi\next} - -% \parsemacbody, \parsermacbody -% -% Read recursive and nonrecursive macro bodies. (They're different since -% rec and nonrec macros end differently.) -% -% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro -% body to be transformed. -% Set \macrobody to the body of the macro, and call \defmacro. -% -{\catcode`\ =\other\long\gdef\parsemacbody#1@end macro{% -\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}% -{\catcode`\ =\other\long\gdef\parsermacbody#1@end rmacro{% -\xdef\macrobody{\eatcr{#1}}\endgroup\defmacro}}% - -% Make @ a letter, so that we can make private-to-Texinfo macro names. -\edef\texiatcatcode{\the\catcode`\@} -\catcode `@=11\relax - -%%%%%%%%%%%%%% Code for > 10 arguments only %%%%%%%%%%%%%%%%%% - -% If there are 10 or more arguments, a different technique is used, where the -% hook remains in the body, and when macro is to be expanded the body is -% processed again to replace the arguments. -% -% In that case, the hook is \the\toks N-1, and we simply set \toks N-1 to the -% argument N value and then \edef the body (nothing else will expand because of -% the catcode regime under which the body was input). -% -% If you compile with TeX (not eTeX), and you have macros with 10 or more -% arguments, no macro can have more than 256 arguments (else error). -% -% In case that there are 10 or more arguments we parse again the arguments -% list to set new definitions for the \macarg.BLAH macros corresponding to -% each BLAH argument. It was anyhow needed to parse already once this list -% in order to count the arguments, and as macros with at most 9 arguments -% are by far more frequent than macro with 10 or more arguments, defining -% twice the \macarg.BLAH macros does not cost too much processing power. -\def\parsemmanyargdef@@#1,{% - \if#1;\let\next=\relax - \else - \let\next=\parsemmanyargdef@@ - \edef\tempb{\eatspaces{#1}}% - \expandafter\def\expandafter\tempa - \expandafter{\csname macarg.\tempb\endcsname}% - % Note that we need some extra \noexpand\noexpand, this is because we - % don't want \the to be expanded in the \parsermacbody as it uses an - % \xdef . - \expandafter\edef\tempa - {\noexpand\noexpand\noexpand\the\toks\the\paramno}% - \advance\paramno by 1\relax - \fi\next} - - -\let\endargs@\relax -\let\nil@\relax -\def\nilm@{\nil@}% -\long\def\nillm@{\nil@}% - -% This macro is expanded during the Texinfo macro expansion, not during its -% definition. It gets all the arguments' values and assigns them to macros -% macarg.ARGNAME -% -% #1 is the macro name -% #2 is the list of argument names -% #3 is the list of argument values -\def\getargvals@#1#2#3{% - \def\macargdeflist@{}% - \def\saveparamlist@{#2}% Need to keep a copy for parameter expansion. - \def\paramlist{#2,\nil@}% - \def\macroname{#1}% - \begingroup - \macroargctxt - \def\argvaluelist{#3,\nil@}% - \def\@tempa{#3}% - \ifx\@tempa\empty - \setemptyargvalues@ - \else - \getargvals@@ - \fi -} -\def\getargvals@@{% - \ifx\paramlist\nilm@ - % Some sanity check needed here that \argvaluelist is also empty. - \ifx\argvaluelist\nillm@ - \else - \errhelp = \EMsimple - \errmessage{Too many arguments in macro `\macroname'!}% - \fi - \let\next\macargexpandinbody@ - \else - \ifx\argvaluelist\nillm@ - % No more arguments values passed to macro. Set remaining named-arg - % macros to empty. - \let\next\setemptyargvalues@ - \else - % pop current arg name into \@tempb - \def\@tempa##1{\pop@{\@tempb}{\paramlist}##1\endargs@}% - \expandafter\@tempa\expandafter{\paramlist}% - % pop current argument value into \@tempc - \def\@tempa##1{\longpop@{\@tempc}{\argvaluelist}##1\endargs@}% - \expandafter\@tempa\expandafter{\argvaluelist}% - % Here \@tempb is the current arg name and \@tempc is the current arg value. - % First place the new argument macro definition into \@tempd - \expandafter\macname\expandafter{\@tempc}% - \expandafter\let\csname macarg.\@tempb\endcsname\relax - \expandafter\def\expandafter\@tempe\expandafter{% - \csname macarg.\@tempb\endcsname}% - \edef\@tempd{\long\def\@tempe{\the\macname}}% - \push@\@tempd\macargdeflist@ - \let\next\getargvals@@ - \fi - \fi - \next -} - -\def\push@#1#2{% - \expandafter\expandafter\expandafter\def - \expandafter\expandafter\expandafter#2% - \expandafter\expandafter\expandafter{% - \expandafter#1#2}% -} - -% Replace arguments by their values in the macro body, and place the result -% in macro \@tempa. -% -\def\macvalstoargs@{% - % To do this we use the property that token registers that are \the'ed - % within an \edef expand only once. So we are going to place all argument - % values into respective token registers. - % - % First we save the token context, and initialize argument numbering. - \begingroup - \paramno0\relax - % Then, for each argument number #N, we place the corresponding argument - % value into a new token list register \toks#N - \expandafter\putargsintokens@\saveparamlist@,;,% - % Then, we expand the body so that argument are replaced by their - % values. The trick for values not to be expanded themselves is that they - % are within tokens and that tokens expand only once in an \edef . - \edef\@tempc{\csname mac.\macroname .body\endcsname}% - % Now we restore the token stack pointer to free the token list registers - % which we have used, but we make sure that expanded body is saved after - % group. - \expandafter - \endgroup - \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% - } - -% Define the named-macro outside of this group and then close this group. -% -\def\macargexpandinbody@{% - \expandafter - \endgroup - \macargdeflist@ - % First the replace in body the macro arguments by their values, the result - % is in \@tempa . - \macvalstoargs@ - % Then we point at the \norecurse or \gobble (for recursive) macro value - % with \@tempb . - \expandafter\let\expandafter\@tempb\csname mac.\macroname .recurse\endcsname - % Depending on whether it is recursive or not, we need some tailing - % \egroup . - \ifx\@tempb\gobble - \let\@tempc\relax - \else - \let\@tempc\egroup - \fi - % And now we do the real job: - \edef\@tempd{\noexpand\@tempb{\macroname}\noexpand\scanmacro{\@tempa}\@tempc}% - \@tempd -} - -\def\putargsintokens@#1,{% - \if#1;\let\next\relax - \else - \let\next\putargsintokens@ - % First we allocate the new token list register, and give it a temporary - % alias \@tempb . - \toksdef\@tempb\the\paramno - % Then we place the argument value into that token list register. - \expandafter\let\expandafter\@tempa\csname macarg.#1\endcsname - \expandafter\@tempb\expandafter{\@tempa}% - \advance\paramno by 1\relax - \fi - \next -} - -% Trailing missing arguments are set to empty. -% -\def\setemptyargvalues@{% - \ifx\paramlist\nilm@ - \let\next\macargexpandinbody@ - \else - \expandafter\setemptyargvaluesparser@\paramlist\endargs@ - \let\next\setemptyargvalues@ - \fi - \next -} - -\def\setemptyargvaluesparser@#1,#2\endargs@{% - \expandafter\def\expandafter\@tempa\expandafter{% - \expandafter\def\csname macarg.#1\endcsname{}}% - \push@\@tempa\macargdeflist@ - \def\paramlist{#2}% -} - -% #1 is the element target macro -% #2 is the list macro -% #3,#4\endargs@ is the list value -\def\pop@#1#2#3,#4\endargs@{% - \def#1{#3}% - \def#2{#4}% -} -\long\def\longpop@#1#2#3,#4\endargs@{% - \long\def#1{#3}% - \long\def#2{#4}% -} - - -%%%%%%%%%%%%%% End of code for > 10 arguments %%%%%%%%%%%%%%%%%% - - - -% Remove following spaces at the expansion stage. -% This works because spaces are discarded before each argument when TeX is -% getting the arguments for a macro. -% This must not be immediately followed by a }. -\long\def\gobblespaces#1{#1} - -% This defines a Texinfo @macro or @rmacro, called by \parsemacbody. -% \macrobody has the body of the macro in it, with placeholders for -% its parameters, looking like "\processmacroarg{\hash 1}". -% \paramno is the number of parameters -% \paramlist is a TeX parameter text, e.g. "#1,#2,#3," -% There are eight cases: recursive and nonrecursive macros of zero, one, -% up to nine, and many arguments. -% \xdef is used so that macro definitions will survive the file -% they're defined in: @include reads the file inside a group. -% -\def\defmacro{% - \let\hash=##% convert placeholders to macro parameter chars - \ifnum\paramno=1 - \def\processmacroarg{\gobblespaces}% - % This removes the pair of braces around the argument. We don't - % use \eatspaces, because this can cause ends of lines to be lost - % when the argument to \eatspaces is read, leading to line-based - % commands like "@itemize" not being read correctly. - \else - \def\processmacroarg{\xprocessmacroarg}% - \let\xprocessmacroarg\relax - \fi - \ifrecursive %%%%%%%%%%%%%% Recursive %%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \ifcase\paramno - % 0 - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\scanmacro{\macrobody}}% - \or % 1 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup - \noexpand\braceorline - \expandafter\noexpand\csname\the\macname @@@\endcsname}% - \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \expandafter\noexpand\csname\the\macname @@@@\endcsname{% - \noexpand\gobblespaces##1\empty}% - % The \empty is for \gobblespaces in case #1 is empty - }% - \expandafter\xdef\csname\the\macname @@@@\endcsname##1{% - \egroup\noexpand\scanmacro{\macrobody}}% - \else - \ifnum\paramno<10\relax % at most 9 - % See non-recursive section below for comments - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup - \noexpand\expandafter - \noexpand\macroargctxt - \noexpand\expandafter - \expandafter\noexpand\csname\the\macname @@\endcsname}% - \expandafter\xdef\csname\the\macname @@\endcsname##1{% - \noexpand\passargtomacro - \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}% - \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname @@@@\endcsname\paramlist{% - \egroup\noexpand\scanmacro{\macrobody}}% - \else % 10 or more - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\getargvals@{\the\macname}{\argl}% - }% - \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody - \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\gobble - \fi - \fi - \else %%%%%%%%%%%%%%%%%%%%%% Non-recursive %%%%%%%%%%%%%%%%%%%%%%%%%% - \ifcase\paramno - % 0 - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\scanmacro{\macrobody}}% - \or % 1 - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup - \noexpand\braceorline - \expandafter\noexpand\csname\the\macname @@@\endcsname}% - \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \expandafter\noexpand\csname\the\macname @@@@\endcsname{% - \noexpand\gobblespaces##1\empty}% - % The \empty is for \gobblespaces in case #1 is empty - }% - \expandafter\xdef\csname\the\macname @@@@\endcsname##1{% - \egroup - \noexpand\scanmacro{\macrobody}% - }% - \else % at most 9 - \ifnum\paramno<10\relax - % @MACNAME sets the context for reading the macro argument - % @MACNAME@@ gets the argument, processes backslashes and appends a - % comma. - % @MACNAME@@@ removes braces surrounding the argument list. - % @MACNAME@@@@ scans the macro body with arguments substituted. - \expandafter\xdef\csname\the\macname\endcsname{% - \bgroup - \noexpand\expandafter % This \expandafter skip any spaces after the - \noexpand\macroargctxt % macro before we change the catcode of space. - \noexpand\expandafter - \expandafter\noexpand\csname\the\macname @@\endcsname}% - \expandafter\xdef\csname\the\macname @@\endcsname##1{% - \noexpand\passargtomacro - \expandafter\noexpand\csname\the\macname @@@\endcsname{##1,}}% - \expandafter\xdef\csname\the\macname @@@\endcsname##1{% - \expandafter\noexpand\csname\the\macname @@@@\endcsname ##1}% - \expandafter\expandafter - \expandafter\xdef - \expandafter\expandafter - \csname\the\macname @@@@\endcsname\paramlist{% - \egroup\noexpand\scanmacro{\macrobody}}% - \else % 10 or more: - \expandafter\xdef\csname\the\macname\endcsname{% - \noexpand\getargvals@{\the\macname}{\argl}% - }% - \global\expandafter\let\csname mac.\the\macname .body\endcsname\macrobody - \global\expandafter\let\csname mac.\the\macname .recurse\endcsname\norecurse - \fi - \fi - \fi} - -\catcode `\@\texiatcatcode\relax % end private-to-Texinfo catcodes - -\def\norecurse#1{\bgroup\cslet{#1}{macsave.#1}} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -{\catcode`\@=0 \catcode`\\=13 % We need to manipulate \ so use @ as escape -@catcode`@_=11 % private names -@catcode`@!=11 % used as argument separator - -% \passargtomacro#1#2 - -% Call #1 with a list of tokens #2, with any doubled backslashes in #2 -% compressed to one. -% -% This implementation works by expansion, and not execution (so we cannot use -% \def or similar). This reduces the risk of this failing in contexts where -% complete expansion is done with no execution (for example, in writing out to -% an auxiliary file for an index entry). -% -% State is kept in the input stream: the argument passed to -% @look_ahead, @gobble_and_check_finish and @add_segment is -% -% THE_MACRO ARG_RESULT ! {PENDING_BS} NEXT_TOKEN (... rest of input) -% -% where: -% THE_MACRO - name of the macro we want to call -% ARG_RESULT - argument list we build to pass to that macro -% PENDING_BS - either a backslash or nothing -% NEXT_TOKEN - used to look ahead in the input stream to see what's coming next - -@gdef@passargtomacro#1#2{% - @add_segment #1!{}@relax#2\@_finish\% -} -@gdef@_finish{@_finishx} @global@let@_finishx@relax - -% #1 - THE_MACRO ARG_RESULT -% #2 - PENDING_BS -% #3 - NEXT_TOKEN -% #4 used to look ahead -% -% If the next token is not a backslash, process the rest of the argument; -% otherwise, remove the next token. -@gdef@look_ahead#1!#2#3#4{% - @ifx#4\% - @expandafter@gobble_and_check_finish - @else - @expandafter@add_segment - @fi#1!{#2}#4#4% -} - -% #1 - THE_MACRO ARG_RESULT -% #2 - PENDING_BS -% #3 - NEXT_TOKEN -% #4 should be a backslash, which is gobbled. -% #5 looks ahead -% -% Double backslash found. Add a single backslash, and look ahead. -@gdef@gobble_and_check_finish#1!#2#3#4#5{% - @add_segment#1\!{}#5#5% -} - -@gdef@is_fi{@fi} - -% #1 - THE_MACRO ARG_RESULT -% #2 - PENDING_BS -% #3 - NEXT_TOKEN -% #4 is input stream until next backslash -% -% Input stream is either at the start of the argument, or just after a -% backslash sequence, either a lone backslash, or a doubled backslash. -% NEXT_TOKEN contains the first token in the input stream: if it is \finish, -% finish; otherwise, append to ARG_RESULT the segment of the argument up until -% the next backslash. PENDING_BACKSLASH contains a backslash to represent -% a backslash just before the start of the input stream that has not been -% added to ARG_RESULT. -@gdef@add_segment#1!#2#3#4\{% -@ifx#3@_finish - @call_the_macro#1!% -@else - % append the pending backslash to the result, followed by the next segment - @expandafter@is_fi@look_ahead#1#2#4!{\}@fi - % this @fi is discarded by @look_ahead. - % we can't get rid of it with \expandafter because we don't know how - % long #4 is. -} - -% #1 - THE_MACRO -% #2 - ARG_RESULT -% #3 discards the res of the conditional in @add_segment, and @is_fi ends the -% conditional. -@gdef@call_the_macro#1#2!#3@fi{@is_fi #1{#2}} - -} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% \braceorline MAC is used for a one-argument macro MAC. It checks -% whether the next non-whitespace character is a {. It sets the context -% for reading the argument (slightly different in the two cases). Then, -% to read the argument, in the whole-line case, it then calls the regular -% \parsearg MAC; in the lbrace case, it calls \passargtomacro MAC. -% -\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} -\def\braceorlinexxx{% - \ifx\nchar\bgroup - \macroargctxt - \expandafter\passargtomacro - \else - \macrolineargctxt\expandafter\parsearg - \fi \macnamexxx} - - -% @alias. -% We need some trickery to remove the optional spaces around the equal -% sign. Make them active and then expand them all to nothing. -% -\def\alias{\parseargusing\obeyspaces\aliasxxx} -\def\aliasxxx #1{\aliasyyy#1\relax} -\def\aliasyyy #1=#2\relax{% - {% - \expandafter\let\obeyedspace=\empty - \addtomacrolist{#1}% - \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}% - }% - \next -} - - -\message{cross references,} - -\newwrite\auxfile -\newif\ifhavexrefs % True if xref values are known. -\newif\ifwarnedxrefs % True if we warned once that they aren't known. - -% @inforef is relatively simple. -\def\inforef #1{\inforefzzz #1,,,,**} -\def\inforefzzz #1,#2,#3,#4**{% - \putwordSee{} \putwordInfo{} \putwordfile{} \file{\ignorespaces #3{}}, - node \samp{\ignorespaces#1{}}} - -% @node's only job in TeX is to define \lastnode, which is used in -% cross-references. The @node line might or might not have commas, and -% might or might not have spaces before the first comma, like: -% @node foo , bar , ... -% We don't want such trailing spaces in the node name. -% -\parseargdef\node{\checkenv{}\donode #1 ,\finishnodeparse} -% -% also remove a trailing comma, in case of something like this: -% @node Help-Cross, , , Cross-refs -\def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} -\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} - -\let\nwnode=\node -\let\lastnode=\empty - -% Write a cross-reference definition for the current node. #1 is the -% type (Ynumbered, Yappendix, Ynothing). -% -\def\donoderef#1{% - \ifx\lastnode\empty\else - \setref{\lastnode}{#1}% - \global\let\lastnode=\empty - \fi -} - -% @anchor{NAME} -- define xref target at arbitrary point. -% -\newcount\savesfregister -% -\def\savesf{\relax \ifhmode \savesfregister=\spacefactor \fi} -\def\restoresf{\relax \ifhmode \spacefactor=\savesfregister \fi} -\def\anchor#1{\savesf \setref{#1}{Ynothing}\restoresf \ignorespaces} - -% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an -% anchor), which consists of three parts: -% 1) NAME-title - the current sectioning name taken from \lastsection, -% or the anchor name. -% 2) NAME-snt - section number and type, passed as the SNT arg, or -% empty for anchors. -% 3) NAME-pg - the page number. -% -% This is called from \donoderef, \anchor, and \dofloat. In the case of -% floats, there is an additional part, which is not written here: -% 4) NAME-lof - the text as it should appear in a @listoffloats. -% -\def\setref#1#2{% - \pdfmkdest{#1}% - \iflinks - {% - \requireauxfile - \atdummies % preserve commands, but don't expand them - \edef\writexrdef##1##2{% - \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef - ##1}{##2}}% these are parameters of \writexrdef - }% - \toks0 = \expandafter{\lastsection}% - \immediate \writexrdef{title}{\the\toks0 }% - \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. - \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout - }% - \fi -} - -% @xrefautosectiontitle on|off says whether @section(ing) names are used -% automatically in xrefs, if the third arg is not explicitly specified. -% This was provided as a "secret" @set xref-automatic-section-title -% variable, now it's official. -% -\parseargdef\xrefautomaticsectiontitle{% - \def\temp{#1}% - \ifx\temp\onword - \expandafter\let\csname SETxref-automatic-section-title\endcsname - = \empty - \else\ifx\temp\offword - \expandafter\let\csname SETxref-automatic-section-title\endcsname - = \relax - \else - \errhelp = \EMsimple - \errmessage{Unknown @xrefautomaticsectiontitle value `\temp', - must be on|off}% - \fi\fi -} - -% -% @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is -% the node name, #2 the name of the Info cross-reference, #3 the printed -% node name, #4 the name of the Info file, #5 the name of the printed -% manual. All but the node name can be omitted. -% -\def\pxref{\putwordsee{} \xrefXX} -\def\xref{\putwordSee{} \xrefXX} -\def\ref{\xrefXX} - -\def\xrefXX#1{\def\xrefXXarg{#1}\futurelet\tokenafterxref\xrefXXX} -\def\xrefXXX{\expandafter\xrefX\expandafter[\xrefXXarg,,,,,,,]} -% -\newbox\toprefbox -\newbox\printedrefnamebox -\newbox\infofilenamebox -\newbox\printedmanualbox -% -\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup - \unsepspaces - % - % Get args without leading/trailing spaces. - \def\printedrefname{\ignorespaces #3}% - \setbox\printedrefnamebox = \hbox{\printedrefname\unskip}% - % - \def\infofilename{\ignorespaces #4}% - \setbox\infofilenamebox = \hbox{\infofilename\unskip}% - % - \def\printedmanual{\ignorespaces #5}% - \setbox\printedmanualbox = \hbox{\printedmanual\unskip}% - % - % If the printed reference name (arg #3) was not explicitly given in - % the @xref, figure out what we want to use. - \ifdim \wd\printedrefnamebox = 0pt - % No printed node name was explicitly given. - \expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax - % Not auto section-title: use node name inside the square brackets. - \def\printedrefname{\ignorespaces #1}% - \else - % Auto section-title: use chapter/section title inside - % the square brackets if we have it. - \ifdim \wd\printedmanualbox > 0pt - % It is in another manual, so we don't have it; use node name. - \def\printedrefname{\ignorespaces #1}% - \else - \ifhavexrefs - % We (should) know the real title if we have the xref values. - \def\printedrefname{\refx{#1-title}{}}% - \else - % Otherwise just copy the Info node name. - \def\printedrefname{\ignorespaces #1}% - \fi% - \fi - \fi - \fi - % - % Make link in pdf output. - \ifpdf - {\indexnofonts - \turnoffactive - \makevalueexpandable - % This expands tokens, so do it after making catcode changes, so _ - % etc. don't get their TeX definitions. This ignores all spaces in - % #4, including (wrongly) those in the middle of the filename. - \getfilename{#4}% - % - % This (wrongly) does not take account of leading or trailing - % spaces in #1, which should be ignored. - \edef\pdfxrefdest{#1}% - \ifx\pdfxrefdest\empty - \def\pdfxrefdest{Top}% no empty targets - \else - \txiescapepdf\pdfxrefdest % escape PDF special chars - \fi - % - \leavevmode - \startlink attr{/Border [0 0 0]}% - \ifnum\filenamelength>0 - goto file{\the\filename.pdf} name{\pdfxrefdest}% - \else - goto name{\pdfmkpgn{\pdfxrefdest}}% - \fi - }% - \setcolor{\linkcolor}% - \fi - {% - % Have to otherify everything special to allow the \csname to - % include an _ in the xref name, etc. - \indexnofonts - \turnoffactive - \expandafter\global\expandafter\let\expandafter\Xthisreftitle - \csname XR#1-title\endcsname - }% - % - % Float references are printed completely differently: "Figure 1.2" - % instead of "[somenode], p.3". \iffloat distinguishes them by - % \Xthisreftitle being set to a magic string. - \iffloat\Xthisreftitle - % If the user specified the print name (third arg) to the ref, - % print it instead of our usual "Figure 1.2". - \ifdim\wd\printedrefnamebox = 0pt - \refx{#1-snt}{}% - \else - \printedrefname - \fi - % - % If the user also gave the printed manual name (fifth arg), append - % "in MANUALNAME". - \ifdim \wd\printedmanualbox > 0pt - \space \putwordin{} \cite{\printedmanual}% - \fi - \else - % node/anchor (non-float) references. - % - % If we use \unhbox to print the node names, TeX does not insert - % empty discretionaries after hyphens, which means that it will not - % find a line break at a hyphen in a node names. Since some manuals - % are best written with fairly long node names, containing hyphens, - % this is a loss. Therefore, we give the text of the node name - % again, so it is as if TeX is seeing it for the first time. - % - \ifdim \wd\printedmanualbox > 0pt - % Cross-manual reference with a printed manual name. - % - \crossmanualxref{\cite{\printedmanual\unskip}}% - % - \else\ifdim \wd\infofilenamebox > 0pt - % Cross-manual reference with only an info filename (arg 4), no - % printed manual name (arg 5). This is essentially the same as - % the case above; we output the filename, since we have nothing else. - % - \crossmanualxref{\code{\infofilename\unskip}}% - % - \else - % Reference within this manual. - % - % _ (for example) has to be the character _ for the purposes of the - % control sequence corresponding to the node, but it has to expand - % into the usual \leavevmode...\vrule stuff for purposes of - % printing. So we \turnoffactive for the \refx-snt, back on for the - % printing, back off for the \refx-pg. - {\turnoffactive - % Only output a following space if the -snt ref is nonempty; for - % @unnumbered and @anchor, it won't be. - \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% - \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi - }% - % output the `[mynode]' via the macro below so it can be overridden. - \xrefprintnodename\printedrefname - % - % But we always want a comma and a space: - ,\space - % - % output the `page 3'. - \turnoffactive \putwordpage\tie\refx{#1-pg}{}% - \ifx,\tokenafterxref - \else\ifx.\tokenafterxref - \else\ifx;\tokenafterxref - \else\ifx)\tokenafterxref - \else,% add a , if xref not followed by punctuation - \fi\fi\fi\fi - \fi\fi - \fi - \endlink -\endgroup} - -% Output a cross-manual xref to #1. Used just above (twice). -% -% Only include the text "Section ``foo'' in" if the foo is neither -% missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply -% "see The Foo Manual", the idea being to refer to the whole manual. -% -% But, this being TeX, we can't easily compare our node name against the -% string "Top" while ignoring the possible spaces before and after in -% the input. By adding the arbitrary 7sp below, we make it much less -% likely that a real node name would have the same width as "Top" (e.g., -% in a monospaced font). Hopefully it will never happen in practice. -% -% For the same basic reason, we retypeset the "Top" at every -% reference, since the current font is indeterminate. -% -\def\crossmanualxref#1{% - \setbox\toprefbox = \hbox{Top\kern7sp}% - \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% - \ifdim \wd2 > 7sp % nonempty? - \ifdim \wd2 = \wd\toprefbox \else % same as Top? - \putwordSection{} ``\printedrefname'' \putwordin{}\space - \fi - \fi - #1% -} - -% This macro is called from \xrefX for the `[nodename]' part of xref -% output. It's a separate macro only so it can be changed more easily, -% since square brackets don't work well in some documents. Particularly -% one that Bob is working on :). -% -\def\xrefprintnodename#1{[#1]} - -% Things referred to by \setref. -% -\def\Ynothing{} -\def\Yomitfromtoc{} -\def\Ynumbered{% - \ifnum\secno=0 - \putwordChapter@tie \the\chapno - \else \ifnum\subsecno=0 - \putwordSection@tie \the\chapno.\the\secno - \else \ifnum\subsubsecno=0 - \putwordSection@tie \the\chapno.\the\secno.\the\subsecno - \else - \putwordSection@tie \the\chapno.\the\secno.\the\subsecno.\the\subsubsecno - \fi\fi\fi -} -\def\Yappendix{% - \ifnum\secno=0 - \putwordAppendix@tie @char\the\appendixno{}% - \else \ifnum\subsecno=0 - \putwordSection@tie @char\the\appendixno.\the\secno - \else \ifnum\subsubsecno=0 - \putwordSection@tie @char\the\appendixno.\the\secno.\the\subsecno - \else - \putwordSection@tie - @char\the\appendixno.\the\secno.\the\subsecno.\the\subsubsecno - \fi\fi\fi -} - -% Define \refx{NAME}{SUFFIX} to reference a cross-reference string named NAME. -% If its value is nonempty, SUFFIX is output afterward. -% -\def\refx#1#2{% - \requireauxfile - {% - \indexnofonts - \otherbackslash - \expandafter\global\expandafter\let\expandafter\thisrefX - \csname XR#1\endcsname - }% - \ifx\thisrefX\relax - % If not defined, say something at least. - \angleleft un\-de\-fined\angleright - \iflinks - \ifhavexrefs - {\toks0 = {#1}% avoid expansion of possibly-complex value - \message{\linenumber Undefined cross reference `\the\toks0'.}}% - \else - \ifwarnedxrefs\else - \global\warnedxrefstrue - \message{Cross reference values unknown; you must run TeX again.}% - \fi - \fi - \fi - \else - % It's defined, so just use it. - \thisrefX - \fi - #2% Output the suffix in any case. -} - -% This is the macro invoked by entries in the aux file. Usually it's -% just a \def (we prepend XR to the control sequence name to avoid -% collisions). But if this is a float type, we have more work to do. -% -\def\xrdef#1#2{% - {% The node name might contain 8-bit characters, which in our current - % implementation are changed to commands like @'e. Don't let these - % mess up the control sequence name. - \indexnofonts - \turnoffactive - \xdef\safexrefname{#1}% - }% - % - \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref - % - % Was that xref control sequence that we just defined for a float? - \expandafter\iffloat\csname XR\safexrefname\endcsname - % it was a float, and we have the (safe) float type in \iffloattype. - \expandafter\let\expandafter\floatlist - \csname floatlist\iffloattype\endcsname - % - % Is this the first time we've seen this float type? - \expandafter\ifx\floatlist\relax - \toks0 = {\do}% yes, so just \do - \else - % had it before, so preserve previous elements in list. - \toks0 = \expandafter{\floatlist\do}% - \fi - % - % Remember this xref in the control sequence \floatlistFLOATTYPE, - % for later use in \listoffloats. - \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0 - {\safexrefname}}% - \fi -} - -% If working on a large document in chapters, it is convenient to -% be able to disable indexing, cross-referencing, and contents, for test runs. -% This is done with @novalidate at the beginning of the file. -% -\newif\iflinks \linkstrue % by default we want the aux files. -\let\novalidate = \linksfalse - -% Used when writing to the aux file, or when using data from it. -\def\requireauxfile{% - \iflinks - \tryauxfile - % Open the new aux file. TeX will close it automatically at exit. - \immediate\openout\auxfile=\jobname.aux - \fi - \global\let\requireauxfile=\relax % Only do this once. -} - -% Read the last existing aux file, if any. No error if none exists. -% -\def\tryauxfile{% - \openin 1 \jobname.aux - \ifeof 1 \else - \readdatafile{aux}% - \global\havexrefstrue - \fi - \closein 1 -} - -\def\setupdatafile{% - \catcode`\^^@=\other - \catcode`\^^A=\other - \catcode`\^^B=\other - \catcode`\^^C=\other - \catcode`\^^D=\other - \catcode`\^^E=\other - \catcode`\^^F=\other - \catcode`\^^G=\other - \catcode`\^^H=\other - \catcode`\^^K=\other - \catcode`\^^L=\other - \catcode`\^^N=\other - \catcode`\^^P=\other - \catcode`\^^Q=\other - \catcode`\^^R=\other - \catcode`\^^S=\other - \catcode`\^^T=\other - \catcode`\^^U=\other - \catcode`\^^V=\other - \catcode`\^^W=\other - \catcode`\^^X=\other - \catcode`\^^Z=\other - \catcode`\^^[=\other - \catcode`\^^\=\other - \catcode`\^^]=\other - \catcode`\^^^=\other - \catcode`\^^_=\other - % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc. - % in xref tags, i.e., node names. But since ^^e4 notation isn't - % supported in the main text, it doesn't seem desirable. Furthermore, - % that is not enough: for node names that actually contain a ^ - % character, we would end up writing a line like this: 'xrdef {'hat - % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first - % argument, and \hat is not an expandable control sequence. It could - % all be worked out, but why? Either we support ^^ or we don't. - % - % The other change necessary for this was to define \auxhat: - % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter - % and then to call \auxhat in \setq. - % - \catcode`\^=\other - % - % Special characters. Should be turned off anyway, but... - \catcode`\~=\other - \catcode`\[=\other - \catcode`\]=\other - \catcode`\"=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other - \catcode`\$=\other - \catcode`\#=\other - \catcode`\&=\other - \catcode`\%=\other - \catcode`+=\other % avoid \+ for paranoia even though we've turned it off - % - % This is to support \ in node names and titles, since the \ - % characters end up in a \csname. It's easier than - % leaving it active and making its active definition an actual \ - % character. What I don't understand is why it works in the *value* - % of the xrdef. Seems like it should be a catcode12 \, and that - % should not typeset properly. But it works, so I'm moving on for - % now. --karl, 15jan04. - \catcode`\\=\other - % - % Make the characters 128-255 be printing characters. - {\setnonasciicharscatcodenonglobal\other}% - % - % @ is our escape character in .aux files, and we need braces. - \catcode`\{=1 - \catcode`\}=2 - \catcode`\@=0 -} - -\def\readdatafile#1{% -\begingroup - \setupdatafile - \input\jobname.#1 -\endgroup} - - -\message{insertions,} -% including footnotes. - -\newcount \footnoteno - -% The trailing space in the following definition for supereject is -% vital for proper filling; pages come out unaligned when you do a -% pagealignmacro call if that space before the closing brace is -% removed. (Generally, numeric constants should always be followed by a -% space to prevent strange expansion errors.) -\def\supereject{\par\penalty -20000\footnoteno =0 } - -% @footnotestyle is meaningful for Info output only. -\let\footnotestyle=\comment - -{\catcode `\@=11 -% -% Auto-number footnotes. Otherwise like plain. -\gdef\footnote{% - \global\advance\footnoteno by \@ne - \edef\thisfootno{$^{\the\footnoteno}$}% - % - % In case the footnote comes at the end of a sentence, preserve the - % extra spacing after we do the footnote number. - \let\@sf\empty - \ifhmode\edef\@sf{\spacefactor\the\spacefactor}\ptexslash\fi - % - % Remove inadvertent blank space before typesetting the footnote number. - \unskip - \thisfootno\@sf - \dofootnote -}% - -% Don't bother with the trickery in plain.tex to not require the -% footnote text as a parameter. Our footnotes don't need to be so general. -% -% Oh yes, they do; otherwise, @ifset (and anything else that uses -% \parseargline) fails inside footnotes because the tokens are fixed when -% the footnote is read. --karl, 16nov96. -% -\gdef\dofootnote{% - \insert\footins\bgroup - % - % Nested footnotes are not supported in TeX, that would take a lot - % more work. (\startsavinginserts does not suffice.) - \let\footnote=\errfootnotenest - % - % We want to typeset this text as a normal paragraph, even if the - % footnote reference occurs in (for example) a display environment. - % So reset some parameters. - \hsize=\pagewidth - \interlinepenalty\interfootnotelinepenalty - \splittopskip\ht\strutbox % top baseline for broken footnotes - \splitmaxdepth\dp\strutbox - \floatingpenalty\@MM - \leftskip\z@skip - \rightskip\z@skip - \spaceskip\z@skip - \xspaceskip\z@skip - \parindent\defaultparindent - % - \smallfonts \rm - % - % Because we use hanging indentation in footnotes, a @noindent appears - % to exdent this text, so make it be a no-op. makeinfo does not use - % hanging indentation so @noindent can still be needed within footnote - % text after an @example or the like (not that this is good style). - \let\noindent = \relax - % - % Hang the footnote text off the number. Use \everypar in case the - % footnote extends for more than one paragraph. - \everypar = {\hang}% - \textindent{\thisfootno}% - % - % Don't crash into the line above the footnote text. Since this - % expands into a box, it must come within the paragraph, lest it - % provide a place where TeX can split the footnote. - \footstrut - % - % Invoke rest of plain TeX footnote routine. - \futurelet\next\fo@t -} -}%end \catcode `\@=11 - -\def\errfootnotenest{% - \errhelp=\EMsimple - \errmessage{Nested footnotes not supported in texinfo.tex, - even though they work in makeinfo; sorry} -} - -\def\errfootnoteheading{% - \errhelp=\EMsimple - \errmessage{Footnotes in chapters, sections, etc., are not supported} -} - -% In case a @footnote appears in a vbox, save the footnote text and create -% the real \insert just after the vbox finished. Otherwise, the insertion -% would be lost. -% Similarly, if a @footnote appears inside an alignment, save the footnote -% text to a box and make the \insert when a row of the table is finished. -% And the same can be done for other insert classes. --kasal, 16nov03. -% -% Replace the \insert primitive by a cheating macro. -% Deeper inside, just make sure that the saved insertions are not spilled -% out prematurely. -% -\def\startsavinginserts{% - \ifx \insert\ptexinsert - \let\insert\saveinsert - \else - \let\checkinserts\relax - \fi -} - -% This \insert replacement works for both \insert\footins{foo} and -% \insert\footins\bgroup foo\egroup, but it doesn't work for \insert27{foo}. -% -\def\saveinsert#1{% - \edef\next{\noexpand\savetobox \makeSAVEname#1}% - \afterassignment\next - % swallow the left brace - \let\temp = -} -\def\makeSAVEname#1{\makecsname{SAVE\expandafter\gobble\string#1}} -\def\savetobox#1{\global\setbox#1 = \vbox\bgroup \unvbox#1} - -\def\checksaveins#1{\ifvoid#1\else \placesaveins#1\fi} - -\def\placesaveins#1{% - \ptexinsert \csname\expandafter\gobblesave\string#1\endcsname - {\box#1}% -} - -% eat @SAVE -- beware, all of them have catcode \other: -{ - \def\dospecials{\do S\do A\do V\do E} \uncatcodespecials % ;-) - \gdef\gobblesave @SAVE{} -} - -% initialization: -\def\newsaveins #1{% - \edef\next{\noexpand\newsaveinsX \makeSAVEname#1}% - \next -} -\def\newsaveinsX #1{% - \csname newbox\endcsname #1% - \expandafter\def\expandafter\checkinserts\expandafter{\checkinserts - \checksaveins #1}% -} - -% initialize: -\let\checkinserts\empty -\newsaveins\footins -\newsaveins\margin - - -% @image. We use the macros from epsf.tex to support this. -% If epsf.tex is not installed and @image is used, we complain. -% -% Check for and read epsf.tex up front. If we read it only at @image -% time, we might be inside a group, and then its definitions would get -% undone and the next image would fail. -\openin 1 = epsf.tex -\ifeof 1 \else - % Do not bother showing banner with epsf.tex v2.7k (available in - % doc/epsf.tex and on ctan). - \def\epsfannounce{\toks0 = }% - \input epsf.tex -\fi -\closein 1 -% -% We will only complain once about lack of epsf.tex. -\newif\ifwarnednoepsf -\newhelp\noepsfhelp{epsf.tex must be installed for images to - work. It is also included in the Texinfo distribution, or you can get - it from ftp://tug.org/tex/epsf.tex.} -% -\def\image#1{% - \ifx\epsfbox\thisisundefined - \ifwarnednoepsf \else - \errhelp = \noepsfhelp - \errmessage{epsf.tex not found, images will be ignored}% - \global\warnednoepsftrue - \fi - \else - \imagexxx #1,,,,,\finish - \fi -} -% -% Arguments to @image: -% #1 is (mandatory) image filename; we tack on .eps extension. -% #2 is (optional) width, #3 is (optional) height. -% #4 is (ignored optional) html alt text. -% #5 is (ignored optional) extension. -% #6 is just the usual extra ignored arg for parsing stuff. -\newif\ifimagevmode -\def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup - \catcode`\^^M = 5 % in case we're inside an example - \normalturnoffactive % allow _ et al. in names - \def\xprocessmacroarg{\eatspaces}% in case we are being used via a macro - % If the image is by itself, center it. - \ifvmode - \imagevmodetrue - \else \ifx\centersub\centerV - % for @center @image, we need a vbox so we can have our vertical space - \imagevmodetrue - \vbox\bgroup % vbox has better behavior than vtop herev - \fi\fi - % - \ifimagevmode - \nobreak\medskip - % Usually we'll have text after the image which will insert - % \parskip glue, so insert it here too to equalize the space - % above and below. - \nobreak\vskip\parskip - \nobreak - \fi - % - % Leave vertical mode so that indentation from an enclosing - % environment such as @quotation is respected. - % However, if we're at the top level, we don't want the - % normal paragraph indentation. - % On the other hand, if we are in the case of @center @image, we don't - % want to start a paragraph, which will create a hsize-width box and - % eradicate the centering. - \ifx\centersub\centerV\else \noindent \fi - % - % Output the image. - \ifpdf - \dopdfimage{#1}{#2}{#3}% - \else - % \epsfbox itself resets \epsf?size at each figure. - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi - \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi - \epsfbox{#1.eps}% - \fi - % - \ifimagevmode - \medskip % space after a standalone image - \fi - \ifx\centersub\centerV \egroup \fi -\endgroup} - - -% @float FLOATTYPE,LABEL,LOC ... @end float for displayed figures, tables, -% etc. We don't actually implement floating yet, we always include the -% float "here". But it seemed the best name for the future. -% -\envparseargdef\float{\eatcommaspace\eatcommaspace\dofloat#1, , ,\finish} - -% There may be a space before second and/or third parameter; delete it. -\def\eatcommaspace#1, {#1,} - -% #1 is the optional FLOATTYPE, the text label for this float, typically -% "Figure", "Table", "Example", etc. Can't contain commas. If omitted, -% this float will not be numbered and cannot be referred to. -% -% #2 is the optional xref label. Also must be present for the float to -% be referable. -% -% #3 is the optional positioning argument; for now, it is ignored. It -% will somehow specify the positions allowed to float to (here, top, bottom). -% -% We keep a separate counter for each FLOATTYPE, which we reset at each -% chapter-level command. -\let\resetallfloatnos=\empty -% -\def\dofloat#1,#2,#3,#4\finish{% - \let\thiscaption=\empty - \let\thisshortcaption=\empty - % - % don't lose footnotes inside @float. - % - % BEWARE: when the floats start float, we have to issue warning whenever an - % insert appears inside a float which could possibly float. --kasal, 26may04 - % - \startsavinginserts - % - % We can't be used inside a paragraph. - \par - % - \vtop\bgroup - \def\floattype{#1}% - \def\floatlabel{#2}% - \def\floatloc{#3}% we do nothing with this yet. - % - \ifx\floattype\empty - \let\safefloattype=\empty - \else - {% - % the floattype might have accents or other special characters, - % but we need to use it in a control sequence name. - \indexnofonts - \turnoffactive - \xdef\safefloattype{\floattype}% - }% - \fi - % - % If label is given but no type, we handle that as the empty type. - \ifx\floatlabel\empty \else - % We want each FLOATTYPE to be numbered separately (Figure 1, - % Table 1, Figure 2, ...). (And if no label, no number.) - % - \expandafter\getfloatno\csname\safefloattype floatno\endcsname - \global\advance\floatno by 1 - % - {% - % This magic value for \lastsection is output by \setref as the - % XREFLABEL-title value. \xrefX uses it to distinguish float - % labels (which have a completely different output format) from - % node and anchor labels. And \xrdef uses it to construct the - % lists of floats. - % - \edef\lastsection{\floatmagic=\safefloattype}% - \setref{\floatlabel}{Yfloat}% - }% - \fi - % - % start with \parskip glue, I guess. - \vskip\parskip - % - % Don't suppress indentation if a float happens to start a section. - \restorefirstparagraphindent -} - -% we have these possibilities: -% @float Foo,lbl & @caption{Cap}: Foo 1.1: Cap -% @float Foo,lbl & no caption: Foo 1.1 -% @float Foo & @caption{Cap}: Foo: Cap -% @float Foo & no caption: Foo -% @float ,lbl & Caption{Cap}: 1.1: Cap -% @float ,lbl & no caption: 1.1 -% @float & @caption{Cap}: Cap -% @float & no caption: -% -\def\Efloat{% - \let\floatident = \empty - % - % In all cases, if we have a float type, it comes first. - \ifx\floattype\empty \else \def\floatident{\floattype}\fi - % - % If we have an xref label, the number comes next. - \ifx\floatlabel\empty \else - \ifx\floattype\empty \else % if also had float type, need tie first. - \appendtomacro\floatident{\tie}% - \fi - % the number. - \appendtomacro\floatident{\chaplevelprefix\the\floatno}% - \fi - % - % Start the printed caption with what we've constructed in - % \floatident, but keep it separate; we need \floatident again. - \let\captionline = \floatident - % - \ifx\thiscaption\empty \else - \ifx\floatident\empty \else - \appendtomacro\captionline{: }% had ident, so need a colon between - \fi - % - % caption text. - \appendtomacro\captionline{\scanexp\thiscaption}% - \fi - % - % If we have anything to print, print it, with space before. - % Eventually this needs to become an \insert. - \ifx\captionline\empty \else - \vskip.5\parskip - \captionline - % - % Space below caption. - \vskip\parskip - \fi - % - % If have an xref label, write the list of floats info. Do this - % after the caption, to avoid chance of it being a breakpoint. - \ifx\floatlabel\empty \else - % Write the text that goes in the lof to the aux file as - % \floatlabel-lof. Besides \floatident, we include the short - % caption if specified, else the full caption if specified, else nothing. - {% - \requireauxfile - \atdummies - % - % since we read the caption text in the macro world, where ^^M - % is turned into a normal character, we have to scan it back, so - % we don't write the literal three characters "^^M" into the aux file. - \scanexp{% - \xdef\noexpand\gtemp{% - \ifx\thisshortcaption\empty - \thiscaption - \else - \thisshortcaption - \fi - }% - }% - \immediate\write\auxfile{@xrdef{\floatlabel-lof}{\floatident - \ifx\gtemp\empty \else : \gtemp \fi}}% - }% - \fi - \egroup % end of \vtop - % - % place the captured inserts - % - % BEWARE: when the floats start floating, we have to issue warning - % whenever an insert appears inside a float which could possibly - % float. --kasal, 26may04 - % - \checkinserts -} - -% Append the tokens #2 to the definition of macro #1, not expanding either. -% -\def\appendtomacro#1#2{% - \expandafter\def\expandafter#1\expandafter{#1#2}% -} - -% @caption, @shortcaption -% -\def\caption{\docaption\thiscaption} -\def\shortcaption{\docaption\thisshortcaption} -\def\docaption{\checkenv\float \bgroup\scanargctxt\defcaption} -\def\defcaption#1#2{\egroup \def#1{#2}} - -% The parameter is the control sequence identifying the counter we are -% going to use. Create it if it doesn't exist and assign it to \floatno. -\def\getfloatno#1{% - \ifx#1\relax - % Haven't seen this figure type before. - \csname newcount\endcsname #1% - % - % Remember to reset this floatno at the next chap. - \expandafter\gdef\expandafter\resetallfloatnos - \expandafter{\resetallfloatnos #1=0 }% - \fi - \let\floatno#1% -} - -% \setref calls this to get the XREFLABEL-snt value. We want an @xref -% to the FLOATLABEL to expand to "Figure 3.1". We call \setref when we -% first read the @float command. -% -\def\Yfloat{\floattype@tie \chaplevelprefix\the\floatno}% - -% Magic string used for the XREFLABEL-title value, so \xrefX can -% distinguish floats from other xref types. -\def\floatmagic{!!float!!} - -% #1 is the control sequence we are passed; we expand into a conditional -% which is true if #1 represents a float ref. That is, the magic -% \lastsection value which we \setref above. -% -\def\iffloat#1{\expandafter\doiffloat#1==\finish} -% -% #1 is (maybe) the \floatmagic string. If so, #2 will be the -% (safe) float type for this float. We set \iffloattype to #2. -% -\def\doiffloat#1=#2=#3\finish{% - \def\temp{#1}% - \def\iffloattype{#2}% - \ifx\temp\floatmagic -} - -% @listoffloats FLOATTYPE - print a list of floats like a table of contents. -% -\parseargdef\listoffloats{% - \def\floattype{#1}% floattype - {% - % the floattype might have accents or other special characters, - % but we need to use it in a control sequence name. - \indexnofonts - \turnoffactive - \xdef\safefloattype{\floattype}% - }% - % - % \xrdef saves the floats as a \do-list in \floatlistSAFEFLOATTYPE. - \expandafter\ifx\csname floatlist\safefloattype\endcsname \relax - \ifhavexrefs - % if the user said @listoffloats foo but never @float foo. - \message{\linenumber No `\safefloattype' floats to list.}% - \fi - \else - \begingroup - \leftskip=\tocindent % indent these entries like a toc - \let\do=\listoffloatsdo - \csname floatlist\safefloattype\endcsname - \endgroup - \fi -} - -% This is called on each entry in a list of floats. We're passed the -% xref label, in the form LABEL-title, which is how we save it in the -% aux file. We strip off the -title and look up \XRLABEL-lof, which -% has the text we're supposed to typeset here. -% -% Figures without xref labels will not be included in the list (since -% they won't appear in the aux file). -% -\def\listoffloatsdo#1{\listoffloatsdoentry#1\finish} -\def\listoffloatsdoentry#1-title\finish{{% - % Can't fully expand XR#1-lof because it can contain anything. Just - % pass the control sequence. On the other hand, XR#1-pg is just the - % page number, and we want to fully expand that so we can get a link - % in pdf output. - \toksA = \expandafter{\csname XR#1-lof\endcsname}% - % - % use the same \entry macro we use to generate the TOC and index. - \edef\writeentry{\noexpand\entry{\the\toksA}{\csname XR#1-pg\endcsname}}% - \writeentry -}} - - -\message{localization,} - -% For single-language documents, @documentlanguage is usually given very -% early, just after @documentencoding. Single argument is the language -% (de) or locale (de_DE) abbreviation. -% -{ - \catcode`\_ = \active - \globaldefs=1 -\parseargdef\documentlanguage{% - \tex % read txi-??.tex file in plain TeX. - % Read the file by the name they passed if it exists. - \let_ = \normalunderscore % normal _ character for filename test - \openin 1 txi-#1.tex - \ifeof 1 - \documentlanguagetrywithoutunderscore #1_\finish - \else - \globaldefs = 1 % everything in the txi-LL files needs to persist - \input txi-#1.tex - \fi - \closein 1 - \endgroup % end raw TeX -} -% -% If they passed de_DE, and txi-de_DE.tex doesn't exist, -% try txi-de.tex. -% -\gdef\documentlanguagetrywithoutunderscore#1_#2\finish{% - \openin 1 txi-#1.tex - \ifeof 1 - \errhelp = \nolanghelp - \errmessage{Cannot read language file txi-#1.tex}% - \else - \globaldefs = 1 % everything in the txi-LL files needs to persist - \input txi-#1.tex - \fi - \closein 1 -} -}% end of special _ catcode -% -\newhelp\nolanghelp{The given language definition file cannot be found or -is empty. Maybe you need to install it? Putting it in the current -directory should work if nowhere else does.} - -% This macro is called from txi-??.tex files; the first argument is the -% \language name to set (without the "\lang@" prefix), the second and -% third args are \{left,right}hyphenmin. -% -% The language names to pass are determined when the format is built. -% See the etex.log file created at that time, e.g., -% /usr/local/texlive/2008/texmf-var/web2c/pdftex/etex.log. -% -% With TeX Live 2008, etex now includes hyphenation patterns for all -% available languages. This means we can support hyphenation in -% Texinfo, at least to some extent. (This still doesn't solve the -% accented characters problem.) -% -\catcode`@=11 -\def\txisetlanguage#1#2#3{% - % do not set the language if the name is undefined in the current TeX. - \expandafter\ifx\csname lang@#1\endcsname \relax - \message{no patterns for #1}% - \else - \global\language = \csname lang@#1\endcsname - \fi - % but there is no harm in adjusting the hyphenmin values regardless. - \global\lefthyphenmin = #2\relax - \global\righthyphenmin = #3\relax -} - -% Get input by bytes instead of by UTF-8 codepoints for XeTeX and LuaTeX, -% otherwise the encoding support is completely broken. -\ifx\XeTeXrevision\thisisundefined -\else -\XeTeXdefaultencoding "bytes" % For subsequent files to be read -\XeTeXinputencoding "bytes" % Effective in texinfo.tex only -% Unfortunately, there seems to be no corresponding XeTeX command for -% output encoding. This is a problem for auxiliary index and TOC files. -% The only solution would be perhaps to write out @U{...} sequences in -% place of UTF-8 characters. -\fi - -\ifx\luatexversion\thisisundefined -\else -\directlua{ -local utf8_char, byte, gsub = unicode.utf8.char, string.byte, string.gsub -local function convert_char (char) - return utf8_char(byte(char)) -end - -local function convert_line (line) - return gsub(line, ".", convert_char) -end - -callback.register("process_input_buffer", convert_line) - -local function convert_line_out (line) - local line_out = "" - for c in string.utfvalues(line) do - line_out = line_out .. string.char(c) - end - return line_out -end - -callback.register("process_output_buffer", convert_line_out) -} -\fi - - -% Helpers for encodings. -% Set the catcode of characters 128 through 255 to the specified number. -% -\def\setnonasciicharscatcode#1{% - \count255=128 - \loop\ifnum\count255<256 - \global\catcode\count255=#1\relax - \advance\count255 by 1 - \repeat -} - -\def\setnonasciicharscatcodenonglobal#1{% - \count255=128 - \loop\ifnum\count255<256 - \catcode\count255=#1\relax - \advance\count255 by 1 - \repeat -} - -% @documentencoding sets the definition of non-ASCII characters -% according to the specified encoding. -% -\def\documentencoding{\parseargusing\filenamecatcodes\documentencodingzzz} -\def\documentencodingzzz#1{% - % Get input by bytes instead of by UTF-8 codepoints for XeTeX, - % otherwise the encoding support is completely broken. - % This settings is for the document root file. - \ifx\XeTeXrevision\thisisundefined - \else - \XeTeXinputencoding "bytes" - \fi - % - % Encoding being declared for the document. - \def\declaredencoding{\csname #1.enc\endcsname}% - % - % Supported encodings: names converted to tokens in order to be able - % to compare them with \ifx. - \def\ascii{\csname US-ASCII.enc\endcsname}% - \def\latnine{\csname ISO-8859-15.enc\endcsname}% - \def\latone{\csname ISO-8859-1.enc\endcsname}% - \def\lattwo{\csname ISO-8859-2.enc\endcsname}% - \def\utfeight{\csname UTF-8.enc\endcsname}% - % - \ifx \declaredencoding \ascii - \asciichardefs - % - \else \ifx \declaredencoding \lattwo - \setnonasciicharscatcode\active - \lattwochardefs - % - \else \ifx \declaredencoding \latone - \setnonasciicharscatcode\active - \latonechardefs - % - \else \ifx \declaredencoding \latnine - \setnonasciicharscatcode\active - \latninechardefs - % - \else \ifx \declaredencoding \utfeight - \setnonasciicharscatcode\active - % since we already invoked \utfeightchardefs at the top level - % (below), do not re-invoke it, then our check for duplicated - % definitions triggers. Making non-ascii chars active is enough. - % - \else - \message{Ignoring unknown document encoding: #1.}% - % - \fi % utfeight - \fi % latnine - \fi % latone - \fi % lattwo - \fi % ascii -} - -% emacs-page -% A message to be logged when using a character that isn't available -% the default font encoding (OT1). -% -\def\missingcharmsg#1{\message{Character missing, sorry: #1.}} - -% Take account of \c (plain) vs. \, (Texinfo) difference. -\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} - -% First, make active non-ASCII characters in order for them to be -% correctly categorized when TeX reads the replacement text of -% macros containing the character definitions. -\setnonasciicharscatcode\active -% -% Latin1 (ISO-8859-1) character definitions. -\def\latonechardefs{% - \gdef^^a0{\tie} - \gdef^^a1{\exclamdown} - \gdef^^a2{{\tcfont \char162}} % cent - \gdef^^a3{\pounds} - \gdef^^a4{{\tcfont \char164}} % currency - \gdef^^a5{{\tcfont \char165}} % yen - \gdef^^a6{{\tcfont \char166}} % broken bar - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\copyright} - \gdef^^aa{\ordf} - \gdef^^ab{\guillemetleft} - \gdef^^ac{\ensuremath\lnot} - \gdef^^ad{\-} - \gdef^^ae{\registeredsymbol} - \gdef^^af{\={}} - % - \gdef^^b0{\textdegree} - \gdef^^b1{$\pm$} - \gdef^^b2{$^2$} - \gdef^^b3{$^3$} - \gdef^^b4{\'{}} - \gdef^^b5{$\mu$} - \gdef^^b6{\P} - \gdef^^b7{\ensuremath\cdot} - \gdef^^b8{\cedilla\ } - \gdef^^b9{$^1$} - \gdef^^ba{\ordm} - \gdef^^bb{\guillemetright} - \gdef^^bc{$1\over4$} - \gdef^^bd{$1\over2$} - \gdef^^be{$3\over4$} - \gdef^^bf{\questiondown} - % - \gdef^^c0{\`A} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\~A} - \gdef^^c4{\"A} - \gdef^^c5{\ringaccent A} - \gdef^^c6{\AE} - \gdef^^c7{\cedilla C} - \gdef^^c8{\`E} - \gdef^^c9{\'E} - \gdef^^ca{\^E} - \gdef^^cb{\"E} - \gdef^^cc{\`I} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\"I} - % - \gdef^^d0{\DH} - \gdef^^d1{\~N} - \gdef^^d2{\`O} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\~O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\O} - \gdef^^d9{\`U} - \gdef^^da{\'U} - \gdef^^db{\^U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\TH} - \gdef^^df{\ss} - % - \gdef^^e0{\`a} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\~a} - \gdef^^e4{\"a} - \gdef^^e5{\ringaccent a} - \gdef^^e6{\ae} - \gdef^^e7{\cedilla c} - \gdef^^e8{\`e} - \gdef^^e9{\'e} - \gdef^^ea{\^e} - \gdef^^eb{\"e} - \gdef^^ec{\`{\dotless i}} - \gdef^^ed{\'{\dotless i}} - \gdef^^ee{\^{\dotless i}} - \gdef^^ef{\"{\dotless i}} - % - \gdef^^f0{\dh} - \gdef^^f1{\~n} - \gdef^^f2{\`o} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\~o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\o} - \gdef^^f9{\`u} - \gdef^^fa{\'u} - \gdef^^fb{\^u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\th} - \gdef^^ff{\"y} -} - -% Latin9 (ISO-8859-15) encoding character definitions. -\def\latninechardefs{% - % Encoding is almost identical to Latin1. - \latonechardefs - % - \gdef^^a4{\euro} - \gdef^^a6{\v S} - \gdef^^a8{\v s} - \gdef^^b4{\v Z} - \gdef^^b8{\v z} - \gdef^^bc{\OE} - \gdef^^bd{\oe} - \gdef^^be{\"Y} -} - -% Latin2 (ISO-8859-2) character definitions. -\def\lattwochardefs{% - \gdef^^a0{\tie} - \gdef^^a1{\ogonek{A}} - \gdef^^a2{\u{}} - \gdef^^a3{\L} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\v L} - \gdef^^a6{\'S} - \gdef^^a7{\S} - \gdef^^a8{\"{}} - \gdef^^a9{\v S} - \gdef^^aa{\cedilla S} - \gdef^^ab{\v T} - \gdef^^ac{\'Z} - \gdef^^ad{\-} - \gdef^^ae{\v Z} - \gdef^^af{\dotaccent Z} - % - \gdef^^b0{\textdegree} - \gdef^^b1{\ogonek{a}} - \gdef^^b2{\ogonek{ }} - \gdef^^b3{\l} - \gdef^^b4{\'{}} - \gdef^^b5{\v l} - \gdef^^b6{\'s} - \gdef^^b7{\v{}} - \gdef^^b8{\cedilla\ } - \gdef^^b9{\v s} - \gdef^^ba{\cedilla s} - \gdef^^bb{\v t} - \gdef^^bc{\'z} - \gdef^^bd{\H{}} - \gdef^^be{\v z} - \gdef^^bf{\dotaccent z} - % - \gdef^^c0{\'R} - \gdef^^c1{\'A} - \gdef^^c2{\^A} - \gdef^^c3{\u A} - \gdef^^c4{\"A} - \gdef^^c5{\'L} - \gdef^^c6{\'C} - \gdef^^c7{\cedilla C} - \gdef^^c8{\v C} - \gdef^^c9{\'E} - \gdef^^ca{\ogonek{E}} - \gdef^^cb{\"E} - \gdef^^cc{\v E} - \gdef^^cd{\'I} - \gdef^^ce{\^I} - \gdef^^cf{\v D} - % - \gdef^^d0{\DH} - \gdef^^d1{\'N} - \gdef^^d2{\v N} - \gdef^^d3{\'O} - \gdef^^d4{\^O} - \gdef^^d5{\H O} - \gdef^^d6{\"O} - \gdef^^d7{$\times$} - \gdef^^d8{\v R} - \gdef^^d9{\ringaccent U} - \gdef^^da{\'U} - \gdef^^db{\H U} - \gdef^^dc{\"U} - \gdef^^dd{\'Y} - \gdef^^de{\cedilla T} - \gdef^^df{\ss} - % - \gdef^^e0{\'r} - \gdef^^e1{\'a} - \gdef^^e2{\^a} - \gdef^^e3{\u a} - \gdef^^e4{\"a} - \gdef^^e5{\'l} - \gdef^^e6{\'c} - \gdef^^e7{\cedilla c} - \gdef^^e8{\v c} - \gdef^^e9{\'e} - \gdef^^ea{\ogonek{e}} - \gdef^^eb{\"e} - \gdef^^ec{\v e} - \gdef^^ed{\'{\dotless{i}}} - \gdef^^ee{\^{\dotless{i}}} - \gdef^^ef{\v d} - % - \gdef^^f0{\dh} - \gdef^^f1{\'n} - \gdef^^f2{\v n} - \gdef^^f3{\'o} - \gdef^^f4{\^o} - \gdef^^f5{\H o} - \gdef^^f6{\"o} - \gdef^^f7{$\div$} - \gdef^^f8{\v r} - \gdef^^f9{\ringaccent u} - \gdef^^fa{\'u} - \gdef^^fb{\H u} - \gdef^^fc{\"u} - \gdef^^fd{\'y} - \gdef^^fe{\cedilla t} - \gdef^^ff{\dotaccent{}} -} - -% UTF-8 character definitions. -% -% This code to support UTF-8 is based on LaTeX's utf8.def, with some -% changes for Texinfo conventions. It is included here under the GPL by -% permission from Frank Mittelbach and the LaTeX team. -% -\newcount\countUTFx -\newcount\countUTFy -\newcount\countUTFz - -\gdef\UTFviiiTwoOctets#1#2{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\endcsname} -% -\gdef\UTFviiiThreeOctets#1#2#3{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname} -% -\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter - \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname} - -\gdef\UTFviiiDefined#1{% - \ifx #1\relax - \message{\linenumber Unicode char \string #1 not defined for Texinfo}% - \else - \expandafter #1% - \fi -} - -\begingroup - \catcode`\~13 - \catcode`\"12 - - \def\UTFviiiLoop{% - \global\catcode\countUTFx\active - \uccode`\~\countUTFx - \uppercase\expandafter{\UTFviiiTmp}% - \advance\countUTFx by 1 - \ifnum\countUTFx < \countUTFy - \expandafter\UTFviiiLoop - \fi} - - \countUTFx = "C2 - \countUTFy = "E0 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiTwoOctets\string~}} - \UTFviiiLoop - - \countUTFx = "E0 - \countUTFy = "F0 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiThreeOctets\string~}} - \UTFviiiLoop - - \countUTFx = "F0 - \countUTFy = "F4 - \def\UTFviiiTmp{% - \xdef~{\noexpand\UTFviiiFourOctets\string~}} - \UTFviiiLoop -\endgroup - -\def\globallet{\global\let} % save some \expandafter's below - -% @U{xxxx} to produce U+xxxx, if we support it. -\def\U#1{% - \expandafter\ifx\csname uni:#1\endcsname \relax - \errhelp = \EMsimple - \errmessage{Unicode character U+#1 not supported, sorry}% - \else - \csname uni:#1\endcsname - \fi -} - -\begingroup - \catcode`\"=12 - \catcode`\<=12 - \catcode`\.=12 - \catcode`\,=12 - \catcode`\;=12 - \catcode`\!=12 - \catcode`\~=13 - \gdef\DeclareUnicodeCharacter#1#2{% - \countUTFz = "#1\relax - %\wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}% - \begingroup - \parseXMLCharref - \def\UTFviiiTwoOctets##1##2{% - \csname u8:##1\string ##2\endcsname}% - \def\UTFviiiThreeOctets##1##2##3{% - \csname u8:##1\string ##2\string ##3\endcsname}% - \def\UTFviiiFourOctets##1##2##3##4{% - \csname u8:##1\string ##2\string ##3\string ##4\endcsname}% - \expandafter\expandafter\expandafter\expandafter - \expandafter\expandafter\expandafter - \gdef\UTFviiiTmp{#2}% - % - \expandafter\ifx\csname uni:#1\endcsname \relax \else - \message{Internal error, already defined: #1}% - \fi - % - % define an additional control sequence for this code point. - \expandafter\globallet\csname uni:#1\endcsname \UTFviiiTmp - \endgroup} - - \gdef\parseXMLCharref{% - \ifnum\countUTFz < "A0\relax - \errhelp = \EMsimple - \errmessage{Cannot define Unicode char value < 00A0}% - \else\ifnum\countUTFz < "800\relax - \parseUTFviiiA,% - \parseUTFviiiB C\UTFviiiTwoOctets.,% - \else\ifnum\countUTFz < "10000\relax - \parseUTFviiiA;% - \parseUTFviiiA,% - \parseUTFviiiB E\UTFviiiThreeOctets.{,;}% - \else - \parseUTFviiiA;% - \parseUTFviiiA,% - \parseUTFviiiA!% - \parseUTFviiiB F\UTFviiiFourOctets.{!,;}% - \fi\fi\fi - } - - \gdef\parseUTFviiiA#1{% - \countUTFx = \countUTFz - \divide\countUTFz by 64 - \countUTFy = \countUTFz - \multiply\countUTFz by 64 - \advance\countUTFx by -\countUTFz - \advance\countUTFx by 128 - \uccode `#1\countUTFx - \countUTFz = \countUTFy} - - \gdef\parseUTFviiiB#1#2#3#4{% - \advance\countUTFz by "#10\relax - \uccode `#3\countUTFz - \uppercase{\gdef\UTFviiiTmp{#2#3#4}}} -\endgroup - -% https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_M -% U+0000..U+007F = https://en.wikipedia.org/wiki/Basic_Latin_(Unicode_block) -% U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block) -% U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A -% U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B -% -% Many of our renditions are less than wonderful, and all the missing -% characters are available somewhere. Loading the necessary fonts -% awaits user request. We can't truly support Unicode without -% reimplementing everything that's been done in LaTeX for many years, -% plus probably using luatex or xetex, and who knows what else. -% We won't be doing that here in this simple file. But we can try to at -% least make most of the characters not bomb out. -% -\def\utfeightchardefs{% - \DeclareUnicodeCharacter{00A0}{\tie} - \DeclareUnicodeCharacter{00A1}{\exclamdown} - \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent - \DeclareUnicodeCharacter{00A3}{\pounds} - \DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency - \DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen - \DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar - \DeclareUnicodeCharacter{00A7}{\S} - \DeclareUnicodeCharacter{00A8}{\"{ }} - \DeclareUnicodeCharacter{00A9}{\copyright} - \DeclareUnicodeCharacter{00AA}{\ordf} - \DeclareUnicodeCharacter{00AB}{\guillemetleft} - \DeclareUnicodeCharacter{00AC}{\ensuremath\lnot} - \DeclareUnicodeCharacter{00AD}{\-} - \DeclareUnicodeCharacter{00AE}{\registeredsymbol} - \DeclareUnicodeCharacter{00AF}{\={ }} - % - \DeclareUnicodeCharacter{00B0}{\ringaccent{ }} - \DeclareUnicodeCharacter{00B1}{\ensuremath\pm} - \DeclareUnicodeCharacter{00B2}{$^2$} - \DeclareUnicodeCharacter{00B3}{$^3$} - \DeclareUnicodeCharacter{00B4}{\'{ }} - \DeclareUnicodeCharacter{00B5}{$\mu$} - \DeclareUnicodeCharacter{00B6}{\P} - \DeclareUnicodeCharacter{00B7}{\ensuremath\cdot} - \DeclareUnicodeCharacter{00B8}{\cedilla{ }} - \DeclareUnicodeCharacter{00B9}{$^1$} - \DeclareUnicodeCharacter{00BA}{\ordm} - \DeclareUnicodeCharacter{00BB}{\guillemetright} - \DeclareUnicodeCharacter{00BC}{$1\over4$} - \DeclareUnicodeCharacter{00BD}{$1\over2$} - \DeclareUnicodeCharacter{00BE}{$3\over4$} - \DeclareUnicodeCharacter{00BF}{\questiondown} - % - \DeclareUnicodeCharacter{00C0}{\`A} - \DeclareUnicodeCharacter{00C1}{\'A} - \DeclareUnicodeCharacter{00C2}{\^A} - \DeclareUnicodeCharacter{00C3}{\~A} - \DeclareUnicodeCharacter{00C4}{\"A} - \DeclareUnicodeCharacter{00C5}{\AA} - \DeclareUnicodeCharacter{00C6}{\AE} - \DeclareUnicodeCharacter{00C7}{\cedilla{C}} - \DeclareUnicodeCharacter{00C8}{\`E} - \DeclareUnicodeCharacter{00C9}{\'E} - \DeclareUnicodeCharacter{00CA}{\^E} - \DeclareUnicodeCharacter{00CB}{\"E} - \DeclareUnicodeCharacter{00CC}{\`I} - \DeclareUnicodeCharacter{00CD}{\'I} - \DeclareUnicodeCharacter{00CE}{\^I} - \DeclareUnicodeCharacter{00CF}{\"I} - % - \DeclareUnicodeCharacter{00D0}{\DH} - \DeclareUnicodeCharacter{00D1}{\~N} - \DeclareUnicodeCharacter{00D2}{\`O} - \DeclareUnicodeCharacter{00D3}{\'O} - \DeclareUnicodeCharacter{00D4}{\^O} - \DeclareUnicodeCharacter{00D5}{\~O} - \DeclareUnicodeCharacter{00D6}{\"O} - \DeclareUnicodeCharacter{00D7}{\ensuremath\times} - \DeclareUnicodeCharacter{00D8}{\O} - \DeclareUnicodeCharacter{00D9}{\`U} - \DeclareUnicodeCharacter{00DA}{\'U} - \DeclareUnicodeCharacter{00DB}{\^U} - \DeclareUnicodeCharacter{00DC}{\"U} - \DeclareUnicodeCharacter{00DD}{\'Y} - \DeclareUnicodeCharacter{00DE}{\TH} - \DeclareUnicodeCharacter{00DF}{\ss} - % - \DeclareUnicodeCharacter{00E0}{\`a} - \DeclareUnicodeCharacter{00E1}{\'a} - \DeclareUnicodeCharacter{00E2}{\^a} - \DeclareUnicodeCharacter{00E3}{\~a} - \DeclareUnicodeCharacter{00E4}{\"a} - \DeclareUnicodeCharacter{00E5}{\aa} - \DeclareUnicodeCharacter{00E6}{\ae} - \DeclareUnicodeCharacter{00E7}{\cedilla{c}} - \DeclareUnicodeCharacter{00E8}{\`e} - \DeclareUnicodeCharacter{00E9}{\'e} - \DeclareUnicodeCharacter{00EA}{\^e} - \DeclareUnicodeCharacter{00EB}{\"e} - \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}} - \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}} - \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}} - \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}} - % - \DeclareUnicodeCharacter{00F0}{\dh} - \DeclareUnicodeCharacter{00F1}{\~n} - \DeclareUnicodeCharacter{00F2}{\`o} - \DeclareUnicodeCharacter{00F3}{\'o} - \DeclareUnicodeCharacter{00F4}{\^o} - \DeclareUnicodeCharacter{00F5}{\~o} - \DeclareUnicodeCharacter{00F6}{\"o} - \DeclareUnicodeCharacter{00F7}{\ensuremath\div} - \DeclareUnicodeCharacter{00F8}{\o} - \DeclareUnicodeCharacter{00F9}{\`u} - \DeclareUnicodeCharacter{00FA}{\'u} - \DeclareUnicodeCharacter{00FB}{\^u} - \DeclareUnicodeCharacter{00FC}{\"u} - \DeclareUnicodeCharacter{00FD}{\'y} - \DeclareUnicodeCharacter{00FE}{\th} - \DeclareUnicodeCharacter{00FF}{\"y} - % - \DeclareUnicodeCharacter{0100}{\=A} - \DeclareUnicodeCharacter{0101}{\=a} - \DeclareUnicodeCharacter{0102}{\u{A}} - \DeclareUnicodeCharacter{0103}{\u{a}} - \DeclareUnicodeCharacter{0104}{\ogonek{A}} - \DeclareUnicodeCharacter{0105}{\ogonek{a}} - \DeclareUnicodeCharacter{0106}{\'C} - \DeclareUnicodeCharacter{0107}{\'c} - \DeclareUnicodeCharacter{0108}{\^C} - \DeclareUnicodeCharacter{0109}{\^c} - \DeclareUnicodeCharacter{010A}{\dotaccent{C}} - \DeclareUnicodeCharacter{010B}{\dotaccent{c}} - \DeclareUnicodeCharacter{010C}{\v{C}} - \DeclareUnicodeCharacter{010D}{\v{c}} - \DeclareUnicodeCharacter{010E}{\v{D}} - \DeclareUnicodeCharacter{010F}{d'} - % - \DeclareUnicodeCharacter{0110}{\DH} - \DeclareUnicodeCharacter{0111}{\dh} - \DeclareUnicodeCharacter{0112}{\=E} - \DeclareUnicodeCharacter{0113}{\=e} - \DeclareUnicodeCharacter{0114}{\u{E}} - \DeclareUnicodeCharacter{0115}{\u{e}} - \DeclareUnicodeCharacter{0116}{\dotaccent{E}} - \DeclareUnicodeCharacter{0117}{\dotaccent{e}} - \DeclareUnicodeCharacter{0118}{\ogonek{E}} - \DeclareUnicodeCharacter{0119}{\ogonek{e}} - \DeclareUnicodeCharacter{011A}{\v{E}} - \DeclareUnicodeCharacter{011B}{\v{e}} - \DeclareUnicodeCharacter{011C}{\^G} - \DeclareUnicodeCharacter{011D}{\^g} - \DeclareUnicodeCharacter{011E}{\u{G}} - \DeclareUnicodeCharacter{011F}{\u{g}} - % - \DeclareUnicodeCharacter{0120}{\dotaccent{G}} - \DeclareUnicodeCharacter{0121}{\dotaccent{g}} - \DeclareUnicodeCharacter{0122}{\cedilla{G}} - \DeclareUnicodeCharacter{0123}{\cedilla{g}} - \DeclareUnicodeCharacter{0124}{\^H} - \DeclareUnicodeCharacter{0125}{\^h} - \DeclareUnicodeCharacter{0126}{\missingcharmsg{H WITH STROKE}} - \DeclareUnicodeCharacter{0127}{\missingcharmsg{h WITH STROKE}} - \DeclareUnicodeCharacter{0128}{\~I} - \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}} - \DeclareUnicodeCharacter{012A}{\=I} - \DeclareUnicodeCharacter{012B}{\={\dotless{i}}} - \DeclareUnicodeCharacter{012C}{\u{I}} - \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}} - \DeclareUnicodeCharacter{012E}{\ogonek{I}} - \DeclareUnicodeCharacter{012F}{\ogonek{i}} - % - \DeclareUnicodeCharacter{0130}{\dotaccent{I}} - \DeclareUnicodeCharacter{0131}{\dotless{i}} - \DeclareUnicodeCharacter{0132}{IJ} - \DeclareUnicodeCharacter{0133}{ij} - \DeclareUnicodeCharacter{0134}{\^J} - \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}} - \DeclareUnicodeCharacter{0136}{\cedilla{K}} - \DeclareUnicodeCharacter{0137}{\cedilla{k}} - \DeclareUnicodeCharacter{0138}{\ensuremath\kappa} - \DeclareUnicodeCharacter{0139}{\'L} - \DeclareUnicodeCharacter{013A}{\'l} - \DeclareUnicodeCharacter{013B}{\cedilla{L}} - \DeclareUnicodeCharacter{013C}{\cedilla{l}} - \DeclareUnicodeCharacter{013D}{L'}% should kern - \DeclareUnicodeCharacter{013E}{l'}% should kern - \DeclareUnicodeCharacter{013F}{L\U{00B7}} - % - \DeclareUnicodeCharacter{0140}{l\U{00B7}} - \DeclareUnicodeCharacter{0141}{\L} - \DeclareUnicodeCharacter{0142}{\l} - \DeclareUnicodeCharacter{0143}{\'N} - \DeclareUnicodeCharacter{0144}{\'n} - \DeclareUnicodeCharacter{0145}{\cedilla{N}} - \DeclareUnicodeCharacter{0146}{\cedilla{n}} - \DeclareUnicodeCharacter{0147}{\v{N}} - \DeclareUnicodeCharacter{0148}{\v{n}} - \DeclareUnicodeCharacter{0149}{'n} - \DeclareUnicodeCharacter{014A}{\missingcharmsg{ENG}} - \DeclareUnicodeCharacter{014B}{\missingcharmsg{eng}} - \DeclareUnicodeCharacter{014C}{\=O} - \DeclareUnicodeCharacter{014D}{\=o} - \DeclareUnicodeCharacter{014E}{\u{O}} - \DeclareUnicodeCharacter{014F}{\u{o}} - % - \DeclareUnicodeCharacter{0150}{\H{O}} - \DeclareUnicodeCharacter{0151}{\H{o}} - \DeclareUnicodeCharacter{0152}{\OE} - \DeclareUnicodeCharacter{0153}{\oe} - \DeclareUnicodeCharacter{0154}{\'R} - \DeclareUnicodeCharacter{0155}{\'r} - \DeclareUnicodeCharacter{0156}{\cedilla{R}} - \DeclareUnicodeCharacter{0157}{\cedilla{r}} - \DeclareUnicodeCharacter{0158}{\v{R}} - \DeclareUnicodeCharacter{0159}{\v{r}} - \DeclareUnicodeCharacter{015A}{\'S} - \DeclareUnicodeCharacter{015B}{\'s} - \DeclareUnicodeCharacter{015C}{\^S} - \DeclareUnicodeCharacter{015D}{\^s} - \DeclareUnicodeCharacter{015E}{\cedilla{S}} - \DeclareUnicodeCharacter{015F}{\cedilla{s}} - % - \DeclareUnicodeCharacter{0160}{\v{S}} - \DeclareUnicodeCharacter{0161}{\v{s}} - \DeclareUnicodeCharacter{0162}{\cedilla{T}} - \DeclareUnicodeCharacter{0163}{\cedilla{t}} - \DeclareUnicodeCharacter{0164}{\v{T}} - \DeclareUnicodeCharacter{0165}{\v{t}} - \DeclareUnicodeCharacter{0166}{\missingcharmsg{H WITH STROKE}} - \DeclareUnicodeCharacter{0167}{\missingcharmsg{h WITH STROKE}} - \DeclareUnicodeCharacter{0168}{\~U} - \DeclareUnicodeCharacter{0169}{\~u} - \DeclareUnicodeCharacter{016A}{\=U} - \DeclareUnicodeCharacter{016B}{\=u} - \DeclareUnicodeCharacter{016C}{\u{U}} - \DeclareUnicodeCharacter{016D}{\u{u}} - \DeclareUnicodeCharacter{016E}{\ringaccent{U}} - \DeclareUnicodeCharacter{016F}{\ringaccent{u}} - % - \DeclareUnicodeCharacter{0170}{\H{U}} - \DeclareUnicodeCharacter{0171}{\H{u}} - \DeclareUnicodeCharacter{0172}{\ogonek{U}} - \DeclareUnicodeCharacter{0173}{\ogonek{u}} - \DeclareUnicodeCharacter{0174}{\^W} - \DeclareUnicodeCharacter{0175}{\^w} - \DeclareUnicodeCharacter{0176}{\^Y} - \DeclareUnicodeCharacter{0177}{\^y} - \DeclareUnicodeCharacter{0178}{\"Y} - \DeclareUnicodeCharacter{0179}{\'Z} - \DeclareUnicodeCharacter{017A}{\'z} - \DeclareUnicodeCharacter{017B}{\dotaccent{Z}} - \DeclareUnicodeCharacter{017C}{\dotaccent{z}} - \DeclareUnicodeCharacter{017D}{\v{Z}} - \DeclareUnicodeCharacter{017E}{\v{z}} - \DeclareUnicodeCharacter{017F}{\missingcharmsg{LONG S}} - % - \DeclareUnicodeCharacter{01C4}{D\v{Z}} - \DeclareUnicodeCharacter{01C5}{D\v{z}} - \DeclareUnicodeCharacter{01C6}{d\v{z}} - \DeclareUnicodeCharacter{01C7}{LJ} - \DeclareUnicodeCharacter{01C8}{Lj} - \DeclareUnicodeCharacter{01C9}{lj} - \DeclareUnicodeCharacter{01CA}{NJ} - \DeclareUnicodeCharacter{01CB}{Nj} - \DeclareUnicodeCharacter{01CC}{nj} - \DeclareUnicodeCharacter{01CD}{\v{A}} - \DeclareUnicodeCharacter{01CE}{\v{a}} - \DeclareUnicodeCharacter{01CF}{\v{I}} - % - \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}} - \DeclareUnicodeCharacter{01D1}{\v{O}} - \DeclareUnicodeCharacter{01D2}{\v{o}} - \DeclareUnicodeCharacter{01D3}{\v{U}} - \DeclareUnicodeCharacter{01D4}{\v{u}} - % - \DeclareUnicodeCharacter{01E2}{\={\AE}} - \DeclareUnicodeCharacter{01E3}{\={\ae}} - \DeclareUnicodeCharacter{01E6}{\v{G}} - \DeclareUnicodeCharacter{01E7}{\v{g}} - \DeclareUnicodeCharacter{01E8}{\v{K}} - \DeclareUnicodeCharacter{01E9}{\v{k}} - % - \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}} - \DeclareUnicodeCharacter{01F1}{DZ} - \DeclareUnicodeCharacter{01F2}{Dz} - \DeclareUnicodeCharacter{01F3}{dz} - \DeclareUnicodeCharacter{01F4}{\'G} - \DeclareUnicodeCharacter{01F5}{\'g} - \DeclareUnicodeCharacter{01F8}{\`N} - \DeclareUnicodeCharacter{01F9}{\`n} - \DeclareUnicodeCharacter{01FC}{\'{\AE}} - \DeclareUnicodeCharacter{01FD}{\'{\ae}} - \DeclareUnicodeCharacter{01FE}{\'{\O}} - \DeclareUnicodeCharacter{01FF}{\'{\o}} - % - \DeclareUnicodeCharacter{021E}{\v{H}} - \DeclareUnicodeCharacter{021F}{\v{h}} - % - \DeclareUnicodeCharacter{0226}{\dotaccent{A}} - \DeclareUnicodeCharacter{0227}{\dotaccent{a}} - \DeclareUnicodeCharacter{0228}{\cedilla{E}} - \DeclareUnicodeCharacter{0229}{\cedilla{e}} - \DeclareUnicodeCharacter{022E}{\dotaccent{O}} - \DeclareUnicodeCharacter{022F}{\dotaccent{o}} - % - \DeclareUnicodeCharacter{0232}{\=Y} - \DeclareUnicodeCharacter{0233}{\=y} - \DeclareUnicodeCharacter{0237}{\dotless{j}} - % - \DeclareUnicodeCharacter{02DB}{\ogonek{ }} - % - % Greek letters upper case - \DeclareUnicodeCharacter{0391}{{\it A}} - \DeclareUnicodeCharacter{0392}{{\it B}} - \DeclareUnicodeCharacter{0393}{\ensuremath{\mit\Gamma}} - \DeclareUnicodeCharacter{0394}{\ensuremath{\mit\Delta}} - \DeclareUnicodeCharacter{0395}{{\it E}} - \DeclareUnicodeCharacter{0396}{{\it Z}} - \DeclareUnicodeCharacter{0397}{{\it H}} - \DeclareUnicodeCharacter{0398}{\ensuremath{\mit\Theta}} - \DeclareUnicodeCharacter{0399}{{\it I}} - \DeclareUnicodeCharacter{039A}{{\it K}} - \DeclareUnicodeCharacter{039B}{\ensuremath{\mit\Lambda}} - \DeclareUnicodeCharacter{039C}{{\it M}} - \DeclareUnicodeCharacter{039D}{{\it N}} - \DeclareUnicodeCharacter{039E}{\ensuremath{\mit\Xi}} - \DeclareUnicodeCharacter{039F}{{\it O}} - \DeclareUnicodeCharacter{03A0}{\ensuremath{\mit\Pi}} - \DeclareUnicodeCharacter{03A1}{{\it P}} - %\DeclareUnicodeCharacter{03A2}{} % none - corresponds to final sigma - \DeclareUnicodeCharacter{03A3}{\ensuremath{\mit\Sigma}} - \DeclareUnicodeCharacter{03A4}{{\it T}} - \DeclareUnicodeCharacter{03A5}{\ensuremath{\mit\Upsilon}} - \DeclareUnicodeCharacter{03A6}{\ensuremath{\mit\Phi}} - \DeclareUnicodeCharacter{03A7}{{\it X}} - \DeclareUnicodeCharacter{03A8}{\ensuremath{\mit\Psi}} - \DeclareUnicodeCharacter{03A9}{\ensuremath{\mit\Omega}} - % - % Vowels with accents - \DeclareUnicodeCharacter{0390}{\ensuremath{\ddot{\acute\iota}}} - \DeclareUnicodeCharacter{03AC}{\ensuremath{\acute\alpha}} - \DeclareUnicodeCharacter{03AD}{\ensuremath{\acute\epsilon}} - \DeclareUnicodeCharacter{03AE}{\ensuremath{\acute\eta}} - \DeclareUnicodeCharacter{03AF}{\ensuremath{\acute\iota}} - \DeclareUnicodeCharacter{03B0}{\ensuremath{\acute{\ddot\upsilon}}} - % - % Standalone accent - \DeclareUnicodeCharacter{0384}{\ensuremath{\acute{\ }}} - % - % Greek letters lower case - \DeclareUnicodeCharacter{03B1}{\ensuremath\alpha} - \DeclareUnicodeCharacter{03B2}{\ensuremath\beta} - \DeclareUnicodeCharacter{03B3}{\ensuremath\gamma} - \DeclareUnicodeCharacter{03B4}{\ensuremath\delta} - \DeclareUnicodeCharacter{03B5}{\ensuremath\epsilon} - \DeclareUnicodeCharacter{03B6}{\ensuremath\zeta} - \DeclareUnicodeCharacter{03B7}{\ensuremath\eta} - \DeclareUnicodeCharacter{03B8}{\ensuremath\theta} - \DeclareUnicodeCharacter{03B9}{\ensuremath\iota} - \DeclareUnicodeCharacter{03BA}{\ensuremath\kappa} - \DeclareUnicodeCharacter{03BB}{\ensuremath\lambda} - \DeclareUnicodeCharacter{03BC}{\ensuremath\mu} - \DeclareUnicodeCharacter{03BD}{\ensuremath\nu} - \DeclareUnicodeCharacter{03BE}{\ensuremath\xi} - \DeclareUnicodeCharacter{03BF}{{\it o}} % omicron - \DeclareUnicodeCharacter{03C0}{\ensuremath\pi} - \DeclareUnicodeCharacter{03C1}{\ensuremath\rho} - \DeclareUnicodeCharacter{03C2}{\ensuremath\varsigma} - \DeclareUnicodeCharacter{03C3}{\ensuremath\sigma} - \DeclareUnicodeCharacter{03C4}{\ensuremath\tau} - \DeclareUnicodeCharacter{03C5}{\ensuremath\upsilon} - \DeclareUnicodeCharacter{03C6}{\ensuremath\phi} - \DeclareUnicodeCharacter{03C7}{\ensuremath\chi} - \DeclareUnicodeCharacter{03C8}{\ensuremath\psi} - \DeclareUnicodeCharacter{03C9}{\ensuremath\omega} - % - % More Greek vowels with accents - \DeclareUnicodeCharacter{03CA}{\ensuremath{\ddot\iota}} - \DeclareUnicodeCharacter{03CB}{\ensuremath{\ddot\upsilon}} - \DeclareUnicodeCharacter{03CC}{\ensuremath{\acute o}} - \DeclareUnicodeCharacter{03CD}{\ensuremath{\acute\upsilon}} - \DeclareUnicodeCharacter{03CE}{\ensuremath{\acute\omega}} - % - % Variant Greek letters - \DeclareUnicodeCharacter{03D1}{\ensuremath\vartheta} - \DeclareUnicodeCharacter{03D6}{\ensuremath\varpi} - \DeclareUnicodeCharacter{03F1}{\ensuremath\varrho} - % - \DeclareUnicodeCharacter{1E02}{\dotaccent{B}} - \DeclareUnicodeCharacter{1E03}{\dotaccent{b}} - \DeclareUnicodeCharacter{1E04}{\udotaccent{B}} - \DeclareUnicodeCharacter{1E05}{\udotaccent{b}} - \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}} - \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}} - \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}} - \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}} - \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}} - \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}} - \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}} - \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}} - % - \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}} - \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}} - % - \DeclareUnicodeCharacter{1E20}{\=G} - \DeclareUnicodeCharacter{1E21}{\=g} - \DeclareUnicodeCharacter{1E22}{\dotaccent{H}} - \DeclareUnicodeCharacter{1E23}{\dotaccent{h}} - \DeclareUnicodeCharacter{1E24}{\udotaccent{H}} - \DeclareUnicodeCharacter{1E25}{\udotaccent{h}} - \DeclareUnicodeCharacter{1E26}{\"H} - \DeclareUnicodeCharacter{1E27}{\"h} - % - \DeclareUnicodeCharacter{1E30}{\'K} - \DeclareUnicodeCharacter{1E31}{\'k} - \DeclareUnicodeCharacter{1E32}{\udotaccent{K}} - \DeclareUnicodeCharacter{1E33}{\udotaccent{k}} - \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}} - \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}} - \DeclareUnicodeCharacter{1E36}{\udotaccent{L}} - \DeclareUnicodeCharacter{1E37}{\udotaccent{l}} - \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}} - \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}} - \DeclareUnicodeCharacter{1E3E}{\'M} - \DeclareUnicodeCharacter{1E3F}{\'m} - % - \DeclareUnicodeCharacter{1E40}{\dotaccent{M}} - \DeclareUnicodeCharacter{1E41}{\dotaccent{m}} - \DeclareUnicodeCharacter{1E42}{\udotaccent{M}} - \DeclareUnicodeCharacter{1E43}{\udotaccent{m}} - \DeclareUnicodeCharacter{1E44}{\dotaccent{N}} - \DeclareUnicodeCharacter{1E45}{\dotaccent{n}} - \DeclareUnicodeCharacter{1E46}{\udotaccent{N}} - \DeclareUnicodeCharacter{1E47}{\udotaccent{n}} - \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}} - \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}} - % - \DeclareUnicodeCharacter{1E54}{\'P} - \DeclareUnicodeCharacter{1E55}{\'p} - \DeclareUnicodeCharacter{1E56}{\dotaccent{P}} - \DeclareUnicodeCharacter{1E57}{\dotaccent{p}} - \DeclareUnicodeCharacter{1E58}{\dotaccent{R}} - \DeclareUnicodeCharacter{1E59}{\dotaccent{r}} - \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}} - \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}} - \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}} - \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}} - % - \DeclareUnicodeCharacter{1E60}{\dotaccent{S}} - \DeclareUnicodeCharacter{1E61}{\dotaccent{s}} - \DeclareUnicodeCharacter{1E62}{\udotaccent{S}} - \DeclareUnicodeCharacter{1E63}{\udotaccent{s}} - \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}} - \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}} - \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}} - \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}} - \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}} - \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}} - % - \DeclareUnicodeCharacter{1E7C}{\~V} - \DeclareUnicodeCharacter{1E7D}{\~v} - \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}} - \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}} - % - \DeclareUnicodeCharacter{1E80}{\`W} - \DeclareUnicodeCharacter{1E81}{\`w} - \DeclareUnicodeCharacter{1E82}{\'W} - \DeclareUnicodeCharacter{1E83}{\'w} - \DeclareUnicodeCharacter{1E84}{\"W} - \DeclareUnicodeCharacter{1E85}{\"w} - \DeclareUnicodeCharacter{1E86}{\dotaccent{W}} - \DeclareUnicodeCharacter{1E87}{\dotaccent{w}} - \DeclareUnicodeCharacter{1E88}{\udotaccent{W}} - \DeclareUnicodeCharacter{1E89}{\udotaccent{w}} - \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}} - \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}} - \DeclareUnicodeCharacter{1E8C}{\"X} - \DeclareUnicodeCharacter{1E8D}{\"x} - \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}} - \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}} - % - \DeclareUnicodeCharacter{1E90}{\^Z} - \DeclareUnicodeCharacter{1E91}{\^z} - \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}} - \DeclareUnicodeCharacter{1E93}{\udotaccent{z}} - \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}} - \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}} - \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}} - \DeclareUnicodeCharacter{1E97}{\"t} - \DeclareUnicodeCharacter{1E98}{\ringaccent{w}} - \DeclareUnicodeCharacter{1E99}{\ringaccent{y}} - % - \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}} - \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}} - % - \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}} - \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}} - \DeclareUnicodeCharacter{1EBC}{\~E} - \DeclareUnicodeCharacter{1EBD}{\~e} - % - \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}} - \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}} - \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}} - \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}} - % - \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}} - \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}} - % - \DeclareUnicodeCharacter{1EF2}{\`Y} - \DeclareUnicodeCharacter{1EF3}{\`y} - \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}} - % - \DeclareUnicodeCharacter{1EF8}{\~Y} - \DeclareUnicodeCharacter{1EF9}{\~y} - % - % Punctuation - \DeclareUnicodeCharacter{2013}{--} - \DeclareUnicodeCharacter{2014}{---} - \DeclareUnicodeCharacter{2018}{\quoteleft} - \DeclareUnicodeCharacter{2019}{\quoteright} - \DeclareUnicodeCharacter{201A}{\quotesinglbase} - \DeclareUnicodeCharacter{201C}{\quotedblleft} - \DeclareUnicodeCharacter{201D}{\quotedblright} - \DeclareUnicodeCharacter{201E}{\quotedblbase} - \DeclareUnicodeCharacter{2020}{\ensuremath\dagger} - \DeclareUnicodeCharacter{2021}{\ensuremath\ddagger} - \DeclareUnicodeCharacter{2022}{\bullet} - \DeclareUnicodeCharacter{202F}{\thinspace} - \DeclareUnicodeCharacter{2026}{\dots} - \DeclareUnicodeCharacter{2039}{\guilsinglleft} - \DeclareUnicodeCharacter{203A}{\guilsinglright} - % - \DeclareUnicodeCharacter{20AC}{\euro} - % - \DeclareUnicodeCharacter{2192}{\expansion} - \DeclareUnicodeCharacter{21D2}{\result} - % - % Mathematical symbols - \DeclareUnicodeCharacter{2200}{\ensuremath\forall} - \DeclareUnicodeCharacter{2203}{\ensuremath\exists} - \DeclareUnicodeCharacter{2208}{\ensuremath\in} - \DeclareUnicodeCharacter{2212}{\minus} - \DeclareUnicodeCharacter{2217}{\ast} - \DeclareUnicodeCharacter{221E}{\ensuremath\infty} - \DeclareUnicodeCharacter{2225}{\ensuremath\parallel} - \DeclareUnicodeCharacter{2227}{\ensuremath\wedge} - \DeclareUnicodeCharacter{2229}{\ensuremath\cap} - \DeclareUnicodeCharacter{2261}{\equiv} - \DeclareUnicodeCharacter{2264}{\ensuremath\leq} - \DeclareUnicodeCharacter{2265}{\ensuremath\geq} - \DeclareUnicodeCharacter{2282}{\ensuremath\subset} - \DeclareUnicodeCharacter{2287}{\ensuremath\supseteq} - % - \DeclareUnicodeCharacter{2016}{\ensuremath\Vert} - \DeclareUnicodeCharacter{2032}{\ensuremath\prime} - \DeclareUnicodeCharacter{210F}{\ensuremath\hbar} - \DeclareUnicodeCharacter{2111}{\ensuremath\Im} - \DeclareUnicodeCharacter{2113}{\ensuremath\ell} - \DeclareUnicodeCharacter{2118}{\ensuremath\wp} - \DeclareUnicodeCharacter{211C}{\ensuremath\Re} - \DeclareUnicodeCharacter{2127}{\ensuremath\mho} - \DeclareUnicodeCharacter{2135}{\ensuremath\aleph} - \DeclareUnicodeCharacter{2190}{\ensuremath\leftarrow} - \DeclareUnicodeCharacter{2191}{\ensuremath\uparrow} - \DeclareUnicodeCharacter{2193}{\ensuremath\downarrow} - \DeclareUnicodeCharacter{2194}{\ensuremath\leftrightarrow} - \DeclareUnicodeCharacter{2195}{\ensuremath\updownarrow} - \DeclareUnicodeCharacter{2196}{\ensuremath\nwarrow} - \DeclareUnicodeCharacter{2197}{\ensuremath\nearrow} - \DeclareUnicodeCharacter{2198}{\ensuremath\searrow} - \DeclareUnicodeCharacter{2199}{\ensuremath\swarrow} - \DeclareUnicodeCharacter{21A6}{\ensuremath\mapsto} - \DeclareUnicodeCharacter{21A9}{\ensuremath\hookleftarrow} - \DeclareUnicodeCharacter{21AA}{\ensuremath\hookrightarrow} - \DeclareUnicodeCharacter{21BC}{\ensuremath\leftharpoonup} - \DeclareUnicodeCharacter{21BD}{\ensuremath\leftharpoondown} - \DeclareUnicodeCharacter{21BE}{\ensuremath\upharpoonright} - \DeclareUnicodeCharacter{21C0}{\ensuremath\rightharpoonup} - \DeclareUnicodeCharacter{21C1}{\ensuremath\rightharpoondown} - \DeclareUnicodeCharacter{21CC}{\ensuremath\rightleftharpoons} - \DeclareUnicodeCharacter{21D0}{\ensuremath\Leftarrow} - \DeclareUnicodeCharacter{21D1}{\ensuremath\Uparrow} - \DeclareUnicodeCharacter{21D3}{\ensuremath\Downarrow} - \DeclareUnicodeCharacter{21D4}{\ensuremath\Leftrightarrow} - \DeclareUnicodeCharacter{21D5}{\ensuremath\Updownarrow} - \DeclareUnicodeCharacter{21DD}{\ensuremath\leadsto} - \DeclareUnicodeCharacter{2201}{\ensuremath\complement} - \DeclareUnicodeCharacter{2202}{\ensuremath\partial} - \DeclareUnicodeCharacter{2205}{\ensuremath\emptyset} - \DeclareUnicodeCharacter{2207}{\ensuremath\nabla} - \DeclareUnicodeCharacter{2209}{\ensuremath\notin} - \DeclareUnicodeCharacter{220B}{\ensuremath\owns} - \DeclareUnicodeCharacter{220F}{\ensuremath\prod} - \DeclareUnicodeCharacter{2210}{\ensuremath\coprod} - \DeclareUnicodeCharacter{2211}{\ensuremath\sum} - \DeclareUnicodeCharacter{2213}{\ensuremath\mp} - \DeclareUnicodeCharacter{2218}{\ensuremath\circ} - \DeclareUnicodeCharacter{221A}{\ensuremath\surd} - \DeclareUnicodeCharacter{221D}{\ensuremath\propto} - \DeclareUnicodeCharacter{2220}{\ensuremath\angle} - \DeclareUnicodeCharacter{2223}{\ensuremath\mid} - \DeclareUnicodeCharacter{2228}{\ensuremath\vee} - \DeclareUnicodeCharacter{222A}{\ensuremath\cup} - \DeclareUnicodeCharacter{222B}{\ensuremath\smallint} - \DeclareUnicodeCharacter{222E}{\ensuremath\oint} - \DeclareUnicodeCharacter{223C}{\ensuremath\sim} - \DeclareUnicodeCharacter{2240}{\ensuremath\wr} - \DeclareUnicodeCharacter{2243}{\ensuremath\simeq} - \DeclareUnicodeCharacter{2245}{\ensuremath\cong} - \DeclareUnicodeCharacter{2248}{\ensuremath\approx} - \DeclareUnicodeCharacter{224D}{\ensuremath\asymp} - \DeclareUnicodeCharacter{2250}{\ensuremath\doteq} - \DeclareUnicodeCharacter{2260}{\ensuremath\neq} - \DeclareUnicodeCharacter{226A}{\ensuremath\ll} - \DeclareUnicodeCharacter{226B}{\ensuremath\gg} - \DeclareUnicodeCharacter{227A}{\ensuremath\prec} - \DeclareUnicodeCharacter{227B}{\ensuremath\succ} - \DeclareUnicodeCharacter{2283}{\ensuremath\supset} - \DeclareUnicodeCharacter{2286}{\ensuremath\subseteq} - \DeclareUnicodeCharacter{228E}{\ensuremath\uplus} - \DeclareUnicodeCharacter{228F}{\ensuremath\sqsubset} - \DeclareUnicodeCharacter{2290}{\ensuremath\sqsupset} - \DeclareUnicodeCharacter{2291}{\ensuremath\sqsubseteq} - \DeclareUnicodeCharacter{2292}{\ensuremath\sqsupseteq} - \DeclareUnicodeCharacter{2293}{\ensuremath\sqcap} - \DeclareUnicodeCharacter{2294}{\ensuremath\sqcup} - \DeclareUnicodeCharacter{2295}{\ensuremath\oplus} - \DeclareUnicodeCharacter{2296}{\ensuremath\ominus} - \DeclareUnicodeCharacter{2297}{\ensuremath\otimes} - \DeclareUnicodeCharacter{2298}{\ensuremath\oslash} - \DeclareUnicodeCharacter{2299}{\ensuremath\odot} - \DeclareUnicodeCharacter{22A2}{\ensuremath\vdash} - \DeclareUnicodeCharacter{22A3}{\ensuremath\dashv} - \DeclareUnicodeCharacter{22A4}{\ensuremath\ptextop} - \DeclareUnicodeCharacter{22A5}{\ensuremath\bot} - \DeclareUnicodeCharacter{22A8}{\ensuremath\models} - \DeclareUnicodeCharacter{22B4}{\ensuremath\unlhd} - \DeclareUnicodeCharacter{22B5}{\ensuremath\unrhd} - \DeclareUnicodeCharacter{22C0}{\ensuremath\bigwedge} - \DeclareUnicodeCharacter{22C1}{\ensuremath\bigvee} - \DeclareUnicodeCharacter{22C2}{\ensuremath\bigcap} - \DeclareUnicodeCharacter{22C3}{\ensuremath\bigcup} - \DeclareUnicodeCharacter{22C4}{\ensuremath\diamond} - \DeclareUnicodeCharacter{22C5}{\ensuremath\cdot} - \DeclareUnicodeCharacter{22C6}{\ensuremath\star} - \DeclareUnicodeCharacter{22C8}{\ensuremath\bowtie} - \DeclareUnicodeCharacter{2308}{\ensuremath\lceil} - \DeclareUnicodeCharacter{2309}{\ensuremath\rceil} - \DeclareUnicodeCharacter{230A}{\ensuremath\lfloor} - \DeclareUnicodeCharacter{230B}{\ensuremath\rfloor} - \DeclareUnicodeCharacter{2322}{\ensuremath\frown} - \DeclareUnicodeCharacter{2323}{\ensuremath\smile} - % - \DeclareUnicodeCharacter{25A1}{\ensuremath\Box} - \DeclareUnicodeCharacter{25B3}{\ensuremath\triangle} - \DeclareUnicodeCharacter{25B7}{\ensuremath\triangleright} - \DeclareUnicodeCharacter{25BD}{\ensuremath\bigtriangledown} - \DeclareUnicodeCharacter{25C1}{\ensuremath\triangleleft} - \DeclareUnicodeCharacter{25C7}{\ensuremath\Diamond} - \DeclareUnicodeCharacter{2660}{\ensuremath\spadesuit} - \DeclareUnicodeCharacter{2661}{\ensuremath\heartsuit} - \DeclareUnicodeCharacter{2662}{\ensuremath\diamondsuit} - \DeclareUnicodeCharacter{2663}{\ensuremath\clubsuit} - \DeclareUnicodeCharacter{266D}{\ensuremath\flat} - \DeclareUnicodeCharacter{266E}{\ensuremath\natural} - \DeclareUnicodeCharacter{266F}{\ensuremath\sharp} - \DeclareUnicodeCharacter{26AA}{\ensuremath\bigcirc} - \DeclareUnicodeCharacter{27B9}{\ensuremath\rangle} - \DeclareUnicodeCharacter{27C2}{\ensuremath\perp} - \DeclareUnicodeCharacter{27E8}{\ensuremath\langle} - \DeclareUnicodeCharacter{27F5}{\ensuremath\longleftarrow} - \DeclareUnicodeCharacter{27F6}{\ensuremath\longrightarrow} - \DeclareUnicodeCharacter{27F7}{\ensuremath\longleftrightarrow} - \DeclareUnicodeCharacter{27FC}{\ensuremath\longmapsto} - \DeclareUnicodeCharacter{29F5}{\ensuremath\setminus} - \DeclareUnicodeCharacter{2A00}{\ensuremath\bigodot} - \DeclareUnicodeCharacter{2A01}{\ensuremath\bigoplus} - \DeclareUnicodeCharacter{2A02}{\ensuremath\bigotimes} - \DeclareUnicodeCharacter{2A04}{\ensuremath\biguplus} - \DeclareUnicodeCharacter{2A06}{\ensuremath\bigsqcup} - \DeclareUnicodeCharacter{2A1D}{\ensuremath\Join} - \DeclareUnicodeCharacter{2A3F}{\ensuremath\amalg} - \DeclareUnicodeCharacter{2AAF}{\ensuremath\preceq} - \DeclareUnicodeCharacter{2AB0}{\ensuremath\succeq} - % - \global\mathchardef\checkmark="1370 % actually the square root sign - \DeclareUnicodeCharacter{2713}{\ensuremath\checkmark} -}% end of \utfeightchardefs - -% US-ASCII character definitions. -\def\asciichardefs{% nothing need be done - \relax -} - -% Latin1 (ISO-8859-1) character definitions. -\def\nonasciistringdefs{% - \setnonasciicharscatcode\active - \def\defstringchar##1{\def##1{\string##1}}% - % - \defstringchar^^80\defstringchar^^81\defstringchar^^82\defstringchar^^83% - \defstringchar^^84\defstringchar^^85\defstringchar^^86\defstringchar^^87% - \defstringchar^^88\defstringchar^^89\defstringchar^^8a\defstringchar^^8b% - \defstringchar^^8c\defstringchar^^8d\defstringchar^^8e\defstringchar^^8f% - % - \defstringchar^^90\defstringchar^^91\defstringchar^^92\defstringchar^^93% - \defstringchar^^94\defstringchar^^95\defstringchar^^96\defstringchar^^97% - \defstringchar^^98\defstringchar^^99\defstringchar^^9a\defstringchar^^9b% - \defstringchar^^9c\defstringchar^^9d\defstringchar^^9e\defstringchar^^9f% - % - \defstringchar^^a0\defstringchar^^a1\defstringchar^^a2\defstringchar^^a3% - \defstringchar^^a4\defstringchar^^a5\defstringchar^^a6\defstringchar^^a7% - \defstringchar^^a8\defstringchar^^a9\defstringchar^^aa\defstringchar^^ab% - \defstringchar^^ac\defstringchar^^ad\defstringchar^^ae\defstringchar^^af% - % - \defstringchar^^b0\defstringchar^^b1\defstringchar^^b2\defstringchar^^b3% - \defstringchar^^b4\defstringchar^^b5\defstringchar^^b6\defstringchar^^b7% - \defstringchar^^b8\defstringchar^^b9\defstringchar^^ba\defstringchar^^bb% - \defstringchar^^bc\defstringchar^^bd\defstringchar^^be\defstringchar^^bf% - % - \defstringchar^^c0\defstringchar^^c1\defstringchar^^c2\defstringchar^^c3% - \defstringchar^^c4\defstringchar^^c5\defstringchar^^c6\defstringchar^^c7% - \defstringchar^^c8\defstringchar^^c9\defstringchar^^ca\defstringchar^^cb% - \defstringchar^^cc\defstringchar^^cd\defstringchar^^ce\defstringchar^^cf% - % - \defstringchar^^d0\defstringchar^^d1\defstringchar^^d2\defstringchar^^d3% - \defstringchar^^d4\defstringchar^^d5\defstringchar^^d6\defstringchar^^d7% - \defstringchar^^d8\defstringchar^^d9\defstringchar^^da\defstringchar^^db% - \defstringchar^^dc\defstringchar^^dd\defstringchar^^de\defstringchar^^df% - % - \defstringchar^^e0\defstringchar^^e1\defstringchar^^e2\defstringchar^^e3% - \defstringchar^^e4\defstringchar^^e5\defstringchar^^e6\defstringchar^^e7% - \defstringchar^^e8\defstringchar^^e9\defstringchar^^ea\defstringchar^^eb% - \defstringchar^^ec\defstringchar^^ed\defstringchar^^ee\defstringchar^^ef% - % - \defstringchar^^f0\defstringchar^^f1\defstringchar^^f2\defstringchar^^f3% - \defstringchar^^f4\defstringchar^^f5\defstringchar^^f6\defstringchar^^f7% - \defstringchar^^f8\defstringchar^^f9\defstringchar^^fa\defstringchar^^fb% - \defstringchar^^fc\defstringchar^^fd\defstringchar^^fe\defstringchar^^ff% -} - - -% define all the unicode characters we know about, for the sake of @U. -\utfeightchardefs - - -% Make non-ASCII characters printable again for compatibility with -% existing Texinfo documents that may use them, even without declaring a -% document encoding. -% -\setnonasciicharscatcode \other - - -\message{formatting,} - -\newdimen\defaultparindent \defaultparindent = 15pt - -\chapheadingskip = 15pt plus 4pt minus 2pt -\secheadingskip = 12pt plus 3pt minus 2pt -\subsecheadingskip = 9pt plus 2pt minus 2pt - -% Prevent underfull vbox error messages. -\vbadness = 10000 - -% Don't be very finicky about underfull hboxes, either. -\hbadness = 6666 - -% Following George Bush, get rid of widows and orphans. -\widowpenalty=10000 -\clubpenalty=10000 - -% Use TeX 3.0's \emergencystretch to help line breaking, but if we're -% using an old version of TeX, don't do anything. We want the amount of -% stretch added to depend on the line length, hence the dependence on -% \hsize. We call this whenever the paper size is set. -% -\def\setemergencystretch{% - \ifx\emergencystretch\thisisundefined - % Allow us to assign to \emergencystretch anyway. - \def\emergencystretch{\dimen0}% - \else - \emergencystretch = .15\hsize - \fi -} - -% Parameters in order: 1) textheight; 2) textwidth; -% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip; -% 7) physical page height; 8) physical page width. -% -% We also call \setleading{\textleading}, so the caller should define -% \textleading. The caller should also set \parskip. -% -\def\internalpagesizes#1#2#3#4#5#6#7#8{% - \voffset = #3\relax - \topskip = #6\relax - \splittopskip = \topskip - % - \vsize = #1\relax - \advance\vsize by \topskip - \outervsize = \vsize - \advance\outervsize by 2\topandbottommargin - \pageheight = \vsize - % - \hsize = #2\relax - \outerhsize = \hsize - \advance\outerhsize by 0.5in - \pagewidth = \hsize - % - \normaloffset = #4\relax - \bindingoffset = #5\relax - % - \ifpdf - \pdfpageheight #7\relax - \pdfpagewidth #8\relax - % if we don't reset these, they will remain at "1 true in" of - % whatever layout pdftex was dumped with. - \pdfhorigin = 1 true in - \pdfvorigin = 1 true in - \fi - % - \setleading{\textleading} - % - \parindent = \defaultparindent - \setemergencystretch -} - -% @letterpaper (the default). -\def\letterpaper{{\globaldefs = 1 - \parskip = 3pt plus 2pt minus 1pt - \textleading = 13.2pt - % - % If page is nothing but text, make it come out even. - \internalpagesizes{607.2pt}{6in}% that's 46 lines - {\voffset}{.25in}% - {\bindingoffset}{36pt}% - {11in}{8.5in}% -}} - -% Use @smallbook to reset parameters for 7x9.25 trim size. -\def\smallbook{{\globaldefs = 1 - \parskip = 2pt plus 1pt - \textleading = 12pt - % - \internalpagesizes{7.5in}{5in}% - {-.2in}{0in}% - {\bindingoffset}{16pt}% - {9.25in}{7in}% - % - \lispnarrowing = 0.3in - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = .5cm -}} - -% Use @smallerbook to reset parameters for 6x9 trim size. -% (Just testing, parameters still in flux.) -\def\smallerbook{{\globaldefs = 1 - \parskip = 1.5pt plus 1pt - \textleading = 12pt - % - \internalpagesizes{7.4in}{4.8in}% - {-.2in}{-.4in}% - {0pt}{14pt}% - {9in}{6in}% - % - \lispnarrowing = 0.25in - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = .4cm -}} - -% Use @afourpaper to print on European A4 paper. -\def\afourpaper{{\globaldefs = 1 - \parskip = 3pt plus 2pt minus 1pt - \textleading = 13.2pt - % - % Double-side printing via postscript on Laserjet 4050 - % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm. - % To change the settings for a different printer or situation, adjust - % \normaloffset until the front-side and back-side texts align. Then - % do the same for \bindingoffset. You can set these for testing in - % your texinfo source file like this: - % @tex - % \global\normaloffset = -6mm - % \global\bindingoffset = 10mm - % @end tex - \internalpagesizes{673.2pt}{160mm}% that's 51 lines - {\voffset}{\hoffset}% - {\bindingoffset}{44pt}% - {297mm}{210mm}% - % - \tolerance = 700 - \hfuzz = 1pt - \contentsrightmargin = 0pt - \defbodyindent = 5mm -}} - -% Use @afivepaper to print on European A5 paper. -% From romildo@urano.iceb.ufop.br, 2 July 2000. -% He also recommends making @example and @lisp be small. -\def\afivepaper{{\globaldefs = 1 - \parskip = 2pt plus 1pt minus 0.1pt - \textleading = 12.5pt - % - \internalpagesizes{160mm}{120mm}% - {\voffset}{\hoffset}% - {\bindingoffset}{8pt}% - {210mm}{148mm}% - % - \lispnarrowing = 0.2in - \tolerance = 800 - \hfuzz = 1.2pt - \contentsrightmargin = 0pt - \defbodyindent = 2mm - \tableindent = 12mm -}} - -% A specific text layout, 24x15cm overall, intended for A4 paper. -\def\afourlatex{{\globaldefs = 1 - \afourpaper - \internalpagesizes{237mm}{150mm}% - {\voffset}{4.6mm}% - {\bindingoffset}{7mm}% - {297mm}{210mm}% - % - % Must explicitly reset to 0 because we call \afourpaper. - \globaldefs = 0 -}} - -% Use @afourwide to print on A4 paper in landscape format. -\def\afourwide{{\globaldefs = 1 - \afourpaper - \internalpagesizes{241mm}{165mm}% - {\voffset}{-2.95mm}% - {\bindingoffset}{7mm}% - {297mm}{210mm}% - \globaldefs = 0 -}} - -% @pagesizes TEXTHEIGHT[,TEXTWIDTH] -% Perhaps we should allow setting the margins, \topskip, \parskip, -% and/or leading, also. Or perhaps we should compute them somehow. -% -\parseargdef\pagesizes{\pagesizesyyy #1,,\finish} -\def\pagesizesyyy#1,#2,#3\finish{{% - \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \hsize=#2\relax \fi - \globaldefs = 1 - % - \parskip = 3pt plus 2pt minus 1pt - \setleading{\textleading}% - % - \dimen0 = #1\relax - \advance\dimen0 by \voffset - % - \dimen2 = \hsize - \advance\dimen2 by \normaloffset - % - \internalpagesizes{#1}{\hsize}% - {\voffset}{\normaloffset}% - {\bindingoffset}{44pt}% - {\dimen0}{\dimen2}% -}} - -% Set default to letter. -% -\letterpaper - - -\message{and turning on texinfo input format.} - -\def^^L{\par} % remove \outer, so ^L can appear in an @comment - -% DEL is a comment character, in case @c does not suffice. -\catcode`\^^? = 14 - -% Define macros to output various characters with catcode for normal text. -\catcode`\"=\other \def\normaldoublequote{"} -\catcode`\$=\other \def\normaldollar{$}%$ font-lock fix -\catcode`\+=\other \def\normalplus{+} -\catcode`\<=\other \def\normalless{<} -\catcode`\>=\other \def\normalgreater{>} -\catcode`\^=\other \def\normalcaret{^} -\catcode`\_=\other \def\normalunderscore{_} -\catcode`\|=\other \def\normalverticalbar{|} -\catcode`\~=\other \def\normaltilde{~} - -% This macro is used to make a character print one way in \tt -% (where it can probably be output as-is), and another way in other fonts, -% where something hairier probably needs to be done. -% -% #1 is what to print if we are indeed using \tt; #2 is what to print -% otherwise. Since all the Computer Modern typewriter fonts have zero -% interword stretch (and shrink), and it is reasonable to expect all -% typewriter fonts to have this, we can check that font parameter. -% -\def\ifusingtt#1#2{\ifdim \fontdimen3\font=0pt #1\else #2\fi} - -% Same as above, but check for italic font. Actually this also catches -% non-italic slanted fonts since it is impossible to distinguish them from -% italic fonts. But since this is only used by $ and it uses \sl anyway -% this is not a problem. -\def\ifusingit#1#2{\ifdim \fontdimen1\font>0pt #1\else #2\fi} - -% Set catcodes for Texinfo file - -% Active characters for printing the wanted glyph. -% Most of these we simply print from the \tt font, but for some, we can -% use math or other variants that look better in normal text. -% -\catcode`\"=\active -\def\activedoublequote{{\tt\char34}} -\let"=\activedoublequote -\catcode`\~=\active \def\activetilde{{\tt\char126}} \let~ = \activetilde -\chardef\hatchar=`\^ -\catcode`\^=\active \def\activehat{{\tt \hatchar}} \let^ = \activehat - -\catcode`\_=\active -\def_{\ifusingtt\normalunderscore\_} -\def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em } -\let\realunder=_ - -\catcode`\|=\active \def|{{\tt\char124}} - -\chardef \less=`\< -\catcode`\<=\active \def\activeless{{\tt \less}}\let< = \activeless -\chardef \gtr=`\> -\catcode`\>=\active \def\activegtr{{\tt \gtr}}\let> = \activegtr -\catcode`\+=\active \def+{{\tt \char 43}} -\catcode`\$=\active \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix -\catcode`\-=\active \let-=\normaldash - - -% used for headline/footline in the output routine, in case the page -% breaks in the middle of an @tex block. -\def\texinfochars{% - \let< = \activeless - \let> = \activegtr - \let~ = \activetilde - \let^ = \activehat - \markupsetuplqdefault \markupsetuprqdefault - \let\b = \strong - \let\i = \smartitalic - % in principle, all other definitions in \tex have to be undone too. -} - -% Used sometimes to turn off (effectively) the active characters even after -% parsing them. -\def\turnoffactive{% - \normalturnoffactive - \otherbackslash -} - -\catcode`\@=0 - -% \backslashcurfont outputs one backslash character in current font, -% as in \char`\\. -\global\chardef\backslashcurfont=`\\ -\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work - -% \realbackslash is an actual character `\' with catcode other, and -% \doublebackslash is two of them (for the pdf outlines). -{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} - -% In Texinfo, backslash is an active character; it prints the backslash -% in fixed width font. -\catcode`\\=\active % @ for escape char from now on. - -% Print a typewriter backslash. For math mode, we can't simply use -% \backslashcurfont: the story here is that in math mode, the \char -% of \backslashcurfont ends up printing the roman \ from the math symbol -% font (because \char in math mode uses the \mathcode, and plain.tex -% sets \mathcode`\\="026E). Hence we use an explicit \mathchar, -% which is the decimal equivalent of "715c (class 7, e.g., use \fam; -% ignored family value; char position "5C). We can't use " for the -% usual hex value because it has already been made active. - -@def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} -@let@backslashchar = @ttbackslash % @backslashchar{} is for user documents. - -% \rawbackslash defines an active \ to do \backslashcurfont. -% \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. We switch back and forth between these. -@gdef@rawbackslash{@let\=@backslashcurfont} -@gdef@otherbackslash{@let\=@realbackslash} - -% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of -% the literal character `\'. -% -{@catcode`- = @active - @gdef@normalturnoffactive{% - @nonasciistringdefs - @let-=@normaldash - @let"=@normaldoublequote - @let$=@normaldollar %$ font-lock fix - @let+=@normalplus - @let<=@normalless - @let>=@normalgreater - @let^=@normalcaret - @let_=@normalunderscore - @let|=@normalverticalbar - @let~=@normaltilde - @let\=@ttbackslash - @markupsetuplqdefault - @markupsetuprqdefault - @unsepspaces - } -} - -% If a .fmt file is being used, characters that might appear in a file -% name cannot be active until we have parsed the command line. -% So turn them off again, and have @fixbackslash turn them back on. -@catcode`+=@other @catcode`@_=@other - -% \enablebackslashhack - allow file to begin `\input texinfo' -% -% If a .fmt file is being used, we don't want the `\input texinfo' to show up. -% That is what \eatinput is for; after that, the `\' should revert to printing -% a backslash. -% If the file did not have a `\input texinfo', then it is turned off after -% the first line; otherwise the first `\' in the file would cause an error. -% This is used on the very last line of this file, texinfo.tex. -% We also use @c to call @fixbackslash, in case ends of lines are hidden. -{ -@catcode`@^=7 -@catcode`@^^M=13@gdef@enablebackslashhack{% - @global@let\ = @eatinput% - @catcode`@^^M=13% - @def@c{@fixbackslash@c}% - @def ^^M{@let^^M@secondlinenl}% - @gdef @secondlinenl{@let^^M@thirdlinenl}% - @gdef @thirdlinenl{@fixbackslash}% -}} - -{@catcode`@^=7 @catcode`@^^M=13% -@gdef@eatinput input texinfo#1^^M{@fixbackslash}} - -% Emergency active definition of newline, in case an active newline token -% appears by mistake. -{@catcode`@^=7 @catcode13=13% -@gdef@enableemergencynewline{% - @gdef^^M{% - @par% - %@par% -}}} - - -@gdef@fixbackslash{% - @ifx\@eatinput @let\ = @ttbackslash @fi - @catcode13=5 % regular end of line - @enableemergencynewline - @let@c=@texinfoc - % Also turn back on active characters that might appear in the input - % file name, in case not using a pre-dumped format. - @catcode`+=@active - @catcode`@_=@active - % - % If texinfo.cnf is present on the system, read it. - % Useful for site-wide @afourpaper, etc. This macro, @fixbackslash, gets - % called at the beginning of every Texinfo file. Not opening texinfo.cnf - % directly in this file, texinfo.tex, makes it possible to make a format - % file for Texinfo. - % - @openin 1 texinfo.cnf - @ifeof 1 @else @input texinfo.cnf @fi - @closein 1 -} - - -% Say @foo, not \foo, in error messages. -@escapechar = `@@ - -% These (along with & and #) are made active for url-breaking, so need -% active definitions as the normal characters. -@def@normaldot{.} -@def@normalquest{?} -@def@normalslash{/} - -% These look ok in all fonts, so just make them not special. -% @hashchar{} gets its own user-level command, because of #line. -@catcode`@& = @other @def@normalamp{&} -@catcode`@# = @other @def@normalhash{#} -@catcode`@% = @other @def@normalpercent{%} - -@let @hashchar = @normalhash - -@c Finally, make ` and ' active, so that txicodequoteundirected and -@c txicodequotebacktick work right in, e.g., @w{@code{`foo'}}. If we -@c don't make ` and ' active, @code will not get them as active chars. -@c Do this last of all since we use ` in the previous @catcode assignments. -@catcode`@'=@active -@catcode`@`=@active -@markupsetuplqdefault -@markupsetuprqdefault - -@c Local variables: -@c eval: (add-hook 'write-file-hooks 'time-stamp) -@c page-delimiter: "^\\\\message\\|emacs-page" -@c time-stamp-start: "def\\\\texinfoversion{" -@c time-stamp-format: "%:y-%02m-%02d.%02H" -@c time-stamp-end: "}" -@c End: - -@c vim:sw=2: - -@ignore - arch-tag: e1b36e32-c96e-4135-a41a-0b2efa2ea115 -@end ignore -@enablebackslashhack diff --git a/converters/latex2rtf/patches/patch-aa b/converters/latex2rtf/patches/patch-aa index bf40e4ea57494..d154c399c3da1 100644 --- a/converters/latex2rtf/patches/patch-aa +++ b/converters/latex2rtf/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.8 2016/02/02 18:15:44 nros Exp $ +$NetBSD: patch-aa,v 1.9 2016/03/19 17:21:48 nros Exp $ * add prefix to install dirs and set correct man, info and doc dirs. * don't run checkdir since the test dir is missing * define the correct configuration dir @@ -42,7 +42,7 @@ $NetBSD: patch-aa,v 1.8 2016/02/02 18:15:44 nros Exp $ check test: latex2rtf cd test && $(MAKE) clean -@@ -213,14 +213,15 @@ install: latex2rtf doc/latex2rtf.1 $(CFG +@@ -213,14 +213,14 @@ install: latex2rtf doc/latex2rtf.1 $(CFG $(MKDIR) $(DESTDIR)$(BINDIR) $(MKDIR) $(DESTDIR)$(MANDIR) $(MKDIR) $(DESTDIR)$(CFGDIR) @@ -60,9 +60,17 @@ $NetBSD: patch-aa,v 1.8 2016/02/02 18:15:44 nros Exp $ + $(BSD_INSTALL_MAN) doc/latex2png.1 $(DESTDIR)$(MANDIR) + $(BSD_INSTALL_DATA) $(CFGS) $(DESTDIR)$(CFGDIR) + $(BSD_INSTALL_DATA) doc/latex2rtf.html $(DESTDIR)$(SUPPORTDIR) -+ $(BSD_INSTALL_DATA) doc/latex2rtf.pdf $(DESTDIR)$(SUPPORTDIR) + $(BSD_INSTALL_DATA) doc/latex2rtf.txt $(DESTDIR)$(SUPPORTDIR) + $(BSD_INSTALL_PROGRAM) $(BINARY_NAME) $(DESTDIR)$(BINDIR) @echo "******************************************************************" @echo "*** latex2rtf successfully installed as \"$(BINARY_NAME)\"" @echo "*** in directory \"$(DESTDIR)$(BINDIR)\"" +@@ -228,7 +228,7 @@ install: latex2rtf doc/latex2rtf.1 $(CFG + @echo "*** \"make install-info\" will install TeXInfo files " + @echo "***" + @echo "*** latex2rtf was compiled to search for its configuration files in" +- @echo "*** \"$(DESTDIR)$(CFGDIR)\" " ++ @echo "*** \"$(CFGDIR)\" " + @echo "***" + @echo "*** If the configuration files are moved then either" + @echo "*** 1) set the environment variable RTFPATH to this new location, or" diff --git a/converters/latex2rtf/patches/patch-doc_Makefile b/converters/latex2rtf/patches/patch-doc_Makefile new file mode 100644 index 0000000000000..98697c91f6403 --- /dev/null +++ b/converters/latex2rtf/patches/patch-doc_Makefile @@ -0,0 +1,10 @@ +$NetBSD: patch-doc_Makefile,v 1.1 2016/03/19 17:21:48 nros Exp $ +* Don't generate the pdf since it requires dependencies. +--- doc/Makefile.orig 2015-11-19 15:02:57.000000000 +0000 ++++ doc/Makefile +@@ -1,4 +1,4 @@ +-all: latex2rtf.info latex2rtf.pdf latex2rtf.txt \ ++all: latex2rtf.info latex2rtf.txt \ + latex2pn.txt latex2rt.txt latex2rtf.html + + latex2rtf.html: latex2rtf.texi From 813a3e18a0aa414657a77af6b6137f2c5c707734 Mon Sep 17 00:00:00 2001 From: sevan Date: Sat, 19 Mar 2016 18:11:36 +0000 Subject: [PATCH 0297/2457] Import xhyve 0.2.0 from pkgsrc-wip The xhyve hypervisor is a port of bhyve to OS X. It is built on top of Hypervisor.framework in OS X 10.10 Yosemite and higher, runs entirely in userspace, and has no other dependencies. Reviewed by wiz@ --- sysutils/xhyve/DESCR | 1 + sysutils/xhyve/Makefile | 25 +++++++++++++++++++++++++ sysutils/xhyve/PLIST | 2 ++ sysutils/xhyve/distinfo | 6 ++++++ 4 files changed, 34 insertions(+) create mode 100644 sysutils/xhyve/DESCR create mode 100644 sysutils/xhyve/Makefile create mode 100644 sysutils/xhyve/PLIST create mode 100644 sysutils/xhyve/distinfo diff --git a/sysutils/xhyve/DESCR b/sysutils/xhyve/DESCR new file mode 100644 index 0000000000000..5334cb33c7e53 --- /dev/null +++ b/sysutils/xhyve/DESCR @@ -0,0 +1 @@ +Port of FreeBSD's bhyve to OS X, running on top of Hypervisor.framework diff --git a/sysutils/xhyve/Makefile b/sysutils/xhyve/Makefile new file mode 100644 index 0000000000000..0142b84140cee --- /dev/null +++ b/sysutils/xhyve/Makefile @@ -0,0 +1,25 @@ +# $NetBSD: Makefile,v 1.1 2016/03/19 18:11:36 sevan Exp $ + +VERSION= 0.2.0 +DISTNAME= xhyve-${VERSION} +CATEGORIES= sysutils +MASTER_SITES= ${MASTER_SITE_GITHUB:=mist64/} +GITHUB_TAG= v${VERSION} + +MAINTAINER= terin@terinstock.com +HOMEPAGE= https://github.com/mist64/xhyve/ +COMMENT= Port of bhyve to OS X +LICENSE= 2-clause-bsd + +MAKE_ENV+= GIT_VERSION=${PKGVERSION} + +ONLY_FOR_PLATFORM+= Darwin-1[4-9].*-x86_64 + +AUTO_MKDIRS= yes +USE_TOOLS+= gmake + +do-install: + cd ${WRKSRC} && \ + ${INSTALL_PROGRAM} build/xhyve ${DESTDIR}${PREFIX}/bin/xhyve + +.include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xhyve/PLIST b/sysutils/xhyve/PLIST new file mode 100644 index 0000000000000..bfb68d7455ab7 --- /dev/null +++ b/sysutils/xhyve/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1 2016/03/19 18:11:36 sevan Exp $ +bin/xhyve diff --git a/sysutils/xhyve/distinfo b/sysutils/xhyve/distinfo new file mode 100644 index 0000000000000..80429f9422fb7 --- /dev/null +++ b/sysutils/xhyve/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1 2016/03/19 18:11:36 sevan Exp $ + +SHA1 (xhyve-0.2.0.tar.gz) = 6c3e809c67f885dda260fbfc57dc5a117ba93deb +RMD160 (xhyve-0.2.0.tar.gz) = 2095268ac0ee9cfb835454857472dcc918a0edee +SHA512 (xhyve-0.2.0.tar.gz) = 99056a037efa63d1ff6c076bbff655e328f6e839b83d95f4b6eefc5dde122f471862e3ca0114413921df34f26b0e42874f47efd3478c0e015fc2bfeab35b890f +Size (xhyve-0.2.0.tar.gz) = 11632573 bytes From 995e79ba7cb5e4771241b79328c4f498ab1ba945 Mon Sep 17 00:00:00 2001 From: sevan Date: Sat, 19 Mar 2016 19:18:34 +0000 Subject: [PATCH 0298/2457] Assign Terin Stock as maintainer. --- devel/stgit/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile index c98de0f8fd983..9956650d1f0ed 100644 --- a/devel/stgit/Makefile +++ b/devel/stgit/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.29 2016/03/18 23:13:26 sevan Exp $ +# $NetBSD: Makefile,v 1.30 2016/03/19 19:18:34 sevan Exp $ DISTNAME= stgit-0.17.1 PKGREVISION= 10 CATEGORIES= devel MASTER_SITES= http://download.gna.org/stgit/ -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= terin@terinstock.com HOMEPAGE= http://www.procode.org/stgit/ COMMENT= Stacked GIT LICENSE= gnu-gpl-v2 From f8b93cb67535f3bff75481b497901f031fca6454 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 22:57:50 +0000 Subject: [PATCH 0299/2457] Update to 45.0.1 Changelog: Fixed Fix a potential performance regression (Youtube for example) (1220502) Fix a regression causing search engine settings to be lost in some context (1254694) Bring back non-standard jar: URIs to fix a regression in IBM iNotes (1255139) XSLTProcessor.importStylesheet was failing when was used (1249572) Fix an issue which could cause the list of search provider to be empty (1255605) Fix a regression when using the location bar (1254503) Fix some loading issues when Accept third-party cookies: was set to Never (1254856) Changed Disabled Graphite font shaping library --- www/firefox/Makefile | 4 ++-- www/firefox/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 2ce66589623f4..05641acc2e5df 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.246 2016/03/08 21:32:52 ryoon Exp $ +# $NetBSD: Makefile,v 1.247 2016/03/19 22:57:50 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 45.0 -MOZ_BRANCH_MINOR= +MOZ_BRANCH_MINOR= .1 DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} diff --git a/www/firefox/distinfo b/www/firefox/distinfo index ed427b2273d73..6a610bc0f9b5a 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.240 2016/03/09 07:12:25 tnn Exp $ +$NetBSD: distinfo,v 1.241 2016/03/19 22:57:50 ryoon Exp $ -SHA1 (firefox-45.0.source.tar.xz) = ee76dac9564b59ce6c5680dd472870ecba61bcc7 -RMD160 (firefox-45.0.source.tar.xz) = bccf6bb4b59b8a5cd4625c44053dce3ef9563abf -SHA512 (firefox-45.0.source.tar.xz) = d75c7bf1f70183b7237b77b99845a6b7daa41014ee75a7977575af345b343a8053dbb993337d24933df23f9600db7c0e936543e57f3f039430ca5c252fe3c4b5 -Size (firefox-45.0.source.tar.xz) = 183999640 bytes +SHA1 (firefox-45.0.1.source.tar.xz) = 14081166adc1a18e1150ac264d810d6539818d67 +RMD160 (firefox-45.0.1.source.tar.xz) = e07d8f2e3ce3484dead4528ec19a855e04bab22b +SHA512 (firefox-45.0.1.source.tar.xz) = ff28116aff3dd07bf9c43724c7870cac8e4764639c5ee1248cc1003a4f6005f86b823a0f7969425970e2aeba3eca22e4aa88fa3c5d912c253373d398257d8438 +Size (firefox-45.0.1.source.tar.xz) = 184009616 bytes SHA1 (patch-aa) = c97ef4b107ea917c2a10d1a1fdaf524d794612a0 SHA1 (patch-ao) = fef085ff0df6f2fa2e54dca473e849eb7bc2cf84 SHA1 (patch-as) = d5d7f8250a9cd462f25d529c2a79c59a1bba9db2 From dfba3c1fb2cb6d20851d39f8b9cef158a9780953 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 22:58:30 +0000 Subject: [PATCH 0300/2457] Updated www/firefox to 45.0.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index f022d2640b479..2ee42f7c90626 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1251 2016/03/19 06:46:10 pettai Exp $ +$NetBSD: CHANGES-2016,v 1.1252 2016/03/19 22:58:30 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1649,3 +1649,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/pcre to 8.38nb1 [tez 2016-03-18] Updated devel/stgit to 0.17.1 [sevan 2016-03-18] Updated net/rancid to 3.4.1 [pettai 2016-03-19] + Updated www/firefox to 45.0.1 [ryoon 2016-03-19] From 2f0c45e85c4b91ca529d8e645efa13bdb057601e Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 22:59:35 +0000 Subject: [PATCH 0301/2457] Update to 45.0.1 * Sync with firefox-45.0.1 --- www/firefox-l10n/Makefile | 4 +- www/firefox-l10n/distinfo | 722 +++++++++++++++++++------------------- 2 files changed, 363 insertions(+), 363 deletions(-) diff --git a/www/firefox-l10n/Makefile b/www/firefox-l10n/Makefile index bea4424adb31f..3c688dd781ee8 100644 --- a/www/firefox-l10n/Makefile +++ b/www/firefox-l10n/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.84 2016/03/08 21:50:03 ryoon Exp $ +# $NetBSD: Makefile,v 1.85 2016/03/19 22:59:35 ryoon Exp $ # -FIREFOX_VER= 45.0 +FIREFOX_VER= 45.0.1 PKGNAME= firefox-l10n-${FIREFOX_VER:S/esr//} DISTNAME= # empty CATEGORIES= www diff --git a/www/firefox-l10n/distinfo b/www/firefox-l10n/distinfo index 4256d3cd5afb7..85973c7765408 100644 --- a/www/firefox-l10n/distinfo +++ b/www/firefox-l10n/distinfo @@ -1,362 +1,362 @@ -$NetBSD: distinfo,v 1.75 2016/03/08 21:50:03 ryoon Exp $ +$NetBSD: distinfo,v 1.76 2016/03/19 22:59:35 ryoon Exp $ -SHA1 (firefox-l10n-45.0/ach.xpi) = 804b184b563886d65fd51fa6bd436d42deb7ba68 -RMD160 (firefox-l10n-45.0/ach.xpi) = 0d6ec755545de50d9528dd95a60d79912348afee -SHA512 (firefox-l10n-45.0/ach.xpi) = 3b0da8c025ee407d31beb8f69c6b823837afc95fbb66f554923aee8cda16720b3cc91da9bf85349ddc25d507a1de667fd8e1fcbbd6a8e66501cd0ee55b45e878 -Size (firefox-l10n-45.0/ach.xpi) = 421463 bytes -SHA1 (firefox-l10n-45.0/af.xpi) = f780435c2b85ee869b58d68a4792402d0db60004 -RMD160 (firefox-l10n-45.0/af.xpi) = da1ab76730d477cee99a5f2630e34e33c9297d57 -SHA512 (firefox-l10n-45.0/af.xpi) = 5caa28875fa17a14d334190f6f70508e82e45f79b8e4dc4aa6330e78340ceb0ab56e4ea13fe4f4ac6d6eceb3508c94d30c07e593934aa7788dd7c596a491bfb1 -Size (firefox-l10n-45.0/af.xpi) = 436168 bytes -SHA1 (firefox-l10n-45.0/an.xpi) = b16e0382f9b70de912fe31027ae0785c56008a21 -RMD160 (firefox-l10n-45.0/an.xpi) = 840b76b99d9c406e228691e83455aa97edcfd20e -SHA512 (firefox-l10n-45.0/an.xpi) = bdcc8a43e953f5f74e89be9fb669c47d8d6b1e0420e7ef642b9a9d20d3cd4e94384c1f1da50750f4a33732e7d6a54871a38dc9d9f21f03c803459f29b01dbd4c -Size (firefox-l10n-45.0/an.xpi) = 443977 bytes -SHA1 (firefox-l10n-45.0/ar.xpi) = ebf4a036befb9bb8d6ce31fb3bee7d94b52d9503 -RMD160 (firefox-l10n-45.0/ar.xpi) = 2efc51cea229452fa25b7c2c661d51fdadabda1c -SHA512 (firefox-l10n-45.0/ar.xpi) = b2769256b2af694974f9f25aec1e40655594fecf54719ab51a2492f01a91bfee91cea78e11916c452f7aee8c911157661e68605de21e0b7956f780f2f7ee20c4 -Size (firefox-l10n-45.0/ar.xpi) = 471774 bytes -SHA1 (firefox-l10n-45.0/as.xpi) = a63a0acdb00c07db21f65fd3ec84d0de0a7b9da3 -RMD160 (firefox-l10n-45.0/as.xpi) = 556352f54845e92b1aff823fa5049cf380888b61 -SHA512 (firefox-l10n-45.0/as.xpi) = 3f1718348d44ededb45583f31d33234ff8d0f4f623f550ead65eb2811299bf6eb3521b1ac5de28c380dbd50e88cb7152d786cfe5cd5100cd73908af918e523ac -Size (firefox-l10n-45.0/as.xpi) = 479909 bytes -SHA1 (firefox-l10n-45.0/ast.xpi) = e93f3e5aea05a9ac03da5829f7036182dcee5163 -RMD160 (firefox-l10n-45.0/ast.xpi) = 02402901aa234556cdc777c233ad89c58c73b2a9 -SHA512 (firefox-l10n-45.0/ast.xpi) = ae2c6f6cb92252d8ce67adeabeaf1e4593e7def1cb38febb44cec32b68f41b887216f18685982e2c1b3c086294de375c9c9f46fd7250c267b4a8350b3036d924 -Size (firefox-l10n-45.0/ast.xpi) = 416053 bytes -SHA1 (firefox-l10n-45.0/az.xpi) = bc3e3d438dbcf32170449db1c862c52ea5ef4fa8 -RMD160 (firefox-l10n-45.0/az.xpi) = 87cdcd16c19fa2c81196fd652db2fe289b1df398 -SHA512 (firefox-l10n-45.0/az.xpi) = 6a5698fe647ff4c2ad89376cd203908e56c5dbbd18aae281df281cb55960614596b0d996ff05e13ae17692d1090522d003f1da77df2e96b8350d4f167a5cd97a -Size (firefox-l10n-45.0/az.xpi) = 458355 bytes -SHA1 (firefox-l10n-45.0/be.xpi) = db6f6fd531aa2703c4aa1411f27f1addb448bd07 -RMD160 (firefox-l10n-45.0/be.xpi) = 73ea1d5654ef8f2a9641e86d96414340f062048e -SHA512 (firefox-l10n-45.0/be.xpi) = ad69021726dfcc87ffee9a5589ee919cc8699dae71a1535479b0d5e94884f5de310426ac2c357192260d9d8d71c6eff86aaa8d522b425042319336784a351b3a -Size (firefox-l10n-45.0/be.xpi) = 439432 bytes -SHA1 (firefox-l10n-45.0/bg.xpi) = d23fbbeb77bf18c6b5807451722a25d293bf15f1 -RMD160 (firefox-l10n-45.0/bg.xpi) = 4b66444a3608b4b68ec8145d12360e16d7f53318 -SHA512 (firefox-l10n-45.0/bg.xpi) = 196252e3dee08eb624f5e02cdee01befb4f6d07878323d94c7496ce4a682735f2b6811ac0f672ba54a9ab07d3222b67fa00670da872fe458084abf3521a93189 -Size (firefox-l10n-45.0/bg.xpi) = 457340 bytes -SHA1 (firefox-l10n-45.0/bn-BD.xpi) = aeebd5577e42b774a90a2c94b83cb2b8b77441fe -RMD160 (firefox-l10n-45.0/bn-BD.xpi) = 8ab844ed5a07bd59d8ea66ef8f9211d374a72d3b -SHA512 (firefox-l10n-45.0/bn-BD.xpi) = d90a5864dd737bf1fb3594cd96f417f6794462f71699038868a75af04a451462deb2e3540d7d0a1c6553945648178a34542e123b9de7789cf858d7c32983a179 -Size (firefox-l10n-45.0/bn-BD.xpi) = 509414 bytes -SHA1 (firefox-l10n-45.0/bn-IN.xpi) = 9aef9d7a9468cd8b48298cde336be0cdb8234972 -RMD160 (firefox-l10n-45.0/bn-IN.xpi) = df9710317b29084c57add50f240ec81fc64fb765 -SHA512 (firefox-l10n-45.0/bn-IN.xpi) = 03583ed23d95b2fd5a833b4155d93b38ef8a02412c3e0fe44032e5de4ee5a5440b98a4e7034094bfedde182897137a969715b5d641da159cb66bda4e3a714f56 -Size (firefox-l10n-45.0/bn-IN.xpi) = 490796 bytes -SHA1 (firefox-l10n-45.0/br.xpi) = c34f90c7397608dc3713af1700fc06ab617e28ef -RMD160 (firefox-l10n-45.0/br.xpi) = 746f35f8de4ca916e544815add32af062a4a12bf -SHA512 (firefox-l10n-45.0/br.xpi) = ed825f36f363630fb960338878f69e4a574ab6b8125b88d6768855527f97324cf93dca7c2db70960bf8ae103ef21520251568f15c954f91816da652c93101bee -Size (firefox-l10n-45.0/br.xpi) = 431332 bytes -SHA1 (firefox-l10n-45.0/bs.xpi) = e97108207e45cf8f7ceef7b7a36cdbcbfb1e50c9 -RMD160 (firefox-l10n-45.0/bs.xpi) = c35f6b6fb993e8e3a4a5a705201bfb7804fd5714 -SHA512 (firefox-l10n-45.0/bs.xpi) = d8896f8f8efc704cbe54c11c20f79b0c25fa99460e93e27dc5542256b8234fad1e9369a24c0f1981d427cc6b0486e167f3bda997b4c1f850a4e275d9f87f97a8 -Size (firefox-l10n-45.0/bs.xpi) = 439697 bytes -SHA1 (firefox-l10n-45.0/ca.xpi) = d2cbf40396d7f91736cd2dcfe75eed5a49d7273c -RMD160 (firefox-l10n-45.0/ca.xpi) = a0bd5b7ac50f665589bae4339a20805d1ea16361 -SHA512 (firefox-l10n-45.0/ca.xpi) = 74d9154e848470ba6932c28cb5d8d2e6c3251e01595976338a683fcde3b70fb7508bc6d986cba23ae0c52e85931244bf82d1520dee83b141b1f24e6bda1236fa -Size (firefox-l10n-45.0/ca.xpi) = 433724 bytes -SHA1 (firefox-l10n-45.0/cs.xpi) = 68f26a40d9c1012435fbedd0ca2894feed99ff51 -RMD160 (firefox-l10n-45.0/cs.xpi) = 7c752bd82dbef20f88874a2df5fe8cd0dbd21f20 -SHA512 (firefox-l10n-45.0/cs.xpi) = 9b6feba98e8af84f6512f4a2d5dfb9c4ef9027f1e44eb00173dabdbcf5f2966909691010ec4bc634f9e930617cc57d4f999d13e66d3ebb0750fb8f34fde3a3cc -Size (firefox-l10n-45.0/cs.xpi) = 437699 bytes -SHA1 (firefox-l10n-45.0/cy.xpi) = 7ecbb8f4eca0ed7da3a2aa4e3739f278f2dd7e52 -RMD160 (firefox-l10n-45.0/cy.xpi) = 108cdc324d374d08ae838985afee583609576252 -SHA512 (firefox-l10n-45.0/cy.xpi) = f433b2807e366bcb42a7d9e3a72b2897edf9c7ee9fc33d96f49186e07fc02c9ffda8301a71fd7c1cfe77d4d0b44712a9528cb2cf0c7763513a889bec3945b8ac -Size (firefox-l10n-45.0/cy.xpi) = 433863 bytes -SHA1 (firefox-l10n-45.0/da.xpi) = 0a76c93abb8c746176244f5d203c5eb637517b73 -RMD160 (firefox-l10n-45.0/da.xpi) = 2dd575d20a5ef0ee29aff63a2b9b06f9bff0afa6 -SHA512 (firefox-l10n-45.0/da.xpi) = c0d90f1ff23c28a24ab5b8a0945dbe7dfe989df61c26635a9234a96ed5b15ac7a3ce17deb7970382db83b05a9b5a4557d0e6640b3f8dea85b56f4915588efc9b -Size (firefox-l10n-45.0/da.xpi) = 424611 bytes -SHA1 (firefox-l10n-45.0/de.xpi) = a49e2e1f76b13880ecdd988cc19a5be5abc89ca7 -RMD160 (firefox-l10n-45.0/de.xpi) = 469cbc787dd93c4e09740da69877433f1258e5cb -SHA512 (firefox-l10n-45.0/de.xpi) = f23eef94201a8dd3960e6263566c19e486167209c84277bfa02f0db0e4a1b247937a61a674fe67c73f0b4cdc1e184d6936f17a4fc9e2fe7a5de06bf497465a02 -Size (firefox-l10n-45.0/de.xpi) = 439755 bytes -SHA1 (firefox-l10n-45.0/dsb.xpi) = f0b62811ec7b085fcd2763ef70b09c2ead185b5e -RMD160 (firefox-l10n-45.0/dsb.xpi) = 8c2975b6f299aacb1a0f51b76036c1827c6c3294 -SHA512 (firefox-l10n-45.0/dsb.xpi) = fa691794738e09c8179d59fb9e72272b321dda6879e7f516c1bc497ef5d8af01168ac840d204c36f1b81c4520fb66f293c7c6bfa5e8f3912833e1e05d4f4d90c -Size (firefox-l10n-45.0/dsb.xpi) = 458050 bytes -SHA1 (firefox-l10n-45.0/el.xpi) = c1f50f0982390e6aa841a318502a6179a0afa5c0 -RMD160 (firefox-l10n-45.0/el.xpi) = 08c0df039338532a9267ab33de9894e504d2ede9 -SHA512 (firefox-l10n-45.0/el.xpi) = 3404a9d1a949dd6891da7999bbb313b0d3eb5e28deab888b30232b47eb8067df6e7adc838a62efe97c6bafb478d44576ee82fd7fdeb55b0a107ab792b27ff70a -Size (firefox-l10n-45.0/el.xpi) = 467210 bytes -SHA1 (firefox-l10n-45.0/en-GB.xpi) = 2fbb60a23a59e636acf28deb8c59a49a54c0219c -RMD160 (firefox-l10n-45.0/en-GB.xpi) = 34a0de8a4d0f21665a12347cc94919e32d57c527 -SHA512 (firefox-l10n-45.0/en-GB.xpi) = 3183a1af38368fe081580842ed95d2ac96fad17cf2da0ca795724b538a3949b8889902243d6e1384baf134cc8b1c5f7268ad7cebe3adbf71771cfd5a32cef67c -Size (firefox-l10n-45.0/en-GB.xpi) = 418741 bytes -SHA1 (firefox-l10n-45.0/en-US.xpi) = e13e32c9d35ec1b453f3a8654b5b9c4541ecba42 -RMD160 (firefox-l10n-45.0/en-US.xpi) = eeef552cdf0fec9d95240511b7c42a158941effd -SHA512 (firefox-l10n-45.0/en-US.xpi) = 7300c9ffdc7fe037a3b7d5fc5de6f42613cdd41a095c8fe920d6066f88139a6102eaf5d00dc8021b19ac8419991d8740c57bc87d59c5e44fd40fd60bc893c26f -Size (firefox-l10n-45.0/en-US.xpi) = 420386 bytes -SHA1 (firefox-l10n-45.0/en-ZA.xpi) = 65e5727fc83204a7b7e953dadde4e3edbabe0963 -RMD160 (firefox-l10n-45.0/en-ZA.xpi) = 0e14976bb2c46133883c5f9e183ae95bc187e2f3 -SHA512 (firefox-l10n-45.0/en-ZA.xpi) = a842dab932ae3c35c1f70278ef40c75c427156cb63e98d20b389a5c467346ad26ce117aa7ac4bb28f08ee804bd0f75e8aed6c5cd061db8f460c70ad63b648374 -Size (firefox-l10n-45.0/en-ZA.xpi) = 415693 bytes -SHA1 (firefox-l10n-45.0/eo.xpi) = 78827b6d7501c61329dacb0e8490f16b69ea5cc2 -RMD160 (firefox-l10n-45.0/eo.xpi) = 3ed53e4d992af2d01ba6ada04bb84a46ae4b56fd -SHA512 (firefox-l10n-45.0/eo.xpi) = 53d3adf097f1c0c83c0109d9c331acf2dbf8ff5de845be2dcac38079965a1a12e2f073551e1a5cc4c720d8de1192b14c6635b30bc6cbfa55adfc9039d2376ef0 -Size (firefox-l10n-45.0/eo.xpi) = 437886 bytes -SHA1 (firefox-l10n-45.0/es-AR.xpi) = 052c09b9afeae5c08d606a27ffb3b48f6cfcfc39 -RMD160 (firefox-l10n-45.0/es-AR.xpi) = 3f54ebc656cdd20217d700016e3308135616ed72 -SHA512 (firefox-l10n-45.0/es-AR.xpi) = 723c2462b4a446a24a4353508ca7aba97946984b42daf600140c5f528eab15316167c9290bd40049de323dccc46a7acdba4286f1edfa9e06354a79e451fbaf66 -Size (firefox-l10n-45.0/es-AR.xpi) = 436399 bytes -SHA1 (firefox-l10n-45.0/es-CL.xpi) = c86b317cafbdda72825979b340e39dc7e14a7b50 -RMD160 (firefox-l10n-45.0/es-CL.xpi) = 2e1b88cb10d33e112e63912fac9c30ef4a5baef4 -SHA512 (firefox-l10n-45.0/es-CL.xpi) = e005644c4648e8a7d11394751150e836040c335bf50b40fbd6d0e2e8e9725f109d409da45f8fdb93cb3f4adfdc5c23cdf177e6623767254f6bcd48d5bca25dcb -Size (firefox-l10n-45.0/es-CL.xpi) = 363184 bytes -SHA1 (firefox-l10n-45.0/es-ES.xpi) = b93d32678933ae13331fcfcf8f32e165597174cb -RMD160 (firefox-l10n-45.0/es-ES.xpi) = 88054605905983a2ebfe2946fb5704d72bf2c695 -SHA512 (firefox-l10n-45.0/es-ES.xpi) = 71493326f16098cac1c909330b9eee842d10a215fe5b433897dccd1063f85acd6e96e86105829a99dfaf35cb986c38a21577127fbb3cd8b815b828b234367544 -Size (firefox-l10n-45.0/es-ES.xpi) = 348131 bytes -SHA1 (firefox-l10n-45.0/es-MX.xpi) = 91fb1f00312e122b530d735b503764b382629e58 -RMD160 (firefox-l10n-45.0/es-MX.xpi) = 27e834cace99fbcb5ad3b7da0dadcbae2b7703c0 -SHA512 (firefox-l10n-45.0/es-MX.xpi) = e82dc1697fc0408fcee289bba78bbdecf50bdb3470938b8421ba475c2211f737d63e1f9f8986ea48589b15cb91396e0550038696e7f872d921de1658de0d9d20 -Size (firefox-l10n-45.0/es-MX.xpi) = 443817 bytes -SHA1 (firefox-l10n-45.0/et.xpi) = b0095ccb0a03a6bb9a1c5ae120074c44cb78f96a -RMD160 (firefox-l10n-45.0/et.xpi) = f35c468519789447ea7203a2828845cc9f1d93d1 -SHA512 (firefox-l10n-45.0/et.xpi) = c39ab665f5c0179b39d490be1e6d422399d96192166697ae0f5df7fb9d47b39f2fe50ee60b382964136c5dd48e385316bfbe77c6b50289b8e9d166e60290bbf1 -Size (firefox-l10n-45.0/et.xpi) = 427884 bytes -SHA1 (firefox-l10n-45.0/eu.xpi) = 51c7144c0fa88fdf0ae099dd01555ddf5db1873a -RMD160 (firefox-l10n-45.0/eu.xpi) = 21054eb039fde96272b4f6b858138b185d568ca7 -SHA512 (firefox-l10n-45.0/eu.xpi) = d095399f9013cf8e614c03811396288655826164c34de94b3cd9893445569f04734fb3576a9514ff2dea1280b1a337f76ccadd31acc49f6d82681ad2bc4f4e92 -Size (firefox-l10n-45.0/eu.xpi) = 438041 bytes -SHA1 (firefox-l10n-45.0/fa.xpi) = f8fc3591cd26b4e53acbb1aceeb364957542ad5d -RMD160 (firefox-l10n-45.0/fa.xpi) = a8cf46fd7122f58937a587b62ed9a5dcfc914ef5 -SHA512 (firefox-l10n-45.0/fa.xpi) = 47613df0a8d1e830bc9f6e88011bce766e96e859a01173b11a61cef313e4f2b968b5651c33625e4b166b076a7083d22d72dfb52dbb21d45ef808551cd4384873 -Size (firefox-l10n-45.0/fa.xpi) = 485804 bytes -SHA1 (firefox-l10n-45.0/ff.xpi) = cd40b64880af9313c992a8a42159e3946b153c85 -RMD160 (firefox-l10n-45.0/ff.xpi) = 94be0291811dfe1eb58061d38e05172fb3656449 -SHA512 (firefox-l10n-45.0/ff.xpi) = f7b4e2023abc928a9fd273be92fe989cf4f9b0b79575113e0b465c92a954d90ba03f2d9b70bc8b9e5917bf95fc01094efd9700946899e792479f697254a1a76a -Size (firefox-l10n-45.0/ff.xpi) = 438222 bytes -SHA1 (firefox-l10n-45.0/fi.xpi) = 2e6c279fd39c8be1f70b925ed65f243e30851432 -RMD160 (firefox-l10n-45.0/fi.xpi) = 3f6aad5e27a3d1872c65f100fb636ba3da643436 -SHA512 (firefox-l10n-45.0/fi.xpi) = 00baecc9671bee251c3c623400e1c57fc9d6e3f9cddaff36e64359c318c8e723ff064bc5b4ee5c3da0b506054027f2266de94149f262e814771c5dff344cc3fd -Size (firefox-l10n-45.0/fi.xpi) = 435341 bytes -SHA1 (firefox-l10n-45.0/fr.xpi) = e996996d1e37c3af074d4208fc4f83f5744d4661 -RMD160 (firefox-l10n-45.0/fr.xpi) = 21d8f8bbf3a397b9fd967d85b945f4b225ca9858 -SHA512 (firefox-l10n-45.0/fr.xpi) = 9e820322df6e8baaa7a9c9a6d4f5ef165959c1cefd4a940f4ade4543ee2e71d95a4a82957cce32ad468db80bf3f14646d12eeac502c5bdd9bd9b46f044f6f3a8 -Size (firefox-l10n-45.0/fr.xpi) = 444343 bytes -SHA1 (firefox-l10n-45.0/fy-NL.xpi) = 1a0234c6ef4ff8d60a4b862003cb56a1780919da -RMD160 (firefox-l10n-45.0/fy-NL.xpi) = 618d5ff114b04f6455181c521b2ede43bd094514 -SHA512 (firefox-l10n-45.0/fy-NL.xpi) = c1e60763c1f80749c2bc2025e4814de0c90c0c5c828107e0b357e04e80b134376337d766a7d5a242531899b58d49bffffd012c1d06e6b8fc4798034ccf79facb -Size (firefox-l10n-45.0/fy-NL.xpi) = 442267 bytes -SHA1 (firefox-l10n-45.0/ga-IE.xpi) = f09cd07ed4a5d8b1eb5e2de53339d613424c0c80 -RMD160 (firefox-l10n-45.0/ga-IE.xpi) = eeefafb0f769458c20ca1abee7f8c6bad3a335eb -SHA512 (firefox-l10n-45.0/ga-IE.xpi) = 84a8239849e6615aa9cf50975ca9fdff06de111a0e0138535049ba152f33fa839be62218916a4ebd03de675d9819617bbf12b601e33248da6d21be528c069632 -Size (firefox-l10n-45.0/ga-IE.xpi) = 454972 bytes -SHA1 (firefox-l10n-45.0/gd.xpi) = a5561c0e45630dec4e13840217f3ed96c1a53c62 -RMD160 (firefox-l10n-45.0/gd.xpi) = 89fef4faecc8c6bd2af14dfd7cfb580f7cfa7dc6 -SHA512 (firefox-l10n-45.0/gd.xpi) = 140347f9b5cf6089b9dd389b062167a4f1098409fb912e39604ef8a493db184c2d803009523d9479337d23d5ced768d9e4fe96a411aa1db3a0b5449da6f92eb5 -Size (firefox-l10n-45.0/gd.xpi) = 443931 bytes -SHA1 (firefox-l10n-45.0/gl.xpi) = 1ebbc1db6286bbc56e704ed0a8b70f534b666d3f -RMD160 (firefox-l10n-45.0/gl.xpi) = 942b5a388e10b9a4250d2b6598325251a0f8bf62 -SHA512 (firefox-l10n-45.0/gl.xpi) = 06bfc2f4f66666c5bf7699ef1a5d6b6cb45092080e0c7db9c355f973942114712f77ee4af8d204a0b722063b22cd7c1b64ff30c33437d1b28fe16cf6ce6aecfd -Size (firefox-l10n-45.0/gl.xpi) = 431617 bytes -SHA1 (firefox-l10n-45.0/gn.xpi) = 422c0681a02645a9224fc6d36611c21240cd8383 -RMD160 (firefox-l10n-45.0/gn.xpi) = 8e812b1049452d9af48c536be0d4835fbb6dd259 -SHA512 (firefox-l10n-45.0/gn.xpi) = 5b940dd8e64766a4463c497414912c0121ddb8028e3c96165d240eacbbb71cdfef04dc82a1ffe8134b9501768d5eb9f508188b0e1c9a0edb536682df746dfda4 -Size (firefox-l10n-45.0/gn.xpi) = 455590 bytes -SHA1 (firefox-l10n-45.0/gu-IN.xpi) = 18b734bcafb2af9c129c027df404a63a4560f523 -RMD160 (firefox-l10n-45.0/gu-IN.xpi) = 941354301ad9db031ea49e1387831db55f41d929 -SHA512 (firefox-l10n-45.0/gu-IN.xpi) = 97687e6a05242f225ca0b6d5585fbc6af8de9b984a1ef89b9e5f35ea885de6fceeb80c1e05d0108ad6249f7989d55b10836fc942407e9c9f00a3c161241304a9 -Size (firefox-l10n-45.0/gu-IN.xpi) = 469356 bytes -SHA1 (firefox-l10n-45.0/he.xpi) = d8ade4cc9779452e4c0695ea7ec01de9e34240fb -RMD160 (firefox-l10n-45.0/he.xpi) = 6afd68c8021425b4c84a8dda90b4f2cf8f4e7612 -SHA512 (firefox-l10n-45.0/he.xpi) = 8439b6abab5280c7e3d72e08c847fdae2ed22f895797fe25ba29c9b9aef848a37e22be29c1b3e3f3c881288f8a9d1a5052cdde0019d7d063ab321cb7af7426d6 -Size (firefox-l10n-45.0/he.xpi) = 451978 bytes -SHA1 (firefox-l10n-45.0/hi-IN.xpi) = 08b31be4f92f68d3bc3c409e280b5a526577a502 -RMD160 (firefox-l10n-45.0/hi-IN.xpi) = 08ad15e6e0bebcea097b2fcb2524a5d12ceb6f61 -SHA512 (firefox-l10n-45.0/hi-IN.xpi) = 723b7782f1ae46d5e5acd47f5d64140ad3852e35b1570d20d1b7fa3b39ceca385e93a8175dd5e2d716b45d9a2c955f7c6c63a9e17d9b1cb6370491dbd4c30238 -Size (firefox-l10n-45.0/hi-IN.xpi) = 483333 bytes -SHA1 (firefox-l10n-45.0/hr.xpi) = 49a7a0e498d5f60c40e127693c5636ed84c5769c -RMD160 (firefox-l10n-45.0/hr.xpi) = 4cce9bbba25176f93e1ec5acd65922091567bb30 -SHA512 (firefox-l10n-45.0/hr.xpi) = e4da4c529511945f0ddc421185f9970126496d9ecfd8f6e1a0457c2ec84f062cb26b730ece54be4051f00df4392b53488551b1163adea4ce47bc1cf7554fbec2 -Size (firefox-l10n-45.0/hr.xpi) = 445883 bytes -SHA1 (firefox-l10n-45.0/hsb.xpi) = c03c5b7ee583d1f5fdedd6a9065584cca66aa467 -RMD160 (firefox-l10n-45.0/hsb.xpi) = 6c0b989be3158cedab4cc2825b773329f204db09 -SHA512 (firefox-l10n-45.0/hsb.xpi) = 9eaef44f90181ef6b3bc19cf708805ea8a88003b49f680148297e423e72ad880d430ddd3e6a946b0270863c4470dc5a3251122d76ab84792b275af07ad1f8db5 -Size (firefox-l10n-45.0/hsb.xpi) = 455731 bytes -SHA1 (firefox-l10n-45.0/hu.xpi) = 6bed7e193f68c1a1767c4bee8ea75bf48edb08df -RMD160 (firefox-l10n-45.0/hu.xpi) = b6b0503c4143911c006b3cff940b1331dfba8ddb -SHA512 (firefox-l10n-45.0/hu.xpi) = 3c8289873176639a065e8be7f3a01fdd2cdbaaad999dc8d031258546f5119372a20c90f5b7c10eff0d3c048e5b50f63bd23e23af882f1073b0ca3255560e8a20 -Size (firefox-l10n-45.0/hu.xpi) = 444065 bytes -SHA1 (firefox-l10n-45.0/hy-AM.xpi) = ccdcc0321096a0ace2f43fc05629a1addee1bb51 -RMD160 (firefox-l10n-45.0/hy-AM.xpi) = 7f6777828b95bcd8a9e754a78c3e0c9b38e95906 -SHA512 (firefox-l10n-45.0/hy-AM.xpi) = 6a5fa0090c92646e94eb03fcdd725ea0d1ce474fcbfda699ad7406b1dc911adfe9951fadef9d26c63e6105749b528b507f93c68c14261d67b58ea3b754f6a729 -Size (firefox-l10n-45.0/hy-AM.xpi) = 494081 bytes -SHA1 (firefox-l10n-45.0/id.xpi) = 9237a270b0d2002f0d88746af3f339f2e674278f -RMD160 (firefox-l10n-45.0/id.xpi) = 3f839b471e0b6f2e3da0ea1c36b68f0b399e0735 -SHA512 (firefox-l10n-45.0/id.xpi) = 9f4ddb2afaee2782de545a7c795a193495126b218dceb53a6be2bfd86c7fc673b2aaf86c15d532577b4c33e86f0e3df786abae6b7f9912ef4adb269d8c68358d -Size (firefox-l10n-45.0/id.xpi) = 421748 bytes -SHA1 (firefox-l10n-45.0/is.xpi) = 281c5092bdc24d6b463d7894c6f31c7e557564f8 -RMD160 (firefox-l10n-45.0/is.xpi) = df8d3519dc9a58e29fdd621af8d5980b2f748928 -SHA512 (firefox-l10n-45.0/is.xpi) = 6de5c14b24556c829c4559e0416239b2e00d6cd2781a03da0b821caa1ea03039cb3e70b9d661075220f187d6a3af03fbe3a159e730b2a8c652938209a706062f -Size (firefox-l10n-45.0/is.xpi) = 438155 bytes -SHA1 (firefox-l10n-45.0/it.xpi) = 3eb99f43ba450e9fdcf9f8a49295a718e436f8cc -RMD160 (firefox-l10n-45.0/it.xpi) = 6f98e31608a39bfecc67c1e00d44affa234a7688 -SHA512 (firefox-l10n-45.0/it.xpi) = e03f95f3606cfdaee636ca6b20f4b783e5fd4c4694ea8054fad7080b6166a0101933bdf1507fef4928baf1f6e12c6021da3d6c00ec95d1620aea4714e46c8e12 -Size (firefox-l10n-45.0/it.xpi) = 338103 bytes -SHA1 (firefox-l10n-45.0/ja.xpi) = 033f1dc612b799ae5d10d4defff3672f052dd1db -RMD160 (firefox-l10n-45.0/ja.xpi) = d5972790ba9020edbb9ca0daed115087a9cd2066 -SHA512 (firefox-l10n-45.0/ja.xpi) = f3d1e845abd9a7e79603d58d8765db0bb7c1a6ab29b3cb364ee80137ea8efcad9cf8884e3739c83c64def1eb2db5640256a902069589fd21ba5ce2aac9294834 -Size (firefox-l10n-45.0/ja.xpi) = 480325 bytes -SHA1 (firefox-l10n-45.0/kk.xpi) = 188b3651844cc7e84cfa020b264570959fcd7628 -RMD160 (firefox-l10n-45.0/kk.xpi) = d094fcc9d6619e5246076dd65894c24f6c681983 -SHA512 (firefox-l10n-45.0/kk.xpi) = f966dfdc765a850b7a7ba169b65d5705ed8499d7d168dc93df05aea9b2766a00e44911fb32b866b259d59c4b442b9def48c640aeefa26e194f9d46bfe278fe11 -Size (firefox-l10n-45.0/kk.xpi) = 493279 bytes -SHA1 (firefox-l10n-45.0/km.xpi) = 573661f29b1a8bf21153a671ddf39fb81e808092 -RMD160 (firefox-l10n-45.0/km.xpi) = 138f7e2a64f31ff02af4ebc493ab27036fb299db -SHA512 (firefox-l10n-45.0/km.xpi) = e0c4a23fc2e243b92347340c4f3822369d547e1afdd2d446ac605f6d57ea50e437532e673556ff2e0dcf75407aa12119ff2b78d35a5dfcda76c8c2a29f29208f -Size (firefox-l10n-45.0/km.xpi) = 501116 bytes -SHA1 (firefox-l10n-45.0/kn.xpi) = ada8cf668cce78edfe2a1649e9737bdb3f8d6986 -RMD160 (firefox-l10n-45.0/kn.xpi) = d3506f8a7ef90ae0804dfe0f1ebfdead1f5afa81 -SHA512 (firefox-l10n-45.0/kn.xpi) = c14570816630f791bb8174b900f6dfce1bff15e5c4470c73c4cb365b8daa25cd8076fc1e038f8c1ad949adac3d1e1d3ea8065681146bd1bf1d4d07f7a53eb758 -Size (firefox-l10n-45.0/kn.xpi) = 492245 bytes -SHA1 (firefox-l10n-45.0/ko.xpi) = cd2d83b3a0b5a40ee5452f19b92b02a7e139c5ef -RMD160 (firefox-l10n-45.0/ko.xpi) = 79c79c11f51c443a598fcd9a00af3c5184b14c1f -SHA512 (firefox-l10n-45.0/ko.xpi) = 8081f22cfb25e1f0dae5660818a0603eed15089c9a60ddc494a245ddf0ae6c761831a5780fe35b5d3dd0d9ae7ff48d99c3827e51ae970465ecf6c470f1ef3531 -Size (firefox-l10n-45.0/ko.xpi) = 459998 bytes -SHA1 (firefox-l10n-45.0/lij.xpi) = 6c62a3ceebeca7895f52ad2a4b34a0c51798b824 -RMD160 (firefox-l10n-45.0/lij.xpi) = e912433ecba4d5a047193e0c8d0b42e0482560e8 -SHA512 (firefox-l10n-45.0/lij.xpi) = 926f958762b9f9579787d98241a048111f2b04f2f983731762bf8d01660f78242458e1f786146985749a5b54a0492f8251b0339bd130dd692be09295393f3ba5 -Size (firefox-l10n-45.0/lij.xpi) = 376297 bytes -SHA1 (firefox-l10n-45.0/lt.xpi) = 78339b3e8f727ee1a6381d883dd2f8985a0a1939 -RMD160 (firefox-l10n-45.0/lt.xpi) = b7dbc3b60ae1cbe07e30d3b7e22c3ef41d207455 -SHA512 (firefox-l10n-45.0/lt.xpi) = 4fa2030695afd81c378be4824513a16e98637b65b138a83519193fa630f5a51c9562c2470a427fbfafe6eafb29c7fee838cbac46fddbdef865c7cab6b4a200d6 -Size (firefox-l10n-45.0/lt.xpi) = 451527 bytes -SHA1 (firefox-l10n-45.0/lv.xpi) = 31aa300c89fc9bda86499297dcd3c83d2591006f -RMD160 (firefox-l10n-45.0/lv.xpi) = e056270cc77f36908086957a823d47345d469554 -SHA512 (firefox-l10n-45.0/lv.xpi) = 356925469821b52566cd118937302003f9848a16c77723260b6b09798a7d6d3fa37f91c14bc5fb5930d394612e5c96dc309120d97010e5f3a5a428cc3f745251 -Size (firefox-l10n-45.0/lv.xpi) = 442658 bytes -SHA1 (firefox-l10n-45.0/mai.xpi) = e9a5755120b95648c1e3158bf9e2021330d38190 -RMD160 (firefox-l10n-45.0/mai.xpi) = d2c25faef09602f0d2baf724a204bef308ec067c -SHA512 (firefox-l10n-45.0/mai.xpi) = 7f2cd50592e4da732aa459fa966509c1fc1f012a865a5f14635b7e1b0db3dbd8d52c3b2194b7189ba929bec5bc61c24439e3ce5e9c15547e707bf04236869da1 -Size (firefox-l10n-45.0/mai.xpi) = 487581 bytes -SHA1 (firefox-l10n-45.0/mk.xpi) = 258853ab55243e4de738ea055cbac0d58a1ebeb4 -RMD160 (firefox-l10n-45.0/mk.xpi) = 15f46ff88e443a7ac443a6d5d19d88123b6ff7cc -SHA512 (firefox-l10n-45.0/mk.xpi) = e60b4605732d6be4bd75644f5a1f3973852e8341aeecc2f72a0478e56b7335e13fca3ac86631faf8c702e0146c7415fe0c3b2bbfcbcf114ebffe38005ee05da2 -Size (firefox-l10n-45.0/mk.xpi) = 473207 bytes -SHA1 (firefox-l10n-45.0/ml.xpi) = 2b7c5547e7b7c0b5d0ac0dc268fca03368ae6047 -RMD160 (firefox-l10n-45.0/ml.xpi) = 4c41c84fb9258bc99fe46aca8a99c6122e6d6f23 -SHA512 (firefox-l10n-45.0/ml.xpi) = 875e7c928e3262498dcd785cc3f3e13db0ef6e216bbd20862406118b16616bbe787ba82230ec771e61733aee3605ed6324cea0d1cd33c543b1080fc6a86aeb3c -Size (firefox-l10n-45.0/ml.xpi) = 495274 bytes -SHA1 (firefox-l10n-45.0/mr.xpi) = fffafc71e2bfeeb2fb7ed4f9ecf77a97d588dd41 -RMD160 (firefox-l10n-45.0/mr.xpi) = c53c657fe418482339a146c3d9e80b8098e4f612 -SHA512 (firefox-l10n-45.0/mr.xpi) = 4598e91005cde4c00bcc798b332153f3419458a6f7caa254293799abdcaa828f2ceff128fb24a659d3c91d415fa2ba87130306e746f50ea80da88e1d3f3c8515 -Size (firefox-l10n-45.0/mr.xpi) = 498641 bytes -SHA1 (firefox-l10n-45.0/ms.xpi) = 049254086e095eb3b0dbed58ad3ebb4c6da33812 -RMD160 (firefox-l10n-45.0/ms.xpi) = 9b8e7e5a6d45512f2e54902ed661554f2870e0ef -SHA512 (firefox-l10n-45.0/ms.xpi) = a9764082e6f2aa48fc499531f166517c99335660ce9cf16c2f0d759b8f96cdd10af7d16ab17dafa7ce41dbc0b44c7d0788c163b5c74d1754a1b197da507a8691 -Size (firefox-l10n-45.0/ms.xpi) = 436878 bytes -SHA1 (firefox-l10n-45.0/nb-NO.xpi) = 9f371cc212c0e1b36b46010a22f1a22d103a1dfb -RMD160 (firefox-l10n-45.0/nb-NO.xpi) = 061b0dc931b67711a8129e3248200935581cef49 -SHA512 (firefox-l10n-45.0/nb-NO.xpi) = 7720da803844a2e2a107cbd48777437ae641098b0ccfc084d378d0a6ba5aa552e49bf2229e2c53f8ec0422e56309d6fc041c32de53c533e5e5a0d11119769521 -Size (firefox-l10n-45.0/nb-NO.xpi) = 432168 bytes -SHA1 (firefox-l10n-45.0/nl.xpi) = 679490a15e8e6f25aa75a9eafabbdab5e7922a2d -RMD160 (firefox-l10n-45.0/nl.xpi) = 5aa546545d9b1420639c55b3a96fbad915bdd77e -SHA512 (firefox-l10n-45.0/nl.xpi) = 382f05d38c78af021ec9433a2498297c226bb820a24bf9e2f94ccecc0a23c489fbf280c729f4114182248b427dd6e1e0f4f318cbd29892ad00df3bf46a989b5a -Size (firefox-l10n-45.0/nl.xpi) = 429704 bytes -SHA1 (firefox-l10n-45.0/nn-NO.xpi) = 8118f6b6b97a544223dd29b20a080630e82d2e6b -RMD160 (firefox-l10n-45.0/nn-NO.xpi) = 3d8236e3413ee61af6dfbe9cc284daa54e99a918 -SHA512 (firefox-l10n-45.0/nn-NO.xpi) = 938d911292ff52c7833e5443aff1babbb1e2b252c03080ceb60aff047fac5e09f0c5b0b8fa083d2f0fd16801b91f5d0a697bd6dc7c88dad1bc9e7eeeaabba764 -Size (firefox-l10n-45.0/nn-NO.xpi) = 427850 bytes -SHA1 (firefox-l10n-45.0/or.xpi) = a958b7bbc5a35f4f29387676e3f8e021580677e1 -RMD160 (firefox-l10n-45.0/or.xpi) = 1e51c774248fb34ad736b68b0a09f6f590019215 -SHA512 (firefox-l10n-45.0/or.xpi) = 068e8a653b94309203a88544db396e3dec0d317b30b92f0f527ac94348681456174b86139e7b955d8f4ecc7c3fdd8aad418944006dfa086a7c4d0757906a4f79 -Size (firefox-l10n-45.0/or.xpi) = 492735 bytes -SHA1 (firefox-l10n-45.0/pa-IN.xpi) = 3f8bee657b025c46258cba851ba1169039f7181c -RMD160 (firefox-l10n-45.0/pa-IN.xpi) = 348e48951fdc8d833e4b7d811f2f5a109a3d3a74 -SHA512 (firefox-l10n-45.0/pa-IN.xpi) = 9352e1ac99f537a3e0e9ff394c83a9b5586a15161824d9e2425b0544687c5b515450b4c82e4c3b1638afb773fa7895a1a5ff8fc2b6ff03c1fe9814f30f33aa19 -Size (firefox-l10n-45.0/pa-IN.xpi) = 485887 bytes -SHA1 (firefox-l10n-45.0/pl.xpi) = edff42b902d62c985455b473776b9eedb22c2798 -RMD160 (firefox-l10n-45.0/pl.xpi) = d4c9a4cd3a220f27493841080873cfdd2f20a763 -SHA512 (firefox-l10n-45.0/pl.xpi) = 7b1e659d2cce64e63b17760c887dc07f6c8f1f914e36885f2cec271ddd4c6a7e3ec92f4b6679fcce58513aec1fcc8da01bcd5b5f92e224a84cdf29d94ea20cb0 -Size (firefox-l10n-45.0/pl.xpi) = 379556 bytes -SHA1 (firefox-l10n-45.0/pt-BR.xpi) = f17ace6f29b01600b90ec0930a8cd083d6155630 -RMD160 (firefox-l10n-45.0/pt-BR.xpi) = b35f11da3b2ed4b4b0ec409d6735de738ddfc8fe -SHA512 (firefox-l10n-45.0/pt-BR.xpi) = f794f2b7277c44f0691c569e1bb36de3e1188e16241bb02aa1c5b5c1a30736c75ed1f8b9801fc72b10a8d34d2fe7c03b2e2877bb5813cd8c6baa33078ec88aed -Size (firefox-l10n-45.0/pt-BR.xpi) = 445519 bytes -SHA1 (firefox-l10n-45.0/pt-PT.xpi) = aca1c68594ae395c4f4fe4d91121c1911baa0a57 -RMD160 (firefox-l10n-45.0/pt-PT.xpi) = ea111b44146fcda0263b014091b2d274241f8b20 -SHA512 (firefox-l10n-45.0/pt-PT.xpi) = 5e39b9b16acbd3f7c734e92bb2c0b6b6d9a8daa78d476f64250a493bf4ad8e0eb539549b246558d475455b6de83f5760da6773e0aabcabd8003587ad40b31f9e -Size (firefox-l10n-45.0/pt-PT.xpi) = 431497 bytes -SHA1 (firefox-l10n-45.0/rm.xpi) = aae20b9aeaf6bc9aa4cb786793eb9a135cb7a12c -RMD160 (firefox-l10n-45.0/rm.xpi) = 8b81cf43e872c0bd6123aee6eda683ebbd6da050 -SHA512 (firefox-l10n-45.0/rm.xpi) = 7000391cdeca02a8813e694febcf2efaabd4135a9220901915d627c378a78339a51db93b9031756c2096a2711bea48c9325d2c0f1d4e418541e0e54374375844 -Size (firefox-l10n-45.0/rm.xpi) = 432731 bytes -SHA1 (firefox-l10n-45.0/ro.xpi) = 32d6e8bd783d954e573b93fe9fa0fb4455d429fb -RMD160 (firefox-l10n-45.0/ro.xpi) = d2f3792c173ce18cbd158bccbdb8fb71e1ac36de -SHA512 (firefox-l10n-45.0/ro.xpi) = ee5eb816befa9f87683287e72d8f3b41ec4272d1087f684952057ba2419e594493eddc5f66e8a90f7d64366c39cf6929258804273ee66329c00efad14c0a6d35 -Size (firefox-l10n-45.0/ro.xpi) = 440797 bytes -SHA1 (firefox-l10n-45.0/ru.xpi) = 2f88ab3e23b96d0548560719396a1327d6622e72 -RMD160 (firefox-l10n-45.0/ru.xpi) = ac2a84b5e2a676486229568771287e112edabcc7 -SHA512 (firefox-l10n-45.0/ru.xpi) = bed630598d81f1846e1566284422d5f1aee2a7c2552805e4ad0473726710437ea214fc5ae91da9df973652d715bab468d355cc00cf13bacb6508a29eae8facfc -Size (firefox-l10n-45.0/ru.xpi) = 386410 bytes -SHA1 (firefox-l10n-45.0/si.xpi) = 8abd1456679c1d181b2362af39af131e21e0fa6c -RMD160 (firefox-l10n-45.0/si.xpi) = d02797c390f240bfffaca3c54f7961372b95757d -SHA512 (firefox-l10n-45.0/si.xpi) = 1a8b1b840b9a62795d390ccb66e0d8f7876c9ba2d1781b34ba11c0ed5104ef6f137927fc30d23bf8c351da3a90796e22838413208b63ba4ce63b6444fd5a4859 -Size (firefox-l10n-45.0/si.xpi) = 479304 bytes -SHA1 (firefox-l10n-45.0/sk.xpi) = 27bdf1ca11517b968f808b13d04cee80bbae5ff8 -RMD160 (firefox-l10n-45.0/sk.xpi) = a4b832328bb59fc8a0a7a2e07af1032db15515da -SHA512 (firefox-l10n-45.0/sk.xpi) = 5b44b47b7aee2fa842c68b824a2fa3647316dd53ec806617d36e5fd68b87208ff750bec128d80ee00ff953b8a3a811bf53982bf1983a7802e1da4d1a6fb579f5 -Size (firefox-l10n-45.0/sk.xpi) = 447859 bytes -SHA1 (firefox-l10n-45.0/sl.xpi) = d6cd5cf914fccec43f299ffc28a51bf038a88bee -RMD160 (firefox-l10n-45.0/sl.xpi) = 973740b810290f04ff8d933cad344afd332fe8f9 -SHA512 (firefox-l10n-45.0/sl.xpi) = c48fea3f1b6bc2fc77d4bfb9162618f73e3f1688003f2254061dd718e24c045d36c6e8da5a329881ef403ff7f3d733614eab08e0f4cd5822b4b7ee765a71f20b -Size (firefox-l10n-45.0/sl.xpi) = 439483 bytes -SHA1 (firefox-l10n-45.0/son.xpi) = 2b8829cd16b9f3b0ea0ec70c55516847335497d2 -RMD160 (firefox-l10n-45.0/son.xpi) = 573322ce5df118d693b5abe565e035c6656be3c8 -SHA512 (firefox-l10n-45.0/son.xpi) = ed003da6a888b378bd1f658ce441c0e0d55aa85dbee69174dc50f551eb572bfc6cc8891c0ceec373f8ad25f9d1d2d3163a8a32db02f86f562770880031fd155a -Size (firefox-l10n-45.0/son.xpi) = 430486 bytes -SHA1 (firefox-l10n-45.0/sq.xpi) = a605becaf3027cc914bc7f1f10ef81cc2bd6fedf -RMD160 (firefox-l10n-45.0/sq.xpi) = aa64a97c3b8744b54a4ccddee39c108bd8f822c8 -SHA512 (firefox-l10n-45.0/sq.xpi) = f8394b306d6e84d88c8709ac4621906f9603ef1bc1381389091209bd01d58004a8b9acb93862b554ce46e8982ddcd4a369c852ccf7202136ecaa82f4beeebc6c -Size (firefox-l10n-45.0/sq.xpi) = 446481 bytes -SHA1 (firefox-l10n-45.0/sr.xpi) = 73852881dec97b34e6d940d2b9efb82cabdfc9cd -RMD160 (firefox-l10n-45.0/sr.xpi) = a976aac7baf39def3fc4fb544065aaeb95c2e8e2 -SHA512 (firefox-l10n-45.0/sr.xpi) = a758f6f4d4aa82b373fe2cb04b25a0a9c26068f923e0a77098bb16a18453b651895855f86e9c63d8f2d0f6681138afd2b75b3bc6542704ee3da1baa2f675444d -Size (firefox-l10n-45.0/sr.xpi) = 459050 bytes -SHA1 (firefox-l10n-45.0/sv-SE.xpi) = a2ca2395632fd828699c5e4147896a309e859b6b -RMD160 (firefox-l10n-45.0/sv-SE.xpi) = 06c41a98c4d93c5ce88e08a522ed8faf42de9477 -SHA512 (firefox-l10n-45.0/sv-SE.xpi) = e42877423acc6731bcfe6668ca960b46e9ae525b8fa7b8799c6f268ef9c83b74a652a857e8926ed41a13a83f714215d777a3743f880af3053acc30bd040c878d -Size (firefox-l10n-45.0/sv-SE.xpi) = 438723 bytes -SHA1 (firefox-l10n-45.0/ta.xpi) = f065629dcccdd7079b1d4d0ff04dd04ef103c66c -RMD160 (firefox-l10n-45.0/ta.xpi) = b7039cd191e3166fbceb2c2ea5502a68844ee432 -SHA512 (firefox-l10n-45.0/ta.xpi) = 1fbee696fded534c9348b1346a64acadada1de569016bf851963f5b3f37328bc312b65f758ec290980f6e4d18c6e7864d3c7128fa75ea51922827d5880815954 -Size (firefox-l10n-45.0/ta.xpi) = 479527 bytes -SHA1 (firefox-l10n-45.0/te.xpi) = 6df04cb1446d47de430180da50c1348bbaed3f43 -RMD160 (firefox-l10n-45.0/te.xpi) = 437f327b932fe6b41ac7d875b062a8eb262b93ff -SHA512 (firefox-l10n-45.0/te.xpi) = 9270be91057de697a8b18db0b3784ece3e8796a461b0abfa0317dd6cd76c20926169dd9b9229782b58d9cf0433e63e58a6f8f285f94ae33a5151b2bbd23a9255 -Size (firefox-l10n-45.0/te.xpi) = 489284 bytes -SHA1 (firefox-l10n-45.0/th.xpi) = 9f95cb63786aecc40c066afc7b741599dcf69d7d -RMD160 (firefox-l10n-45.0/th.xpi) = 4378c2a090761ef731acb8648d06a8ff879ad0b5 -SHA512 (firefox-l10n-45.0/th.xpi) = 7447bb100bae1674af99b2a29b2b940b4a95c2b72ac4f965e49c53969ab25b8127d7edc3bd659a2b00ab63cd4b523bae0194c24a4d5359ccb9c0175236342b15 -Size (firefox-l10n-45.0/th.xpi) = 474139 bytes -SHA1 (firefox-l10n-45.0/tr.xpi) = a5400709450ccf998605fed33387c54e65bc015d -RMD160 (firefox-l10n-45.0/tr.xpi) = 36f73df57a62d0bb61317ec8ef5dd80e70e85017 -SHA512 (firefox-l10n-45.0/tr.xpi) = 9dd97b4c09e0aea28744952f19cf5492f87710d664931dfdd7aa06cc599f5b5a52f78bf4245390fa864b28ea1f92f8041bf9d402580cf45382e30f158b35e898 -Size (firefox-l10n-45.0/tr.xpi) = 445668 bytes -SHA1 (firefox-l10n-45.0/uk.xpi) = 0ba5c308faac1ad9827c95b48b3571c54909fa44 -RMD160 (firefox-l10n-45.0/uk.xpi) = b30115c107c17024a28f6b18f1d6f526bef5d39c -SHA512 (firefox-l10n-45.0/uk.xpi) = 1d119d6b669526ce0d38e21c1f067e24a6f7e2a1757ca942708575b59c8a89e4e309b36798d8cb904de0518c40bcd17012b9534f84bf6179b775b0b2341869b4 -Size (firefox-l10n-45.0/uk.xpi) = 488431 bytes -SHA1 (firefox-l10n-45.0/uz.xpi) = 769e5703cf0fd68c5a7260d17ff2f8944d76ca89 -RMD160 (firefox-l10n-45.0/uz.xpi) = 30fbb787aa42b9283b44d8a95d0dbcc4d5731ab2 -SHA512 (firefox-l10n-45.0/uz.xpi) = 89b5c8c40a0b2d5fd696a3c12f761115d32d4f3c871c78567f992789ea2174b86aa6ff73c865f4341a4d03b9c94dc7acfadba57619d78853ae8b4002fac9c28c -Size (firefox-l10n-45.0/uz.xpi) = 438746 bytes -SHA1 (firefox-l10n-45.0/vi.xpi) = 7094d6603222f71fcdbf8cafc584a28d28e1a087 -RMD160 (firefox-l10n-45.0/vi.xpi) = 1596eb4fc4078b826979adbe007310e6f410746b -SHA512 (firefox-l10n-45.0/vi.xpi) = e6212522851676089bab5e05131619be91dc665d2f622d6b746c66d4857b973900ae7740501477158e7bde5052c144c83ee91ab28d32971c702a1ae147c7917a -Size (firefox-l10n-45.0/vi.xpi) = 447592 bytes -SHA1 (firefox-l10n-45.0/xh.xpi) = a2eec61e54e700b2c330288eb1bdc11d05fbb4aa -RMD160 (firefox-l10n-45.0/xh.xpi) = 1e4719925fc66629872955f4d2480d175a6b3bfa -SHA512 (firefox-l10n-45.0/xh.xpi) = b606c3bfd0734735be619ac5cfa06b16cb3dfc0554a2b4887d5c664f58544c614b5f82703323218f926170e67d7b212b5cf157bd192ead48d2512cfa7ebd9dc5 -Size (firefox-l10n-45.0/xh.xpi) = 429732 bytes -SHA1 (firefox-l10n-45.0/zh-CN.xpi) = e4e4add525854758b756f368d0ee50c5deb04b53 -RMD160 (firefox-l10n-45.0/zh-CN.xpi) = 39d6bbfdbc9c56429a047d58e6c4d41a5ae415ea -SHA512 (firefox-l10n-45.0/zh-CN.xpi) = cc0d05e8e45f607048fc2016c423e24ebb7ca727ea5435f89a20d3d6d3d41e43e59d2ccf105934d05788b16f0f6f000c5d3e5c694c69d29fa111452e31b5e6ca -Size (firefox-l10n-45.0/zh-CN.xpi) = 469930 bytes -SHA1 (firefox-l10n-45.0/zh-TW.xpi) = 667a3f81a75db9dc536c7c1a77c7bdb1bd5ed82f -RMD160 (firefox-l10n-45.0/zh-TW.xpi) = 3f6ca66cbd75d49d2d94972a7f332d78dc2bf36d -SHA512 (firefox-l10n-45.0/zh-TW.xpi) = 5d0e8dcbd3609e447e0c37d3e64528804dccd3a41aad75a04e4991101bb87a7afa470ff96ea68aa1d6f4d3b68b9db2dd1a7d4934fa2f82db56632327a1c73a1e -Size (firefox-l10n-45.0/zh-TW.xpi) = 460793 bytes +SHA1 (firefox-l10n-45.0.1/ach.xpi) = 7065650f5e300c0774b36c0feb67a69deda8b2c6 +RMD160 (firefox-l10n-45.0.1/ach.xpi) = 58994e8328c93ded35452162d3abf2791fd3b947 +SHA512 (firefox-l10n-45.0.1/ach.xpi) = 3a2196285df50836c8727761374af0e826ab0feadaa82f5822b1f09caa38e19bd2e803a1268d33077e5d5b425617d6262b0d9e1ad8c732edc2a615b826b591f0 +Size (firefox-l10n-45.0.1/ach.xpi) = 421464 bytes +SHA1 (firefox-l10n-45.0.1/af.xpi) = 5a526faa4cc015e8bd961449aec3b2de3aaf2a88 +RMD160 (firefox-l10n-45.0.1/af.xpi) = 862e9e5418e855b29a293d1e08dc117a0912e5f7 +SHA512 (firefox-l10n-45.0.1/af.xpi) = b6e26749b30dc95801c164403a16767715c67001e50d0b96345e8bb80b3450e883dcd525c4b253b1eaf14e7c3d637d4302050dd79727d91b11836cf47eea43f1 +Size (firefox-l10n-45.0.1/af.xpi) = 436169 bytes +SHA1 (firefox-l10n-45.0.1/an.xpi) = 7aa07d565894f21d6d484a8279b31ea5bd3cbb94 +RMD160 (firefox-l10n-45.0.1/an.xpi) = 6eaaf494f0f8806bdb0f2d9624758e89571c07b7 +SHA512 (firefox-l10n-45.0.1/an.xpi) = cc074ed9dad131fe6a32250a194cc46b72bb93df593571453d7e9e2ce9ac93afb7c814f20c2219cd5ac5994488f8175dcba3b06d422200d284bebc8bbbd0932f +Size (firefox-l10n-45.0.1/an.xpi) = 443979 bytes +SHA1 (firefox-l10n-45.0.1/ar.xpi) = 7570941ea8abda1855804dec0adc8e6ed087e9b5 +RMD160 (firefox-l10n-45.0.1/ar.xpi) = 35283f9129e47c53ee41ca8496af03da678bee6a +SHA512 (firefox-l10n-45.0.1/ar.xpi) = 8b3fe1e88e659cd1c844dd0b1926e48b481d96519754a3524e59b5ef16cb4a2c6829d4a0f27156328561da13b85d74e7623c0451234f437d38c1d7438f92fc78 +Size (firefox-l10n-45.0.1/ar.xpi) = 471775 bytes +SHA1 (firefox-l10n-45.0.1/as.xpi) = 0d5575b21ab85f55d6912059ea790c92eff7aaff +RMD160 (firefox-l10n-45.0.1/as.xpi) = faba8bac2d97ace5623781c67632a8682c966ee2 +SHA512 (firefox-l10n-45.0.1/as.xpi) = a7a8a5d14df2fad5875ad6ecc2eaf38501e7455d784f783d569ef0ef2a2705abe6c51348529dfde435a0d92617ba7d7eb4e5203427c093ec60177c73f5b20cbd +Size (firefox-l10n-45.0.1/as.xpi) = 479910 bytes +SHA1 (firefox-l10n-45.0.1/ast.xpi) = 32865b26502145d8753bc8f45a62b02a8614ca2c +RMD160 (firefox-l10n-45.0.1/ast.xpi) = 067dd51730f612bd5390e4763bb12ba6d3061ffb +SHA512 (firefox-l10n-45.0.1/ast.xpi) = 2851336c37c90b7d12dd6d94095da49dbc8305d6c69ae5766fb972a51142fa01f277c43eef97020f49cc64cd28b288863e079810b46531d21ccac8ac99051318 +Size (firefox-l10n-45.0.1/ast.xpi) = 416054 bytes +SHA1 (firefox-l10n-45.0.1/az.xpi) = 6f7ab3be2bb91e5793044081447f4bbf2328f8ae +RMD160 (firefox-l10n-45.0.1/az.xpi) = 9e44f84fa27c4a8584ad89146b0cd2b4167511c1 +SHA512 (firefox-l10n-45.0.1/az.xpi) = ca19a09b1b2c97e5e6f97733c0058bd085c0039c616fef27ae3b371451ad571efa1d54695e0051ba63e6aecb2a9853ead2a57571e3848d1d4e441f6a42d9da71 +Size (firefox-l10n-45.0.1/az.xpi) = 458356 bytes +SHA1 (firefox-l10n-45.0.1/be.xpi) = 5e16e291c0204eb60e498a3376ea6fb2485eed57 +RMD160 (firefox-l10n-45.0.1/be.xpi) = cab76e0bd73605ec14121bc1294fc4172cb855f1 +SHA512 (firefox-l10n-45.0.1/be.xpi) = db05311f20a1db5c579ff32f42b2d87db57e4c31c6cecc61917912f4a5ecbbd4992254d3652adfc2d16b01c32b82db63ff06354dacd72ca8d49c42b2b27abe16 +Size (firefox-l10n-45.0.1/be.xpi) = 439433 bytes +SHA1 (firefox-l10n-45.0.1/bg.xpi) = c923a26565b35ec983cc71c951ee407971819ac7 +RMD160 (firefox-l10n-45.0.1/bg.xpi) = c88f45264a0f0c73584d35cb1a88fe1a06a85287 +SHA512 (firefox-l10n-45.0.1/bg.xpi) = 76fd72b52a1671a62ae93d36e53c7e51155e8d77cac54333675f064b5cafcfa8eacd6780621b836e15a787223d81ebe260406ad6a0eda22d5fda8beaafc2849a +Size (firefox-l10n-45.0.1/bg.xpi) = 457342 bytes +SHA1 (firefox-l10n-45.0.1/bn-BD.xpi) = 7be6064bc6d2fbf7a3e81d63c2c964c437d11ee0 +RMD160 (firefox-l10n-45.0.1/bn-BD.xpi) = bd44529257021fc675ba78423fb13715e0fe7375 +SHA512 (firefox-l10n-45.0.1/bn-BD.xpi) = 5d7ed69aadc43f2c92e149c8bde8dc4f027b70144c72b4c78f73ea21db8402c35591192fde62a09e729ea574b591a75eca8c167f0364319ab9e1835784c7c454 +Size (firefox-l10n-45.0.1/bn-BD.xpi) = 509415 bytes +SHA1 (firefox-l10n-45.0.1/bn-IN.xpi) = 8a6960c3998585751f06b226aee357850ecffafd +RMD160 (firefox-l10n-45.0.1/bn-IN.xpi) = af2b93231ca0fe7fadb3f7b98caeef3302acc272 +SHA512 (firefox-l10n-45.0.1/bn-IN.xpi) = 75334e2f8028b55cd31716ea7af86b2920c1c51796b504d8bf5ebbad792ef569b1ce685528f00ed37cfd7d73fb61c2b47553c37e0189471de076c683fb22feb6 +Size (firefox-l10n-45.0.1/bn-IN.xpi) = 490801 bytes +SHA1 (firefox-l10n-45.0.1/br.xpi) = dd1e8a48928c8f7d29f937873f7e4798e9b1aac0 +RMD160 (firefox-l10n-45.0.1/br.xpi) = f46b9a458d90dbdce0adf0819e10b6ab366783ad +SHA512 (firefox-l10n-45.0.1/br.xpi) = 928727dab9529997964c9d6ff1167c5e75ba38ac322b40029cef84cfd7559acb4b49d64e0c4f5f60e050e7cb14a398863f8cd4a38edf33aa869d07413e86d583 +Size (firefox-l10n-45.0.1/br.xpi) = 431333 bytes +SHA1 (firefox-l10n-45.0.1/bs.xpi) = cbcfab8bdfd1e9d0ae742e5481099367995af451 +RMD160 (firefox-l10n-45.0.1/bs.xpi) = f910a5b8e0b2e828c0a0fac2b056ba26534825aa +SHA512 (firefox-l10n-45.0.1/bs.xpi) = 6edd03881d28e1ee1ee7dbee89e8bb3878498e5c29d9b6ebb6ee2fbd4ab5cf3af69a847017ab1210481d3a94dfcd1898fa2121b605d71b702544097bbeb3588e +Size (firefox-l10n-45.0.1/bs.xpi) = 439698 bytes +SHA1 (firefox-l10n-45.0.1/ca.xpi) = fa388d1fe5063534835b8c324d142ee83a832f7c +RMD160 (firefox-l10n-45.0.1/ca.xpi) = 05a533cd3822478935d92c626cbbf8ad2e2d3359 +SHA512 (firefox-l10n-45.0.1/ca.xpi) = a9ccc5a44ea9cecc036dfe4b44aa923455e53475f5510a4fa030ced587514a4023692a8dbd5179f7fd34eef7d7ba3bb73a5f5ca4d8651e634a0149ef0682b247 +Size (firefox-l10n-45.0.1/ca.xpi) = 433726 bytes +SHA1 (firefox-l10n-45.0.1/cs.xpi) = 49763fb99b295b438e6a21fd6657bda3dacf51e5 +RMD160 (firefox-l10n-45.0.1/cs.xpi) = d55c5746c0304f3accb56eac9dedc68a230689e6 +SHA512 (firefox-l10n-45.0.1/cs.xpi) = 4189c9deee7652b4a08363d3bebb7f4409ae24e4ff2f36278448fcec780753976ae88394586adef5547cc87b66c22d8348483e518a6cc188dbe689a15a8ebc9e +Size (firefox-l10n-45.0.1/cs.xpi) = 437701 bytes +SHA1 (firefox-l10n-45.0.1/cy.xpi) = 8580347e81a34ce8915a500776f5d46c512401b0 +RMD160 (firefox-l10n-45.0.1/cy.xpi) = e2491f2a615b1fe5733ca5809c1974c3ac90ff00 +SHA512 (firefox-l10n-45.0.1/cy.xpi) = ce2cfbbc294c8f2d8aadd48d3283b03f02366a5b729787044431678e8e2a11bfd4b9e38a750bfafd5fb8fb73e2d53afb887ce3c344491b1596fdbb60aacb973c +Size (firefox-l10n-45.0.1/cy.xpi) = 433864 bytes +SHA1 (firefox-l10n-45.0.1/da.xpi) = f7a15d635bb215decf067035a83e21f7a7367c4d +RMD160 (firefox-l10n-45.0.1/da.xpi) = ea091e54302c77d0e0ea29c8004744e32a125293 +SHA512 (firefox-l10n-45.0.1/da.xpi) = 1f0250bc1408e4c32f7faf416ba73a0a0cc3e68b9f4a42aec78762563d3581b44cd2dcc1d2429e0648bdf1ddea1c0f5afe8d2088f0c1cabff334ae56bab99a16 +Size (firefox-l10n-45.0.1/da.xpi) = 424613 bytes +SHA1 (firefox-l10n-45.0.1/de.xpi) = b0a978e1e6294592991ff90a0c319cbf8f99f238 +RMD160 (firefox-l10n-45.0.1/de.xpi) = 6f7f372e331485ef6ea6027366be9a2f1104bd19 +SHA512 (firefox-l10n-45.0.1/de.xpi) = 8e017224f77d9402f2a6753732dda767bff89c363cdb7b08889328f0cb703f2edea4253a9be2a18a4c7dc4b4c5d0a0745b65dc306e0fb422ce59f508101ba681 +Size (firefox-l10n-45.0.1/de.xpi) = 439756 bytes +SHA1 (firefox-l10n-45.0.1/dsb.xpi) = 5263ce50ab0ce18fb62dc49caa43e125585ceb54 +RMD160 (firefox-l10n-45.0.1/dsb.xpi) = cad55ce5b852e0f3e17dc63b63f2f1903e181744 +SHA512 (firefox-l10n-45.0.1/dsb.xpi) = 03a45fb23ab6fbb20cb67f1d7011139a166a4381056378e452e4522813be7b31719de6ec876b5e43981c3601cf6212b418f015f20f6d8e012f22ce5a1243986f +Size (firefox-l10n-45.0.1/dsb.xpi) = 458054 bytes +SHA1 (firefox-l10n-45.0.1/el.xpi) = 6dd47a53182831d2c8df14f3622f6770ae6d65ac +RMD160 (firefox-l10n-45.0.1/el.xpi) = eb8fbf1b3fd3e97ffcc3d8606ca9562678257483 +SHA512 (firefox-l10n-45.0.1/el.xpi) = 93e84bdcbbca3b52e36a873d15ec43da13884ba5e86bda4fb9274d7d20b668d65e26f1d75e473d777ddf6f1d06f5637ef396e84226dd7f398f0b314e9bd5de62 +Size (firefox-l10n-45.0.1/el.xpi) = 467211 bytes +SHA1 (firefox-l10n-45.0.1/en-GB.xpi) = 24c251f5ceef5d2d11d1423af0763f44e622b85c +RMD160 (firefox-l10n-45.0.1/en-GB.xpi) = e0911689901ea3345ebeb9062346c89f201e5744 +SHA512 (firefox-l10n-45.0.1/en-GB.xpi) = 908f1cc5e346939df80fb6c739227e20e8205b1a096ab0a86f2ea02dfa754196de890570252fba67e26da5dfb6c81e001e078fedbf7af381552831b44b538d6d +Size (firefox-l10n-45.0.1/en-GB.xpi) = 418742 bytes +SHA1 (firefox-l10n-45.0.1/en-US.xpi) = c5573a8c166313a772b32f446b7e1017a26c3fa8 +RMD160 (firefox-l10n-45.0.1/en-US.xpi) = abe7a8e3dbc2d562175784595b178459f9471324 +SHA512 (firefox-l10n-45.0.1/en-US.xpi) = d58357203ce63f73e8298b0ac07550ba0ad2d1e5f2551e5e21f921e7c6c592173766ad41afb92a166505f60b812cf9f8acd32ede7ef40407be135b7bec4ffdb3 +Size (firefox-l10n-45.0.1/en-US.xpi) = 420387 bytes +SHA1 (firefox-l10n-45.0.1/en-ZA.xpi) = 720bd5c1ca68c5eb3a8cbf0a9daf8ae877925d52 +RMD160 (firefox-l10n-45.0.1/en-ZA.xpi) = f25d7765020c3a9ba5ab5dd15fea1c203c515e0e +SHA512 (firefox-l10n-45.0.1/en-ZA.xpi) = d1ce120777da845114d6fe7f277c04b215f4f4efaa565b396d91773bdb1e5a6e87e9cb8e10a1015361f9d0503b6e36b0f438d2fa2258cac9e57bf50893951b6d +Size (firefox-l10n-45.0.1/en-ZA.xpi) = 415694 bytes +SHA1 (firefox-l10n-45.0.1/eo.xpi) = 28673dbb0805219175f2709cd5846dc93afd6a28 +RMD160 (firefox-l10n-45.0.1/eo.xpi) = 063da0c6a43c5bcad55dc5d278f5a53120b21955 +SHA512 (firefox-l10n-45.0.1/eo.xpi) = d403be5cd6a746fb760271a724985cd769c7747e7237ef1d7e609d389d416155859b012166992b77957f76ae0bdf34a0b770a848d001742f9ff22ddeec613685 +Size (firefox-l10n-45.0.1/eo.xpi) = 437888 bytes +SHA1 (firefox-l10n-45.0.1/es-AR.xpi) = c969355239c074c7dc90e0f8adfbe1779eaa9358 +RMD160 (firefox-l10n-45.0.1/es-AR.xpi) = daca9504f739d590fc5c341786d62a827846d319 +SHA512 (firefox-l10n-45.0.1/es-AR.xpi) = 855dc5415dfff50d3e84d41b4ce7bb92ba09b46f2d055cd2016a2e84a769e2fe2be2e6d2ec33b3766ba8f5b01f15c6c0d40b2dc60a2630c85733d3f19d6e22fa +Size (firefox-l10n-45.0.1/es-AR.xpi) = 436400 bytes +SHA1 (firefox-l10n-45.0.1/es-CL.xpi) = 65698bd9c51fd11b3aeff1b0403f124351c18f03 +RMD160 (firefox-l10n-45.0.1/es-CL.xpi) = 83f261a8478a8f3dba38d7f52077e1d5b2e2058d +SHA512 (firefox-l10n-45.0.1/es-CL.xpi) = 81e24fd899e2d8447813934bc0678cffb5e9a4c184e4e1a533b7b3cf195a095312e1f53a9842ed8bb5a605970fd6b9e3e24bb6534e9d1fc98b23dfba4810a586 +Size (firefox-l10n-45.0.1/es-CL.xpi) = 363186 bytes +SHA1 (firefox-l10n-45.0.1/es-ES.xpi) = 3b2306a6658250d721106762901e7d9fe9655adf +RMD160 (firefox-l10n-45.0.1/es-ES.xpi) = fd99a186e04035d908de5af849dd10e98ac7e4a6 +SHA512 (firefox-l10n-45.0.1/es-ES.xpi) = 7de99ac9e697849ad69c24052b4c5328ede2ac1c1678f129567035868c462ba20f1cc9fb934c60d36e8b0d0328583d024f23d8d367cdca5e84804fe02acd2b48 +Size (firefox-l10n-45.0.1/es-ES.xpi) = 348133 bytes +SHA1 (firefox-l10n-45.0.1/es-MX.xpi) = 30e0351e2940fe48641b2a8e9c1bc7cc2af6a1dc +RMD160 (firefox-l10n-45.0.1/es-MX.xpi) = 443c4567ddd0254475a9b95c683af6b2bfe7d114 +SHA512 (firefox-l10n-45.0.1/es-MX.xpi) = b297d1cf67de1da68a3927a2b7ca9f63c4407200298bb02d02f237b274ebe2ddd674d7d81ef61ab5a3ca6891a8bdaa12a5ab3919cce33d4ed7a97b7850acf39c +Size (firefox-l10n-45.0.1/es-MX.xpi) = 443818 bytes +SHA1 (firefox-l10n-45.0.1/et.xpi) = 96d93dc6822aaec9b2221e8a016b3759d2df3cfb +RMD160 (firefox-l10n-45.0.1/et.xpi) = e77f18e6c325eeb56c09018cb59b6d7bd3f04e29 +SHA512 (firefox-l10n-45.0.1/et.xpi) = 44a92685ddac2d996226d74b972425bb8a62dfab79b4d3ae7a3946c53464ac9124dce06d1dd99da08b9e8d2d278491066972d83ff3f06d9e57f2ac3eb1a6dc2f +Size (firefox-l10n-45.0.1/et.xpi) = 427886 bytes +SHA1 (firefox-l10n-45.0.1/eu.xpi) = 250d0464f6d7405f998751342c4eb1f3b3da6f11 +RMD160 (firefox-l10n-45.0.1/eu.xpi) = f8fda2241740fbd2b8113bdca7593715b76d326b +SHA512 (firefox-l10n-45.0.1/eu.xpi) = 8d4325ed8ad19516fc11fc9826203fe14d351a98a845bcfa1435e1d155a28668ed622fb42bab612c408b2d034466bbebf60c554a585088da72374c8f059491ee +Size (firefox-l10n-45.0.1/eu.xpi) = 438042 bytes +SHA1 (firefox-l10n-45.0.1/fa.xpi) = ea1be69dab822a17bc737e100d17b88660a5a0b3 +RMD160 (firefox-l10n-45.0.1/fa.xpi) = b3274bb690b76c0e5884a593ae1d0d60878d2d32 +SHA512 (firefox-l10n-45.0.1/fa.xpi) = 08bc57ced7dbed056ff9de4fa2bf851f3c185cefda3d1a69476d96d1646a050ca6547bbd3e3f316ae8ed46b7f0c979bfb5323254a7bdbc3b6da15de0c7fc6565 +Size (firefox-l10n-45.0.1/fa.xpi) = 485805 bytes +SHA1 (firefox-l10n-45.0.1/ff.xpi) = 219e74d8f9139784f0e14558b7765fe046d631d3 +RMD160 (firefox-l10n-45.0.1/ff.xpi) = 011c9d912a0036bbf54710aaa9ae27ad818cbbc3 +SHA512 (firefox-l10n-45.0.1/ff.xpi) = 73d39b523ead39b6bd5793638bb89f503eecc995837778f63a8a645510a7718da1c093ccd487ec9f43e912cacb4f4f14ffe13c360e0f1905fbd7cad1b98f8a2d +Size (firefox-l10n-45.0.1/ff.xpi) = 438223 bytes +SHA1 (firefox-l10n-45.0.1/fi.xpi) = b4671975b0129a19ff9ecb6a2009b920cdfa7d8d +RMD160 (firefox-l10n-45.0.1/fi.xpi) = 75db5f095f63240ec0582395941e0663779a60b7 +SHA512 (firefox-l10n-45.0.1/fi.xpi) = 3236106e84a9b330c6649cc080810349740695d15467ac07d2267f1fd68958fe0cc2eb95d36e33d653b14791eeadaeefcf053846de63c31e9a3f8293c226270f +Size (firefox-l10n-45.0.1/fi.xpi) = 435343 bytes +SHA1 (firefox-l10n-45.0.1/fr.xpi) = f72f92fe6c883b2d8169660ad383aa4291e3633f +RMD160 (firefox-l10n-45.0.1/fr.xpi) = 6fb70668434eb7718d2fe8fb4fa56db3cdfebac1 +SHA512 (firefox-l10n-45.0.1/fr.xpi) = a56cb5839cecfd4b6b85f0b45dd17baa7e6d0a046cc4107e7a59fe099c435a047da405f5e0f112a098721d33e3a897ad146ddee4b0353829e6861ffbd0546e89 +Size (firefox-l10n-45.0.1/fr.xpi) = 444345 bytes +SHA1 (firefox-l10n-45.0.1/fy-NL.xpi) = 462bb5b024c1a346dce28a8463ef8a950715ff8c +RMD160 (firefox-l10n-45.0.1/fy-NL.xpi) = 55953153025cf7572f1ff691ea49859fe1361d09 +SHA512 (firefox-l10n-45.0.1/fy-NL.xpi) = f5f40e0899b0e69d17960fa1d8a2c555bd4b1b6d399ec459e973124353264bb71dfdd6621f2aa83273581de646b3b5105937d4eacebcb099c1b9ef57dedc7b85 +Size (firefox-l10n-45.0.1/fy-NL.xpi) = 442268 bytes +SHA1 (firefox-l10n-45.0.1/ga-IE.xpi) = cd25d2bd1d31442c0dcb99c06e7c49b3c4394580 +RMD160 (firefox-l10n-45.0.1/ga-IE.xpi) = 5455f6480de0faa4d691eb05f37b7eb43dab8087 +SHA512 (firefox-l10n-45.0.1/ga-IE.xpi) = b5fe53df4f3e67e6a499680375ea8869db631cd8895a32ed81cbf7a59f93db6bc4f1b0acd245d5e2a540f3b7bbbee9753c04de9aedb1dfc050be24e8b82c53da +Size (firefox-l10n-45.0.1/ga-IE.xpi) = 454974 bytes +SHA1 (firefox-l10n-45.0.1/gd.xpi) = ef79384601c7f6ae20023856bce6feaf8cac25d4 +RMD160 (firefox-l10n-45.0.1/gd.xpi) = 2ae86e6b9771aa310c1da733e576460bde309922 +SHA512 (firefox-l10n-45.0.1/gd.xpi) = 32cc2c19d25defc3720b4bb8f4649ba3e6d4a48461e7e689ab9ce9a6bb9251a49b8e2bdafc6adee2de9178e1b78468999252f9a74c25c5c662e7c5dde3e64b8f +Size (firefox-l10n-45.0.1/gd.xpi) = 443932 bytes +SHA1 (firefox-l10n-45.0.1/gl.xpi) = 9c17d01564bf2b663fad2bb016cc6deb32dc7138 +RMD160 (firefox-l10n-45.0.1/gl.xpi) = e791daf7d66c3bc06509d023db73d6763d414a44 +SHA512 (firefox-l10n-45.0.1/gl.xpi) = 9ec4df34aadc63b17a73f565eb4aba6e69d1312593b52fbb89faf69a4e33f910344e5af94258bc3f0a2346d9e6b1118cc6de596a6917e9ed25ad12bf3d21e620 +Size (firefox-l10n-45.0.1/gl.xpi) = 431619 bytes +SHA1 (firefox-l10n-45.0.1/gn.xpi) = 1c739481ac53fab54687dabc3294de3b8f6a1aea +RMD160 (firefox-l10n-45.0.1/gn.xpi) = 5d8429bf38d868e2f54810f0aa7beb8656e08671 +SHA512 (firefox-l10n-45.0.1/gn.xpi) = a105f04cea7db03daa13bc2ba22b1c9e32884241bb2076330a1f3b7a6e5e1f1acb6bf7cca4046153c30e84cd0ac33443a446b6ac938cafa2712354cb4e1df76f +Size (firefox-l10n-45.0.1/gn.xpi) = 455592 bytes +SHA1 (firefox-l10n-45.0.1/gu-IN.xpi) = 7732d160f6afb08036792eccd01204e21bca1a11 +RMD160 (firefox-l10n-45.0.1/gu-IN.xpi) = ad00acb2439b067973774316b8559356e0043de4 +SHA512 (firefox-l10n-45.0.1/gu-IN.xpi) = c1128d1a8d2dcef5a445dfec1e180f4f7967056ff6518a9fcb9d7c6dcc9b6cd302f4122bcb642db9bd141afe1e542c0a02dede6b8cacc8b16df073b76a8333f9 +Size (firefox-l10n-45.0.1/gu-IN.xpi) = 469357 bytes +SHA1 (firefox-l10n-45.0.1/he.xpi) = 34ec9f712756818f611168394dee9eecf3205c98 +RMD160 (firefox-l10n-45.0.1/he.xpi) = 8b0277e8f8aad8c59ccc423afffcd39f87650f55 +SHA512 (firefox-l10n-45.0.1/he.xpi) = a2b9058d0f6eb636569f4f97e38e6303b02d0d67e88a2438d9a58ce4dc0fc2b217c06da39779d432db87cc7fb14f9a31e363dd10dca962a90ff0315c6a9f1a3e +Size (firefox-l10n-45.0.1/he.xpi) = 451979 bytes +SHA1 (firefox-l10n-45.0.1/hi-IN.xpi) = 0cd7e34b9ffd4fb3b73833fc25e80370254e1c8b +RMD160 (firefox-l10n-45.0.1/hi-IN.xpi) = 22f26f36d31623c0ee3f7906de1a53b992df6f93 +SHA512 (firefox-l10n-45.0.1/hi-IN.xpi) = 7d7b954b5d32ff97e513cb29ad9e5888811060624560535747308bf8a554019ca86840b0875e275d40467109fe8f3a9cdc8281741f808dd99dcb9d61ab560491 +Size (firefox-l10n-45.0.1/hi-IN.xpi) = 483334 bytes +SHA1 (firefox-l10n-45.0.1/hr.xpi) = d25d1b4da3be50ed22ed73fa6c3a1710cdc2995b +RMD160 (firefox-l10n-45.0.1/hr.xpi) = 3c18130a10a55cb2bfc06740e7376682971d780d +SHA512 (firefox-l10n-45.0.1/hr.xpi) = 1856fbce84098bfae88d370f807b7893367149619fec7b9d9a3194793f2d6f3dbbe62fcf7eadf5d5b5337b5c9f71cc3b7342039de841d42e70f0d1d93e40bcf9 +Size (firefox-l10n-45.0.1/hr.xpi) = 445884 bytes +SHA1 (firefox-l10n-45.0.1/hsb.xpi) = 01fb8e0fae2ef6166833e4e0ec5631c9f2820cfa +RMD160 (firefox-l10n-45.0.1/hsb.xpi) = 6ab3905da747429fedc147f244b178bf29d76eaa +SHA512 (firefox-l10n-45.0.1/hsb.xpi) = 93e528de07dd0fec9fe8be51b7296c78254cbf99a8c5d5795d7b6b4bcbef57c55b1e9c92481e5b5a9031b165550daa7111f0d1ccf5b34d1e62fdcfd5719264cd +Size (firefox-l10n-45.0.1/hsb.xpi) = 455734 bytes +SHA1 (firefox-l10n-45.0.1/hu.xpi) = b76d5d4649f7eec451ec11414ebfe449ad3cdb64 +RMD160 (firefox-l10n-45.0.1/hu.xpi) = 30121f471ceee5326189fc5a7b5f0d0943c8ad43 +SHA512 (firefox-l10n-45.0.1/hu.xpi) = 8c94435d9a67d529f52bf400809900d04a5e882793fd5f0079898938b216b6d0b4fe37a712c4a01b7be92dc88f4cb20478a6bec98b00dfff4e82e9423715acf6 +Size (firefox-l10n-45.0.1/hu.xpi) = 444069 bytes +SHA1 (firefox-l10n-45.0.1/hy-AM.xpi) = fae827e0857bfe2efd9c5a696b9f599be52ae46b +RMD160 (firefox-l10n-45.0.1/hy-AM.xpi) = a6c185367305c45ed220988745f9f938b5ca9e47 +SHA512 (firefox-l10n-45.0.1/hy-AM.xpi) = 7f1faddf8ee60e50e381c75f1adc3c99932b7429a45ee93b00e299f4efbed6517236485b53016cb7d63ecd0592b20e3d166f47d65ba088851cd696cd2110e5d8 +Size (firefox-l10n-45.0.1/hy-AM.xpi) = 494082 bytes +SHA1 (firefox-l10n-45.0.1/id.xpi) = 9519ba60b98d325955b557cb38ebf428c93505d6 +RMD160 (firefox-l10n-45.0.1/id.xpi) = af3a0230f65b8382e4dedc9d072c4248b327b2af +SHA512 (firefox-l10n-45.0.1/id.xpi) = 4a6b4837fe1e18d09921d1fd7dc14f8f611d3f318fa466b57387a272dbd813b6baf592d98686d21440462495d262f9e241f23d4af0c0a273e588b3d3874dc80b +Size (firefox-l10n-45.0.1/id.xpi) = 421750 bytes +SHA1 (firefox-l10n-45.0.1/is.xpi) = 05b99ded2727dadbc907612548dc8c8d961e6786 +RMD160 (firefox-l10n-45.0.1/is.xpi) = 2fa26a5caec5840cc1f6056e52370a4a01edf859 +SHA512 (firefox-l10n-45.0.1/is.xpi) = e9b4182edde40c8df7f1c4b5acfd312c271c9c98bbe1029cc143d3f64af6fca2070e45addd8dcf181ac1bb222de5f89960537849d0a01e9adcf9750cbc9b15e7 +Size (firefox-l10n-45.0.1/is.xpi) = 438156 bytes +SHA1 (firefox-l10n-45.0.1/it.xpi) = b4fa8bfb0b7754ac9b53b2f959e9304750677440 +RMD160 (firefox-l10n-45.0.1/it.xpi) = e875d08337371f0973fb3e648d6e346314c25188 +SHA512 (firefox-l10n-45.0.1/it.xpi) = 3c658789207ff383c3040145a163745493858425703716930941d8c0439b119c6a0ff2e14a9cafac45d8c86e198dee3aa7b4f9d8c7a9df2d0f6be562d0b462cd +Size (firefox-l10n-45.0.1/it.xpi) = 338105 bytes +SHA1 (firefox-l10n-45.0.1/ja.xpi) = f90fe3f99b84d54de281d0d1e60294c10f088ba9 +RMD160 (firefox-l10n-45.0.1/ja.xpi) = 33c81770882860627952f7e0fb2a779785325b16 +SHA512 (firefox-l10n-45.0.1/ja.xpi) = 0d42698dadaf3d83619f7445e0b45efb3a6dc46ae30ace81b7746616c5abdd965c8a62cc7fbc2f3f851bfd4d350176ce4db3e31b1f23031152ddcc4ff12a811d +Size (firefox-l10n-45.0.1/ja.xpi) = 480327 bytes +SHA1 (firefox-l10n-45.0.1/kk.xpi) = 63abaa0a4d4095a81ccd82b7ee0482c4f847229a +RMD160 (firefox-l10n-45.0.1/kk.xpi) = 7654da3ca1bbc7a22bfce7e908e286bf242d9b66 +SHA512 (firefox-l10n-45.0.1/kk.xpi) = 89123547be6d56f5335e07363c07a8a4222b2b6d98393de41e167fcc51d989cf3836c9d49c530f2be998c39c7ee13a774e3fc9ecd6b2b803073f1951d472d13f +Size (firefox-l10n-45.0.1/kk.xpi) = 493280 bytes +SHA1 (firefox-l10n-45.0.1/km.xpi) = ebdebad2b5a0cbe88ce7688354ee8c185861d03c +RMD160 (firefox-l10n-45.0.1/km.xpi) = eb31b234b86efa21e8998483223bd6a8cb01a4a9 +SHA512 (firefox-l10n-45.0.1/km.xpi) = 6b8212b041860aaeca58d164f6541ea5aab4021b6e63ee8ccae9ba5a9ccc3e42b9c3b7fde9c2cefe04ade0c058ff0bb8e409b145c4ee06d2a4f975990327b2ae +Size (firefox-l10n-45.0.1/km.xpi) = 501117 bytes +SHA1 (firefox-l10n-45.0.1/kn.xpi) = d82b28be81eee35086d0786ee2ee8689fa13d7e1 +RMD160 (firefox-l10n-45.0.1/kn.xpi) = 1c8598a353e9737d244cdba10015c5d3232eeca9 +SHA512 (firefox-l10n-45.0.1/kn.xpi) = 9c159ad083d190a94d48fcebf069584f6b13b78e358ee22b186a71104cd02fb0cf5228b6235998192deacc1151e9b9168d48d54dad06bb99ecbacb20e79bf50f +Size (firefox-l10n-45.0.1/kn.xpi) = 492246 bytes +SHA1 (firefox-l10n-45.0.1/ko.xpi) = 8d59286633e5547a039ab1a8991ecd89a35c63bb +RMD160 (firefox-l10n-45.0.1/ko.xpi) = c56d6cecb8cf14687c580a3f9c1f0024e9cbc1fb +SHA512 (firefox-l10n-45.0.1/ko.xpi) = e8df97bd6478d1bd25749085aec94ef4991d258e96f23a3b9d4f3be7e861408094180211ca1adc2789c9b4905c1cb3e5cb10b21dcda6b98603aee50418860bc9 +Size (firefox-l10n-45.0.1/ko.xpi) = 459998 bytes +SHA1 (firefox-l10n-45.0.1/lij.xpi) = 42c86297569f3e9c7d7ce085efab717e82087f2e +RMD160 (firefox-l10n-45.0.1/lij.xpi) = 7fff04aa996f062f8aac5039d332d9e9cbebdef4 +SHA512 (firefox-l10n-45.0.1/lij.xpi) = cb0c239bb07ae7871d5c8c2257dbab93e60bea8ccb437aec9e89fd70f38adfa3d814c58df4915b1526c5781fe2265701e0307b87d12490e849f4ae517d703286 +Size (firefox-l10n-45.0.1/lij.xpi) = 376302 bytes +SHA1 (firefox-l10n-45.0.1/lt.xpi) = ecd35892a22901d885f02299438f386b43c9e01e +RMD160 (firefox-l10n-45.0.1/lt.xpi) = 67d27ac47069aef4d4640ba153a7b95ccf087ad8 +SHA512 (firefox-l10n-45.0.1/lt.xpi) = 2d379d294b64ff647578ca2e9ff490f2d2ac6db1938228cd03677a4f127bcc318821108b2a610df9a96ca5e41a99a6f03a9bf63912a7c297c3e9ab03a157471a +Size (firefox-l10n-45.0.1/lt.xpi) = 451529 bytes +SHA1 (firefox-l10n-45.0.1/lv.xpi) = 3a0be26bd86ffb6a47e0a775b1a6c24a2b792a72 +RMD160 (firefox-l10n-45.0.1/lv.xpi) = 2f785864f9d624273d70f42d8ce69b99b6ecca20 +SHA512 (firefox-l10n-45.0.1/lv.xpi) = a1de20f0c8805768f2c2d445b205d7eefc14a658e50af8fd541178b46e1d6116e0432997469fc9decc239de42fdf696ea0356ac5c3b9bdaa127f0c9099439f88 +Size (firefox-l10n-45.0.1/lv.xpi) = 442659 bytes +SHA1 (firefox-l10n-45.0.1/mai.xpi) = a1cfbe8ce7ecec7989b6d4f52e2f5f53badedfe8 +RMD160 (firefox-l10n-45.0.1/mai.xpi) = 96602888fe5bf49e76eef9fc6657961b26a575a0 +SHA512 (firefox-l10n-45.0.1/mai.xpi) = d00a87db009aeaa515c5e5696139b73e9f99ca9603914f58759975b5da5ace45778cadae93e041bbd6d633bd2e3e40837ad6dc9e145e3d75b87a9d905cf8f03d +Size (firefox-l10n-45.0.1/mai.xpi) = 487582 bytes +SHA1 (firefox-l10n-45.0.1/mk.xpi) = 2ee9100eadcf45cc27889eb9a91ddddb2221992f +RMD160 (firefox-l10n-45.0.1/mk.xpi) = 436b3cb31d947ace1fecd2ddd6d180181d908009 +SHA512 (firefox-l10n-45.0.1/mk.xpi) = 6a88aa2fa20f26737be0f65bc5000a64cc0cd2b0b5d737b2177ea076aeca5386f7e50332191de8d339e6791ad3494a990867eff55444cfd0f9e5c5d408780897 +Size (firefox-l10n-45.0.1/mk.xpi) = 473208 bytes +SHA1 (firefox-l10n-45.0.1/ml.xpi) = 68423d511491125614a0d39e83724cf493ac2d37 +RMD160 (firefox-l10n-45.0.1/ml.xpi) = 9128980bbef5693797997fb0444dd00260dc6333 +SHA512 (firefox-l10n-45.0.1/ml.xpi) = 0ffc9ff8ec621427af6b301fc583fde38cb6bc9d51a5a34dd628c595e0628746a3f7d9ccd9d98aa98cc3afac83267bbe57ada26d04067a9b50fedda6c71430e3 +Size (firefox-l10n-45.0.1/ml.xpi) = 495274 bytes +SHA1 (firefox-l10n-45.0.1/mr.xpi) = 87a360a9a2bbbf2a9d1b3121702e2fe78fb85aa7 +RMD160 (firefox-l10n-45.0.1/mr.xpi) = e0c4820a126ae6f2a868a5d112d4d92a0df70209 +SHA512 (firefox-l10n-45.0.1/mr.xpi) = 493e71c8f16e576896e902b8dff05d2ca6ec1ad28fdb0aca42f202935349220a376e32a2870527e3b31ff000c6cfeecde79b77ce30111516fded8de0c41df6ca +Size (firefox-l10n-45.0.1/mr.xpi) = 498643 bytes +SHA1 (firefox-l10n-45.0.1/ms.xpi) = 619d3a8ef1428c6f817045255bc57cd9a1705004 +RMD160 (firefox-l10n-45.0.1/ms.xpi) = 099b392efedf24305e96c52b286cd8634972e7a8 +SHA512 (firefox-l10n-45.0.1/ms.xpi) = 038890b181687b169828212f22b575d2fba92bf43d634ece4b01e6b2c852342ec2e0673ede5b9f1603c40b1318e6c911846b84cb2841068733f4ae4abb575da8 +Size (firefox-l10n-45.0.1/ms.xpi) = 436880 bytes +SHA1 (firefox-l10n-45.0.1/nb-NO.xpi) = 8c7ebdeebc57156fee1c23ea99d0410ae855aace +RMD160 (firefox-l10n-45.0.1/nb-NO.xpi) = f3589669d30dc04d33a4265b4eb53e8dee325748 +SHA512 (firefox-l10n-45.0.1/nb-NO.xpi) = 727bd569b24b23a03b1f93b7a9b829d017a15749cc544825885eb977d1a01f13364b4d65e95b2347ddc0ce3027967e3742c16ed153a6f8ae647b9b887d550b32 +Size (firefox-l10n-45.0.1/nb-NO.xpi) = 432169 bytes +SHA1 (firefox-l10n-45.0.1/nl.xpi) = 6cab5ab8756d1fe60ee55408b62bc3150835232d +RMD160 (firefox-l10n-45.0.1/nl.xpi) = 2841b4064bd35b39f718e2d1127fb2b22d1dce7a +SHA512 (firefox-l10n-45.0.1/nl.xpi) = 878b9bf022544cda2a960e4848875611305b1ee28418d3347d3987c5363ff07b2db60864689eab3923873eff776f4534ab51aa4a7d8776557ec310bf0f2ffdae +Size (firefox-l10n-45.0.1/nl.xpi) = 429705 bytes +SHA1 (firefox-l10n-45.0.1/nn-NO.xpi) = 19419595ff3457bc3e7ba21e529d4069f326fd0c +RMD160 (firefox-l10n-45.0.1/nn-NO.xpi) = b02e217c151eb7c0d4e8d9e77990d0b224563eb0 +SHA512 (firefox-l10n-45.0.1/nn-NO.xpi) = feec7f50cca42a75b15acf25de88ad531bc445c76a9a7b2bf02f7c21899cc7da3c12a5f15e173c14aafa7ad439322dc721f29c7b1610419906fe8f0b3e8b3a61 +Size (firefox-l10n-45.0.1/nn-NO.xpi) = 427852 bytes +SHA1 (firefox-l10n-45.0.1/or.xpi) = f2b7579bc5dd020b2a52b565b5f4505145efaa4e +RMD160 (firefox-l10n-45.0.1/or.xpi) = c67a06ed9256ae380b1b6086ac4951d70b9ab93b +SHA512 (firefox-l10n-45.0.1/or.xpi) = 286f620a50b40b25da3809159d1c5822c03e4c9869b3095b48789871fa6b70814ed2ce3c2380da8dbb385adf2559538a0135d858541abf4289dc45c3a986c42c +Size (firefox-l10n-45.0.1/or.xpi) = 492741 bytes +SHA1 (firefox-l10n-45.0.1/pa-IN.xpi) = dec5ee1a551120f94fbfc428b80dbf72ee22016e +RMD160 (firefox-l10n-45.0.1/pa-IN.xpi) = fa4bb9a2abe580cbc5a894982815ef3c71edf8d1 +SHA512 (firefox-l10n-45.0.1/pa-IN.xpi) = a100709d906846b72a3b3b11295d6567d419b1c4f1a62ec25f0edb7d708335a78bb72e676ff0743fcd577a3e0e3a3d40ab30f229e9ef3a7d503108b4614c8655 +Size (firefox-l10n-45.0.1/pa-IN.xpi) = 485889 bytes +SHA1 (firefox-l10n-45.0.1/pl.xpi) = a3797f953d92f6b8317b056f2b7c38ac95232d4e +RMD160 (firefox-l10n-45.0.1/pl.xpi) = 424fed25b05857aca96d1a3719ede187e37c0745 +SHA512 (firefox-l10n-45.0.1/pl.xpi) = f1a6aaf4a2827cc523738d2330e213359b681a8da7411fa5d4091880508a18a84085535d72849595b923903fea0d8da8aa1bd9470d8eb0fa9456ba5b402b7b2b +Size (firefox-l10n-45.0.1/pl.xpi) = 379558 bytes +SHA1 (firefox-l10n-45.0.1/pt-BR.xpi) = a43f8e4b2072b0c388a5490b0d009ce985fee91b +RMD160 (firefox-l10n-45.0.1/pt-BR.xpi) = 2a33b0ec5bc6e3816116f3013ede5b6640a7c61f +SHA512 (firefox-l10n-45.0.1/pt-BR.xpi) = 0b1ee8fc9f7a61b8695414a548599d761ff3f1474f3e3543947685ae0d06d953faf2d8278aa2829cb89330d09c10d456f65e7d0c3d03d260f71d8375439c9ee3 +Size (firefox-l10n-45.0.1/pt-BR.xpi) = 445519 bytes +SHA1 (firefox-l10n-45.0.1/pt-PT.xpi) = f420b905d1d0350bce335cb4367ff0319caf6ea4 +RMD160 (firefox-l10n-45.0.1/pt-PT.xpi) = 33f05e82152e3c70defc4e36758068ba1751b95d +SHA512 (firefox-l10n-45.0.1/pt-PT.xpi) = 6973a9390e43ba134e02e85f5751020e0cda4f498b78aad670c6d05484eb868a836fae30822ff819b3db338c85f34d3674598f269a2d30b1afe779d5494393b8 +Size (firefox-l10n-45.0.1/pt-PT.xpi) = 431499 bytes +SHA1 (firefox-l10n-45.0.1/rm.xpi) = 48179023fa2b8ad88a59f52e18d640c2815274d2 +RMD160 (firefox-l10n-45.0.1/rm.xpi) = a22b1650865607129b95089f7685bc67a4265fa0 +SHA512 (firefox-l10n-45.0.1/rm.xpi) = 06fd843c1a37bfb25392119ecd71e5509a079824e70e7c737aad3dca219b6a0ecc3b8b545833cb910f19ab24ad3ad03dd88953515657d55ad14485e9c1dd0729 +Size (firefox-l10n-45.0.1/rm.xpi) = 432733 bytes +SHA1 (firefox-l10n-45.0.1/ro.xpi) = b3544bff4cc625056a3ace67b3656b1238c0f3a5 +RMD160 (firefox-l10n-45.0.1/ro.xpi) = 92c93fcd532f652404cfcc8714b4e73a062ebf25 +SHA512 (firefox-l10n-45.0.1/ro.xpi) = ed387149b5ed3ed91652060e8de59fc6253fb3e5aa0a1ccdb6e127f04f130741bde7726b13061b5a1b6c9a669c92b661759a267978f0c82c9c42ab9d6038d4a8 +Size (firefox-l10n-45.0.1/ro.xpi) = 440798 bytes +SHA1 (firefox-l10n-45.0.1/ru.xpi) = a7793101cce5c771abf0e41d0b85d2f75f0b427d +RMD160 (firefox-l10n-45.0.1/ru.xpi) = 4a8db9886f7485bd0bf58ee0bca86146ae5ed410 +SHA512 (firefox-l10n-45.0.1/ru.xpi) = 48897450eecfb421f69895e34a383fba592afffd7028eec6d0edba56c1935f735ab5f647aab7e88042d316880f3f1e85abb1c17fbfa5212417c8bcaa55617a0c +Size (firefox-l10n-45.0.1/ru.xpi) = 386410 bytes +SHA1 (firefox-l10n-45.0.1/si.xpi) = 96d92622e0bf8f411afbf62af7283cd7c7753b6a +RMD160 (firefox-l10n-45.0.1/si.xpi) = a3f443cc280fb531c06bc2d4151f3cb6dcd471a8 +SHA512 (firefox-l10n-45.0.1/si.xpi) = 9912150a06cca402f1c5ebbe98328e71b8d60fdbe44996ba34f91b0cfe99998335e707093e5092fbd2c9a3001aecb08b568701627832f91e39a82b8a775d45a4 +Size (firefox-l10n-45.0.1/si.xpi) = 479305 bytes +SHA1 (firefox-l10n-45.0.1/sk.xpi) = 9102c9dec6937c5cfa0829a1c5d8300917c83dbb +RMD160 (firefox-l10n-45.0.1/sk.xpi) = 75d94b5ca537d162c38c52e04c9a56ea7d1684a2 +SHA512 (firefox-l10n-45.0.1/sk.xpi) = b9ddcfedb509583eed8f5c6a5a8fd87058f9ca6eba2473ab76934559b4dec7eaf9baa74d68d921d02d784296cf4b9fb1f303597e0edecf7baf1ce5544bdf6c51 +Size (firefox-l10n-45.0.1/sk.xpi) = 447859 bytes +SHA1 (firefox-l10n-45.0.1/sl.xpi) = c5c36c893ac7e8604a5a4dd06c7b2a9a8bc32195 +RMD160 (firefox-l10n-45.0.1/sl.xpi) = faa04e6eedc41ef9a07f756897bbd73bdd924e06 +SHA512 (firefox-l10n-45.0.1/sl.xpi) = b03e1773442fb23a4e0383aa904cac4d686df1c9adca02edcc7435343032110d34bdda7ba9f6f5388f795b2cb0fa1ffffa720e932460f3f9752c7a06778066f8 +Size (firefox-l10n-45.0.1/sl.xpi) = 439485 bytes +SHA1 (firefox-l10n-45.0.1/son.xpi) = f48ac87041b721baaa43aacda25316478516309e +RMD160 (firefox-l10n-45.0.1/son.xpi) = 05d64defb6f86bf4114f803c1ac52055b901515c +SHA512 (firefox-l10n-45.0.1/son.xpi) = 9250ffb8a21aeb2166f7a08853d1001f29db7080ba1fae303dc34432dfe31ac6acb8cdee8fcba60e384a4aecd920f277189704fd90c61db93eb2e8af7983119a +Size (firefox-l10n-45.0.1/son.xpi) = 430488 bytes +SHA1 (firefox-l10n-45.0.1/sq.xpi) = 065d7f8c2478b675d322bf7d5e92bc07311245e7 +RMD160 (firefox-l10n-45.0.1/sq.xpi) = 364ca850a709832f5539a8cf58008f6b4815a6c8 +SHA512 (firefox-l10n-45.0.1/sq.xpi) = e93a3e1119c9f0b0b4d02aa718e0eb99da99433591b3480931229d33638d73fd0b6c08ecc129eae84c7ab80e07ec1c3f71a8f0ff3440c83320e87ea7a469eb11 +Size (firefox-l10n-45.0.1/sq.xpi) = 446482 bytes +SHA1 (firefox-l10n-45.0.1/sr.xpi) = a8d981283985d657acce1baef9d56c43212c0387 +RMD160 (firefox-l10n-45.0.1/sr.xpi) = 95a5ed37b70e09ad66b2775b4683d166d522bef7 +SHA512 (firefox-l10n-45.0.1/sr.xpi) = 7d12b20630e5e923b8339568454c0eb40789dfb9964428dccd3a0c9d23b1699dae1ba03ccfe7feb681ab97146df9e006fdda3bff293f51993b38edb588d78866 +Size (firefox-l10n-45.0.1/sr.xpi) = 459051 bytes +SHA1 (firefox-l10n-45.0.1/sv-SE.xpi) = 784d7d84f9ec0d0b0535dde62988f8c9a34fa9aa +RMD160 (firefox-l10n-45.0.1/sv-SE.xpi) = a8747e08709f5eb93105740fdb3b2e2e942b2f87 +SHA512 (firefox-l10n-45.0.1/sv-SE.xpi) = 4c9b317854948437ec64973d1a6d029651e1694cadf5bff1cea7326ef18b1189607030cbe2ce5701dc0ec96e86eae892917b6f636fbe20715a9e3d8da4bc17dd +Size (firefox-l10n-45.0.1/sv-SE.xpi) = 438724 bytes +SHA1 (firefox-l10n-45.0.1/ta.xpi) = b82807444daac5d6778538b61958848ee467a906 +RMD160 (firefox-l10n-45.0.1/ta.xpi) = 670574bf5dd67817197adece1f3f0d14afa8f9ea +SHA512 (firefox-l10n-45.0.1/ta.xpi) = 575e9ae967592a8b1e6394b46d94105bad074fde55f2d2f61cb294a8de8c231092ee5bf3cb1d0041aea956d205a00f9ade1b163246a5f3c8feb6da02b03c0fe5 +Size (firefox-l10n-45.0.1/ta.xpi) = 479528 bytes +SHA1 (firefox-l10n-45.0.1/te.xpi) = cbc85aeef1bbac967043dc986e729a8c703e9679 +RMD160 (firefox-l10n-45.0.1/te.xpi) = 3bad48c3a071119ce6b8d27964eaa3a8ac151b0c +SHA512 (firefox-l10n-45.0.1/te.xpi) = ed3ec736f59113d782f0f18362eb165369e14e2f84ec0a54e06fb78ea1be807c09621b3ed4644961397992e4f6aef5101309611a4fa2422201b556c887c49a06 +Size (firefox-l10n-45.0.1/te.xpi) = 489283 bytes +SHA1 (firefox-l10n-45.0.1/th.xpi) = 61dfc3ef348b4fabcf79febc8795edaf6a185cf3 +RMD160 (firefox-l10n-45.0.1/th.xpi) = b2de0ddb141663e27a984e3263638a50462b55a1 +SHA512 (firefox-l10n-45.0.1/th.xpi) = db9f11dd0597bdf760f7ba0373d2c544d794e714d7f9e3b27a3338108639ad5c1facc05ed13cfd9eb51c804580d6ce93f70e5724bdc172471fb21734fa1a1012 +Size (firefox-l10n-45.0.1/th.xpi) = 474141 bytes +SHA1 (firefox-l10n-45.0.1/tr.xpi) = 607722664ca25301818b8518b3854b2d3bf53d44 +RMD160 (firefox-l10n-45.0.1/tr.xpi) = 7975c5714861b1a2ff0f75edfb3d0ff6c4547c6b +SHA512 (firefox-l10n-45.0.1/tr.xpi) = c02ebce6c8a6b0f86d5613f5512e330fc186ac67368b36153de7cf8b5ca4a100f634cac84fdeeb9977660f87bcc109790926c41adcca1f6258ae25f979667699 +Size (firefox-l10n-45.0.1/tr.xpi) = 445669 bytes +SHA1 (firefox-l10n-45.0.1/uk.xpi) = c8db0c921d6ef0a86984d82ac818bf8c067e2f35 +RMD160 (firefox-l10n-45.0.1/uk.xpi) = 58872c946321341d8e0e82b4ca863a1379309686 +SHA512 (firefox-l10n-45.0.1/uk.xpi) = 259a4bdc4908add30daec35af6fff1ffa5cddc3f614539989d4ec6d046c5507b72ee97866b2c0dc2be66e0d8fe569cf90cd141c58b8c321bbacdb78502d06d5e +Size (firefox-l10n-45.0.1/uk.xpi) = 488434 bytes +SHA1 (firefox-l10n-45.0.1/uz.xpi) = 9d9a5bad2774ce1043fe0ac7e53f70b2302d8661 +RMD160 (firefox-l10n-45.0.1/uz.xpi) = 9e89bb86963d77e8d079b89005b7672148246103 +SHA512 (firefox-l10n-45.0.1/uz.xpi) = 7a4636f6feb78478ffc7e7eda8263bfb7680c893fb1412a096ebc43ff8dc27c3b08b081fbe89d1fe30d7e92aed127bda10a7c90f53bc1af8698cb3cb646ce0a6 +Size (firefox-l10n-45.0.1/uz.xpi) = 438746 bytes +SHA1 (firefox-l10n-45.0.1/vi.xpi) = 6423bd556fdcd1f8d9b642b46f508688fbfb3e43 +RMD160 (firefox-l10n-45.0.1/vi.xpi) = 904fe3572f69109ece9c184d870b6e8727c0a58e +SHA512 (firefox-l10n-45.0.1/vi.xpi) = 87f53ff22b62531babb7dcb9ef477df7a0ee09a20c2c9ba921bc79d7720d1bbbe1eea448df91647421a3f922e7d4626cd584c277f43c7a5c7eea82271a2766d7 +Size (firefox-l10n-45.0.1/vi.xpi) = 447594 bytes +SHA1 (firefox-l10n-45.0.1/xh.xpi) = a9860c701a78c3fcfae380bd7c54469e75d78359 +RMD160 (firefox-l10n-45.0.1/xh.xpi) = 3736eb2d5c245c2806890c6066230a2fa6ec1268 +SHA512 (firefox-l10n-45.0.1/xh.xpi) = 200cab62de3124d75aebc1ba59e840ec8b7a1d16007a005ba2812bac6c4bedf83c835c40e839e8093c1d67c8cdb2d4d6eddac98a7337aa16070d5ac36c5dab4e +Size (firefox-l10n-45.0.1/xh.xpi) = 429734 bytes +SHA1 (firefox-l10n-45.0.1/zh-CN.xpi) = b64ad3887d7edafd6acbac4a2d4e72a38bfca2d8 +RMD160 (firefox-l10n-45.0.1/zh-CN.xpi) = a5ca79dd77000f1a533002790ba14010e4f9ef3b +SHA512 (firefox-l10n-45.0.1/zh-CN.xpi) = 21ad24eb635321ddf979217181c6f8c42b673ffc266e35d22078508ac7d6857986955299070b01ffb9a45938d3bf19905ce24c7ca4fc759b040491a8a4c2d4a8 +Size (firefox-l10n-45.0.1/zh-CN.xpi) = 469931 bytes +SHA1 (firefox-l10n-45.0.1/zh-TW.xpi) = e2c906d60bfb0c870a1f4c8844fd7b16655fbc0c +RMD160 (firefox-l10n-45.0.1/zh-TW.xpi) = 3e23072729bb752924f085f2c479a4be15d46f11 +SHA512 (firefox-l10n-45.0.1/zh-TW.xpi) = 7ee83363c5f5b0317d50ba1ba90ad910a8e01a2d83ea3da0ba1a533bca413e32f4220dbc2ccdc2cdbb75dbcf7b23fa5c32a6fa5f9bec9416b6d06f188a5f061e +Size (firefox-l10n-45.0.1/zh-TW.xpi) = 460795 bytes From 0de0b2c4b09b50757ac35f0a0eaff9151c670e42 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:00:02 +0000 Subject: [PATCH 0302/2457] Updated www/firefox-l10n to 45.0.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 2ee42f7c90626..901e8fc1c0dfd 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1252 2016/03/19 22:58:30 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1253 2016/03/19 23:00:02 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1650,3 +1650,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/stgit to 0.17.1 [sevan 2016-03-18] Updated net/rancid to 3.4.1 [pettai 2016-03-19] Updated www/firefox to 45.0.1 [ryoon 2016-03-19] + Updated www/firefox-l10n to 45.0.1 [ryoon 2016-03-19] From f1e61df7b5390c433e5e84e6f0ddb9140b33f0aa Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:01:35 +0000 Subject: [PATCH 0303/2457] Update to 38.7.1 Changelog: Fixed Loading from history can show the wrong url in the location bar (Bug 1256194) Changed Disabled Graphite font shaping library --- www/firefox38/Makefile | 4 ++-- www/firefox38/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/firefox38/Makefile b/www/firefox38/Makefile index 532276b11ec4f..252161b3e1949 100644 --- a/www/firefox38/Makefile +++ b/www/firefox38/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2016/03/12 03:47:20 ryoon Exp $ +# $NetBSD: Makefile,v 1.17 2016/03/19 23:01:35 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 38.7 -MOZ_BRANCH_MINOR= .0esr +MOZ_BRANCH_MINOR= .1esr DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox38-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} diff --git a/www/firefox38/distinfo b/www/firefox38/distinfo index e0227f09d1b65..311b815811cd7 100644 --- a/www/firefox38/distinfo +++ b/www/firefox38/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.15 2016/03/12 03:47:20 ryoon Exp $ +$NetBSD: distinfo,v 1.16 2016/03/19 23:01:35 ryoon Exp $ -SHA1 (firefox-38.7.0esr.source.tar.bz2) = 42dbd9ef7e3b5b4aabd2dee602e982146b457d18 -RMD160 (firefox-38.7.0esr.source.tar.bz2) = b638c2020d6130f013f51ea6fcb272a9b7e37e95 -SHA512 (firefox-38.7.0esr.source.tar.bz2) = edb8cdb06d82a58c3dca216402a4df0afb21bcaf97cbf3ebc3857249b281283f099267284f025fb724f47eff9c3b7569f6ae000003332c47264ca254f73e65ca -Size (firefox-38.7.0esr.source.tar.bz2) = 181313049 bytes +SHA1 (firefox-38.7.1esr.source.tar.bz2) = c3c5cb3ee1db92da2253fdb5ab566a69f8b7f066 +RMD160 (firefox-38.7.1esr.source.tar.bz2) = 9ae1d40bbc92adab8eaf1da065780edff00738b3 +SHA512 (firefox-38.7.1esr.source.tar.bz2) = af569b37fd5b0ec9ae772e98192c1597c88be77090e6542892a0567918507f4e7ce46dac1208620d5ab9c47d76c6ab45ebe18b55bc63f7f085271270289660ad +Size (firefox-38.7.1esr.source.tar.bz2) = 181300248 bytes SHA1 (patch-aa) = e9e8400fa86ae8d6910b49e3a98127122e714f1a SHA1 (patch-accessible_atk_Platform.cpp) = c2deb81b300de44c4500328589185bbd4b6b02fb SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 From ad99ec51c261f55da2894465a21041cbbb830e0a Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:01:56 +0000 Subject: [PATCH 0304/2457] Updated www/firefox38 to 38.7.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 901e8fc1c0dfd..9e7a3734b8afe 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1253 2016/03/19 23:00:02 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1254 2016/03/19 23:01:56 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1651,3 +1651,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/rancid to 3.4.1 [pettai 2016-03-19] Updated www/firefox to 45.0.1 [ryoon 2016-03-19] Updated www/firefox-l10n to 45.0.1 [ryoon 2016-03-19] + Updated www/firefox38 to 38.7.1 [ryoon 2016-03-19] From d99dd1999e78f9ba8ee912555fd42291f5c1836a Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:02:48 +0000 Subject: [PATCH 0305/2457] Update to 38.7.1 * Sync with firefox38-38.7.1 --- www/firefox38-l10n/Makefile | 4 +- www/firefox38-l10n/distinfo | 714 ++++++++++++++++++------------------ 2 files changed, 359 insertions(+), 359 deletions(-) diff --git a/www/firefox38-l10n/Makefile b/www/firefox38-l10n/Makefile index 04e1afab11664..b67cb1272f58e 100644 --- a/www/firefox38-l10n/Makefile +++ b/www/firefox38-l10n/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2016/03/12 03:48:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.10 2016/03/19 23:02:48 ryoon Exp $ # -FIREFOX_VER= 38.7.0esr +FIREFOX_VER= 38.7.1esr PKGNAME= firefox38-l10n-${FIREFOX_VER:S/esr//} DISTNAME= # empty CATEGORIES= www diff --git a/www/firefox38-l10n/distinfo b/www/firefox38-l10n/distinfo index 1cb59fd2cfd29..08f302d0599c6 100644 --- a/www/firefox38-l10n/distinfo +++ b/www/firefox38-l10n/distinfo @@ -1,358 +1,358 @@ -$NetBSD: distinfo,v 1.9 2016/03/12 03:48:41 ryoon Exp $ +$NetBSD: distinfo,v 1.10 2016/03/19 23:02:48 ryoon Exp $ -SHA1 (firefox38-l10n-38.7.0/ach.xpi) = a0118fdc434b66c720721826e6ea46cc23b7f657 -RMD160 (firefox38-l10n-38.7.0/ach.xpi) = aa4c07d3a21db172b2d5da1953255f3f028f439c -SHA512 (firefox38-l10n-38.7.0/ach.xpi) = 780de01b088f78bb5ab379dade96a83b47159d0396896c9a4832ee2cbfce45ed49f5aec18f88b60a295f9b3ef747254864128befea210e27eb7fa5d9e08df1cb -Size (firefox38-l10n-38.7.0/ach.xpi) = 477970 bytes -SHA1 (firefox38-l10n-38.7.0/af.xpi) = 4460757ccf8679218638335196550e595515a408 -RMD160 (firefox38-l10n-38.7.0/af.xpi) = 3710b9a12b0281e2d9cf0d19a4ad0b8c1b9d5250 -SHA512 (firefox38-l10n-38.7.0/af.xpi) = 76070fe6678e2ba7d799b6c37b79e5e580dd0b406d551d46706e046ef82c4f8d151449a955e0b6b01364de3643aa8d24fd824ebcf9c728464df9b53ac6307bc6 -Size (firefox38-l10n-38.7.0/af.xpi) = 483326 bytes -SHA1 (firefox38-l10n-38.7.0/an.xpi) = 085a4e2c21b6cd19710ccf15eabd6d5330b2d540 -RMD160 (firefox38-l10n-38.7.0/an.xpi) = 48b93d1a440a299c4fc886a5c4c14b9311b5ac29 -SHA512 (firefox38-l10n-38.7.0/an.xpi) = 6d7a9bd5e11d8dd889ef60e5ad9ace9460cd08a7f1e59116854b42a9ccd40d80f748426d83b09ee83e83477874838ac2211d6df975751f4a9e81f55860ff8870 -Size (firefox38-l10n-38.7.0/an.xpi) = 461423 bytes -SHA1 (firefox38-l10n-38.7.0/ar.xpi) = b4ef8319164f2a82e5b613f9117c56c2727a1a0e -RMD160 (firefox38-l10n-38.7.0/ar.xpi) = 32ff82388a99cf8f0c054f1964730e3ac493242f -SHA512 (firefox38-l10n-38.7.0/ar.xpi) = db42ddf18d34e03fd907156f49cbcfd3a79fc67508edf5b5a08accdb73ea8c6fe54a96bba40e2a60e45e491a6260e9f9249bf5857a00ca5c58a3e0e3c526d2a6 -Size (firefox38-l10n-38.7.0/ar.xpi) = 516496 bytes -SHA1 (firefox38-l10n-38.7.0/as.xpi) = c6ecafd72caf4629f30d0be8c0a6a19e26981e94 -RMD160 (firefox38-l10n-38.7.0/as.xpi) = 52378d01253744217827af6d6538ece5713de730 -SHA512 (firefox38-l10n-38.7.0/as.xpi) = 387d5dfc09f467d32d087e600715a0a6ad24c16bcb29163fc57883ed22372e75fb00a15d473173740efc8c5148a904d61422e1166157cee6474886f2fa271989 -Size (firefox38-l10n-38.7.0/as.xpi) = 509574 bytes -SHA1 (firefox38-l10n-38.7.0/ast.xpi) = 98d5fef2fc334024716ef0f90e26307c15f90425 -RMD160 (firefox38-l10n-38.7.0/ast.xpi) = 83f8de49ab323a4054eda532ed4bf0bd67e57eaf -SHA512 (firefox38-l10n-38.7.0/ast.xpi) = e45e5bba931331f70d821812f29d16a3df9d08437ae458bf50ccf3cd85b9457b773f59e6ed96b8553b80d94866d613a760f64700fd780fd8bb738f6ae8c01908 -Size (firefox38-l10n-38.7.0/ast.xpi) = 397202 bytes -SHA1 (firefox38-l10n-38.7.0/az.xpi) = 9d9b5af3f44ce4f7e07377bcc31826d3a0cde16d -RMD160 (firefox38-l10n-38.7.0/az.xpi) = 39c918c274bf7d4fe5b05901d0cd208787f5bb78 -SHA512 (firefox38-l10n-38.7.0/az.xpi) = 04973e98334ad91d764584f7108c339b80a76877738193890706cb564774ec1e7876d518f9e8d27c20b979a39a44ac91384fa70a9f3edf77fa94cc466c82296b -Size (firefox38-l10n-38.7.0/az.xpi) = 489153 bytes -SHA1 (firefox38-l10n-38.7.0/be.xpi) = ed8cef2fa4bc7fe61d73fe93a46b8b85826f9474 -RMD160 (firefox38-l10n-38.7.0/be.xpi) = 9539474df57203abbf3f9b6b832cff096bfd2f60 -SHA512 (firefox38-l10n-38.7.0/be.xpi) = 1ee450cd2fde23fe856832803b576ab737c7374235b7aa22e837e34adbe2ad8cb8e6691e0c4f2c0a6c5987fc33795cb661dca1b013a1c16b47ff9722a7a74ab2 -Size (firefox38-l10n-38.7.0/be.xpi) = 441057 bytes -SHA1 (firefox38-l10n-38.7.0/bg.xpi) = 8020b226b4534cab4f950a6565ecade502d7b798 -RMD160 (firefox38-l10n-38.7.0/bg.xpi) = 6f9a6abc01248809151c39b7ad6a3a4f88bc9804 -SHA512 (firefox38-l10n-38.7.0/bg.xpi) = de8576f6c77de3e04189fb5238e636e4682a28577fed259bd010564f9a3cfdea64db1dc4d863a166ea27fe65a8b22de76b109f96e0363d655b0ae9c7aaaeb70b -Size (firefox38-l10n-38.7.0/bg.xpi) = 487819 bytes -SHA1 (firefox38-l10n-38.7.0/bn-BD.xpi) = 7c41b4e6653f747687f8dd8ffca95068b4282639 -RMD160 (firefox38-l10n-38.7.0/bn-BD.xpi) = 8631fd77cf6d4ddd10d1cd48b35531759f358ac8 -SHA512 (firefox38-l10n-38.7.0/bn-BD.xpi) = 201d3fe7191163004a5635f4ccc3db6697753ee4b3184c6cb8f8d17dc7df4bc8cad7be0c75bf865f8dad20031ebe638882c1a6563053bea5bf21e5d9a96c46ee -Size (firefox38-l10n-38.7.0/bn-BD.xpi) = 528690 bytes -SHA1 (firefox38-l10n-38.7.0/bn-IN.xpi) = 28d240c39f8dd84937e6e44c91d279216873367a -RMD160 (firefox38-l10n-38.7.0/bn-IN.xpi) = 3014e12ecfba5efebe665aa311086b03420ab2cc -SHA512 (firefox38-l10n-38.7.0/bn-IN.xpi) = ef460aae0b8822abdf76ecfc1e2f4bfb62e26839413d14bf1ebddeea406cf47f7b3f845786aa421d17f7213d8dccc9493c5a3dd3ec341a1243685fe6a3e7be60 -Size (firefox38-l10n-38.7.0/bn-IN.xpi) = 527928 bytes -SHA1 (firefox38-l10n-38.7.0/br.xpi) = 945d7c2cc95c9783f2bd5a82cdfa88595fa8748b -RMD160 (firefox38-l10n-38.7.0/br.xpi) = 89326faada35d7bd3522c54216f17e51bc82c1f3 -SHA512 (firefox38-l10n-38.7.0/br.xpi) = 180fb73fa43efdbdca737b87b29994bf8819aa99dc8ef1cf80dcd5e4e88d157a1855e8f30dd85b63d9d7aee2f37b4b1fe0ede45ccaed46c56920ef9cce9ffdbe -Size (firefox38-l10n-38.7.0/br.xpi) = 441962 bytes -SHA1 (firefox38-l10n-38.7.0/bs.xpi) = 1512f36a54fb3cecd1f0cea1123107055b33f363 -RMD160 (firefox38-l10n-38.7.0/bs.xpi) = b520b5b6203bd25c49ef613c0f20a44e4a7d9cc5 -SHA512 (firefox38-l10n-38.7.0/bs.xpi) = e05dead3c81c4a6a61b7b990003f0ec25b84e6d2d33a3a65a6ec44a887e77edeace31a3b96d78ecb82d22419e2ce8f9e99dc42da0f587e448dc226be9875f4b1 -Size (firefox38-l10n-38.7.0/bs.xpi) = 485305 bytes -SHA1 (firefox38-l10n-38.7.0/ca.xpi) = d7e33d0af7e21166ec54dc01d0e965180a285fd7 -RMD160 (firefox38-l10n-38.7.0/ca.xpi) = 3c3ee77a0c6d42e2af48330d24b658362a04149d -SHA512 (firefox38-l10n-38.7.0/ca.xpi) = fcb4ad4e78a8cb88e5e2568405b87d17550d093802710e653104d219b8362d682e62f264d1f2af7e500fac9e9e80a3147166ae7c68cf57521fc39b66fe6b92d0 -Size (firefox38-l10n-38.7.0/ca.xpi) = 458092 bytes -SHA1 (firefox38-l10n-38.7.0/cs.xpi) = 9aebb3c569c8e9604ac482d7a481d7ecd318f975 -RMD160 (firefox38-l10n-38.7.0/cs.xpi) = bd6be903757f4a26b9b6f07a02c0303097bccc73 -SHA512 (firefox38-l10n-38.7.0/cs.xpi) = 15da84145e381a26c7cd4b3a35d0f509e33f7ac9349e8e5daa25d3f1c4118747311b3c6f5b9c58b2ced2c58881b353c389db6439ccf1216fef8721a6865c92b6 -Size (firefox38-l10n-38.7.0/cs.xpi) = 446727 bytes -SHA1 (firefox38-l10n-38.7.0/cy.xpi) = 863619c4c48957445312e2039c176342f6c2e3a3 -RMD160 (firefox38-l10n-38.7.0/cy.xpi) = 92119c04d771af3bc9debc8987551f132a7f04d3 -SHA512 (firefox38-l10n-38.7.0/cy.xpi) = 114b78679a25a5f3a3e0faf07ee401d38f3b72a46b365fd4b8bf1f0f28d237d980a9312f07a944004543d972170bf4ce96990d4a8b784e39f80d9432bbc8c6c5 -Size (firefox38-l10n-38.7.0/cy.xpi) = 444385 bytes -SHA1 (firefox38-l10n-38.7.0/da.xpi) = 5cdf3ef75885514f349f4fa675170648173dd76b -RMD160 (firefox38-l10n-38.7.0/da.xpi) = 30d5ea21961e071a1996b9cfa1cdec9f4663e600 -SHA512 (firefox38-l10n-38.7.0/da.xpi) = 38d94eb78ed619bdba3181e3d9c94dae1a980cb3bb3a1ae49c76152f1b003d11df703de374cb26d87f6de59df32674ec5b6b6d2a6fff09967d7f94748fd82530 -Size (firefox38-l10n-38.7.0/da.xpi) = 450763 bytes -SHA1 (firefox38-l10n-38.7.0/de.xpi) = b55d43427eb13c9bc0d7c5af97fcf7ca8bca5316 -RMD160 (firefox38-l10n-38.7.0/de.xpi) = 342b7a2b31a426bbd2b3133e8a5c86d6df225fe6 -SHA512 (firefox38-l10n-38.7.0/de.xpi) = 1cf9d023171301b878aad3fbdf8e5b18a0542eb469415790c0bff0c408856e80c414bf7d0aa72525baeec8ec242a8bd9f36309d4afea544e75ac07f03078402a -Size (firefox38-l10n-38.7.0/de.xpi) = 451629 bytes -SHA1 (firefox38-l10n-38.7.0/dsb.xpi) = d776be8c3003619dd2243de13e93fdaaca2ca1a6 -RMD160 (firefox38-l10n-38.7.0/dsb.xpi) = d5069fe0c117a0ca4095a476292abcea150a7b8f -SHA512 (firefox38-l10n-38.7.0/dsb.xpi) = 38e9bfd6d61a850d370da243feeec5b974d11f33d08d631cc83c913693f0da364c1eed204876e578d21db2d624f71c5da2551570b64187c4433b993007cf0c9b -Size (firefox38-l10n-38.7.0/dsb.xpi) = 470924 bytes -SHA1 (firefox38-l10n-38.7.0/el.xpi) = 399787b4c4103e20e8d64dd5ced2815e6838e10f -RMD160 (firefox38-l10n-38.7.0/el.xpi) = 16b738b81210464e248fe459033168d81ae238a7 -SHA512 (firefox38-l10n-38.7.0/el.xpi) = fa6c2d6788d8814d2817e574bd65240b28207d69cd3670abe3aef006298b9d1cd3a4001fa0f87e2036c819879e0a8a950f204b67eec287abd5df11a5eadcaa0d -Size (firefox38-l10n-38.7.0/el.xpi) = 498370 bytes -SHA1 (firefox38-l10n-38.7.0/en-GB.xpi) = 45966cc4472b14d6533b9aca2c61f0fe379ec90b -RMD160 (firefox38-l10n-38.7.0/en-GB.xpi) = 000a7ced7c727bf508e2444ea4042ca53ed5e1c0 -SHA512 (firefox38-l10n-38.7.0/en-GB.xpi) = 76a836c9995a20f7432b2ec5838cfbf66d0afc80c4b620796c181c20813859c0e71b5ff4197a419823efccbeb536e73915da00ba016428128016a5d11aa882fe -Size (firefox38-l10n-38.7.0/en-GB.xpi) = 437846 bytes -SHA1 (firefox38-l10n-38.7.0/en-US.xpi) = a804adf904e1a6a4510b3a12da0bbf579de3d10d -RMD160 (firefox38-l10n-38.7.0/en-US.xpi) = 9b7edc4ca7919194b0a67b1954efb89d8726ec5f -SHA512 (firefox38-l10n-38.7.0/en-US.xpi) = b765ada5d00e516039ee4afe7016e5e070e68279ccbdb2096ed3abbe9e332d85a8df1e74407118b5bc0762bdb9eeb7b22e85075ce531489c736f37c866d9282f -Size (firefox38-l10n-38.7.0/en-US.xpi) = 469718 bytes -SHA1 (firefox38-l10n-38.7.0/en-ZA.xpi) = f21453bd3a01332a159cb8a055704f0585f4605c -RMD160 (firefox38-l10n-38.7.0/en-ZA.xpi) = 84dbaf06ce867744ab41db63eabba5334a33ca80 -SHA512 (firefox38-l10n-38.7.0/en-ZA.xpi) = 7e1fa4ac4874fb26158e6a8aea7c3af6018445b4b25b4ca7dca01539a77fc628e31a63741e7bc01d9b2ef680e8c05d9dd751c47607192fc8cbca804d858cdbb0 -Size (firefox38-l10n-38.7.0/en-ZA.xpi) = 439925 bytes -SHA1 (firefox38-l10n-38.7.0/eo.xpi) = 65f174faddb39bb80d7215d9ce5418e9d3e9e7bf -RMD160 (firefox38-l10n-38.7.0/eo.xpi) = 8a205e68fbe555b8b8b5c5d20bb6ae3b09e76643 -SHA512 (firefox38-l10n-38.7.0/eo.xpi) = d916544a9b4042febd63a5c0e815487110321b4f6c8d7fa6ee6801260cadaef3fc111b469d0e5973610ce716c1669d11965e1ed9b0b6502604bad578561d062c -Size (firefox38-l10n-38.7.0/eo.xpi) = 488370 bytes -SHA1 (firefox38-l10n-38.7.0/es-AR.xpi) = 869303122c7bdafe5451be14843f36627efa2e41 -RMD160 (firefox38-l10n-38.7.0/es-AR.xpi) = 67a918e42ea327e1e01b40f372645a90e9b751d7 -SHA512 (firefox38-l10n-38.7.0/es-AR.xpi) = 9a5ef5d5e07da30042be461d4edb5cb6f27ad9972f0319789b1259ddd67c630f0b9b988d8064617fda00ca78cd2058d4aa8f7868ec37002e4feccf60a1837218 -Size (firefox38-l10n-38.7.0/es-AR.xpi) = 453983 bytes -SHA1 (firefox38-l10n-38.7.0/es-CL.xpi) = b774f962572d2d9d6e4109e99e0e14090b0d6436 -RMD160 (firefox38-l10n-38.7.0/es-CL.xpi) = 9d9cb1b574bb3daff04d211faaf8434ff471a1ee -SHA512 (firefox38-l10n-38.7.0/es-CL.xpi) = b6c5481766d7cc5fb09a41e14b0fdda1da245b21cceb9088bb37633e4f8cf6f5516466f3bc7669d44a604e100d9c0b8edda7d0e80e7cfd7be653705b4a1b1221 -Size (firefox38-l10n-38.7.0/es-CL.xpi) = 384679 bytes -SHA1 (firefox38-l10n-38.7.0/es-ES.xpi) = 885bf024f772eae0c15c1431e236ba2cbf0f4250 -RMD160 (firefox38-l10n-38.7.0/es-ES.xpi) = 5d4ebdc736037117c68e267a70986633dbf13c38 -SHA512 (firefox38-l10n-38.7.0/es-ES.xpi) = bc9add9831b426daa926acee33143fa412bd8128949373efd15a2a7f392f9b3302fd3b3552efef8f4af1e968d33efa4b35559a27178b72c040376f361385b4b3 -Size (firefox38-l10n-38.7.0/es-ES.xpi) = 374073 bytes -SHA1 (firefox38-l10n-38.7.0/es-MX.xpi) = 66aafe27a253b527b92c33bcb8fc4fbbc0abcf67 -RMD160 (firefox38-l10n-38.7.0/es-MX.xpi) = 6f4ae84947ab81d21b3259051052ec25b66c4b3e -SHA512 (firefox38-l10n-38.7.0/es-MX.xpi) = 7e92ab29ea8a26c4b754a404be21444fb75ccd70ccafa68f386082fb48c7208dc4d30cd585df288076023e97c4699105b43d5cf2a4f8b83a804010108aace0dc -Size (firefox38-l10n-38.7.0/es-MX.xpi) = 457049 bytes -SHA1 (firefox38-l10n-38.7.0/et.xpi) = 1ec6e6f9f5a56054013cd2780839348fad1e3762 -RMD160 (firefox38-l10n-38.7.0/et.xpi) = 966a481231d7fade9959a060ee73961cae846d5c -SHA512 (firefox38-l10n-38.7.0/et.xpi) = 168297a3cd8eb79b1419be4f5bd9e0832a6a6f71c46055179387fcbef1c6236cf9ada4ac451e16e936d644170813d8aed17528c88b7c75ad2377cd6f9ee5e9b3 -Size (firefox38-l10n-38.7.0/et.xpi) = 443228 bytes -SHA1 (firefox38-l10n-38.7.0/eu.xpi) = b3f20fac98a24662235cdd9ef31912f14db56090 -RMD160 (firefox38-l10n-38.7.0/eu.xpi) = 1eb5824dd88fff7ffe3512da7d4d1c2a2d049679 -SHA512 (firefox38-l10n-38.7.0/eu.xpi) = a41c26baf5925054e01a37ac2e44adb199f3fba78f5eae7474b5e8ea7964ab07331d4dae0cc4f0c946189e34328bcfe2d0a48c814e771a0380ae3e66a1596902 -Size (firefox38-l10n-38.7.0/eu.xpi) = 466555 bytes -SHA1 (firefox38-l10n-38.7.0/fa.xpi) = 65c5016c6efe1370f7db2486ec39f38dd98dea88 -RMD160 (firefox38-l10n-38.7.0/fa.xpi) = 49c00178f14b21f6c729c11b7114c605835c2abf -SHA512 (firefox38-l10n-38.7.0/fa.xpi) = 8f33d5696507b9e7d6f98f177251238b1f33f416e3436d2e4db014b6997531fa10726d7b97f5e22aa9a450bb76b8f0377c4232c5b1111cf42a14875ca6772727 -Size (firefox38-l10n-38.7.0/fa.xpi) = 518282 bytes -SHA1 (firefox38-l10n-38.7.0/ff.xpi) = a4bb4faf6052f2d3e75f4e695ffe0baf29a70cca -RMD160 (firefox38-l10n-38.7.0/ff.xpi) = b7ff92e828a7bef679f74182a597e9ea7fc73377 -SHA512 (firefox38-l10n-38.7.0/ff.xpi) = 564a55604a0c53adbf7cf7cebbf5b1a53fb01e34745df34b4de66b6b8c4ccccd2c1b256c633cc050e5ec52a897dc87272f3b8a26b1429081c8a1dafdf6e94969 -Size (firefox38-l10n-38.7.0/ff.xpi) = 454587 bytes -SHA1 (firefox38-l10n-38.7.0/fi.xpi) = 2e46cf9f31c80693b923e8687d39fc1d2dded1b9 -RMD160 (firefox38-l10n-38.7.0/fi.xpi) = 5221eb702430f0cf1a742531963a6fbcc8d48b48 -SHA512 (firefox38-l10n-38.7.0/fi.xpi) = 8d52ce8cbbdfe68cc7722ef266074fffbff9e04a00b620b507efc4b32580c6b664b91021caef9c5b1129e287c8a4a055a0b3737f3c56626dca7e229a73361943 -Size (firefox38-l10n-38.7.0/fi.xpi) = 444852 bytes -SHA1 (firefox38-l10n-38.7.0/fr.xpi) = 19250c0f570597de6e8c05d3743fe1af39b2d7cd -RMD160 (firefox38-l10n-38.7.0/fr.xpi) = 4bae5996c641939fcb5cf36d86de590bad0e54aa -SHA512 (firefox38-l10n-38.7.0/fr.xpi) = 8e65ac9b1d26449366228d5a406f7393beab42505e7c1690e216cd9d15a0c1198fee9ff9f514dd641d9de01d264cab81c1ad27b0e9bb014bd128cd2aacee7a6e -Size (firefox38-l10n-38.7.0/fr.xpi) = 461402 bytes -SHA1 (firefox38-l10n-38.7.0/fy-NL.xpi) = 22cb8bb40d10a4f6085f6f66e7f1bc5e17bf36b3 -RMD160 (firefox38-l10n-38.7.0/fy-NL.xpi) = 49deb740cced8df54fd1b176b47c2a36cf899448 -SHA512 (firefox38-l10n-38.7.0/fy-NL.xpi) = 935f6e6b24c5fc0385a5c5c76705dc01119a0546f1e5f19ea6867855d6356633c7c361e6d1a8595cea90703d98ec4570f674b906c6dfdc4c482a09fd8f0554ca -Size (firefox38-l10n-38.7.0/fy-NL.xpi) = 455538 bytes -SHA1 (firefox38-l10n-38.7.0/ga-IE.xpi) = ab9a9e15be60a3ef69e79795f2a47bf0a2739ec0 -RMD160 (firefox38-l10n-38.7.0/ga-IE.xpi) = 63264385f12dd68b74d06b480553359c7bc1c680 -SHA512 (firefox38-l10n-38.7.0/ga-IE.xpi) = 1239ae49ddbe4bcd878567c6e238b7325d6de586085923bcd03d9e3eddb3ecde5dfa6c8849de0ec77921cca00923418a5480158d190ad15477a1ef7233126489 -Size (firefox38-l10n-38.7.0/ga-IE.xpi) = 469623 bytes -SHA1 (firefox38-l10n-38.7.0/gd.xpi) = 6d9c22b69c686778a2553a0ede377199196e890e -RMD160 (firefox38-l10n-38.7.0/gd.xpi) = d82a0de8e144e76f67b5174936110a1465cbac2c -SHA512 (firefox38-l10n-38.7.0/gd.xpi) = cc14f668ec7b19ca5bee17bdf51e59ea212f1db1a40732f7fec9fe828a5d68ac9f6cb9bf604b398478c04ba2233d927dce55d8bec64ecdf265de001baae11ff4 -Size (firefox38-l10n-38.7.0/gd.xpi) = 454617 bytes -SHA1 (firefox38-l10n-38.7.0/gl.xpi) = 13d4856fa3ee79d6da6c8ec29214fb4bb667ea63 -RMD160 (firefox38-l10n-38.7.0/gl.xpi) = 19b927a48f196e174ed8d30421279b670bceb092 -SHA512 (firefox38-l10n-38.7.0/gl.xpi) = 675fb2e7c27dec5831d38202b73fd547e05d933220716b06de044330d3c0ac563a014fc13646058524cda74c3636f4ff175b7f46d5ed74fcd7c1736c6013fcd2 -Size (firefox38-l10n-38.7.0/gl.xpi) = 448925 bytes -SHA1 (firefox38-l10n-38.7.0/gu-IN.xpi) = 81a425f68b4d68e8c2895c1be096036a6b47a0c8 -RMD160 (firefox38-l10n-38.7.0/gu-IN.xpi) = 9146a4da3514df25767e620716aa89ba4e651a00 -SHA512 (firefox38-l10n-38.7.0/gu-IN.xpi) = bf66492cccaca3f5e05509faeeaa3d8128f943f69482c6ca2065976a9313cdbe3d7552c5643c4c80496f6e8506e7d238413a4a510936f35a13469a611a202d4b -Size (firefox38-l10n-38.7.0/gu-IN.xpi) = 477981 bytes -SHA1 (firefox38-l10n-38.7.0/he.xpi) = f75efe30e1a29c6c4f65b2fd41ba9bf1e8ea50d6 -RMD160 (firefox38-l10n-38.7.0/he.xpi) = 3dc327fa3aeb186fcfbbf73eab4fc62d215a710c -SHA512 (firefox38-l10n-38.7.0/he.xpi) = addbeb5c03799e88c9d3df66675fd41aeeba2b7c3d43d42f8b2edcb654b0e1024022a4405bcaf53a408654dfc8fbd9a0d12e9ce6e9550af894e653cd73bb70f0 -Size (firefox38-l10n-38.7.0/he.xpi) = 486785 bytes -SHA1 (firefox38-l10n-38.7.0/hi-IN.xpi) = 8cbe53bf0dddeab44bb1a03a6a4461fd4ecfa6fd -RMD160 (firefox38-l10n-38.7.0/hi-IN.xpi) = 19fa7117c884339fd7f97ee471c19a9c88c4491f -SHA512 (firefox38-l10n-38.7.0/hi-IN.xpi) = 31b15e575cdfda369aa2b4be2fb2712cbb80cdf9004e20e8360e3448f3015f9deb21a1d0a5566f379facc975215e433df42414d8db94e2a27ca8651694b38571 -Size (firefox38-l10n-38.7.0/hi-IN.xpi) = 508167 bytes -SHA1 (firefox38-l10n-38.7.0/hr.xpi) = 4c26db311d30d86011b4d0d754467f05a1c02cac -RMD160 (firefox38-l10n-38.7.0/hr.xpi) = 8f235a2ccd93e343a0aee6a9aed5a1e2091b0b18 -SHA512 (firefox38-l10n-38.7.0/hr.xpi) = e97a5190b73dc7f8715532ebd5173d34b2801837361cae7e401770db7e4351c213497cb03cde23ad5f0f37af3c207f1e4a4cf55884ba071dfedf86f8916f824a -Size (firefox38-l10n-38.7.0/hr.xpi) = 478272 bytes -SHA1 (firefox38-l10n-38.7.0/hsb.xpi) = 60e4aed5882f8b1d55dc7ead53f9faa700069494 -RMD160 (firefox38-l10n-38.7.0/hsb.xpi) = 16dad1a7872ec2035900f07eefb0f3d6691916e4 -SHA512 (firefox38-l10n-38.7.0/hsb.xpi) = fe2689af29c3d6d005e57d3bbe165f41b6b5182451444ae76b0d30da4e6ffafe0e2185786c9286e27a3f70959bd5dbaef35a5e8da7ac5b9dd3b6f262322a5f9e -Size (firefox38-l10n-38.7.0/hsb.xpi) = 468720 bytes -SHA1 (firefox38-l10n-38.7.0/hu.xpi) = 66dbbed2c0b44f52a4137e3d85df793138dec197 -RMD160 (firefox38-l10n-38.7.0/hu.xpi) = 0e4267963cfa450dd8066018f9d1b97f508f70bf -SHA512 (firefox38-l10n-38.7.0/hu.xpi) = 470bde896811c2e65f5f69192d028bd9f300ebcfe1262b9a4941a5ac6e799d05afc859de023f324ccf5608fdba77f02de5c322a4bdd7b8fe68d1481e9fe5fed4 -Size (firefox38-l10n-38.7.0/hu.xpi) = 453555 bytes -SHA1 (firefox38-l10n-38.7.0/hy-AM.xpi) = fd7268917e6202f1e62dc0b21e2fa6247d2b6029 -RMD160 (firefox38-l10n-38.7.0/hy-AM.xpi) = 5cf591eddabe855183136b71621079e50452d882 -SHA512 (firefox38-l10n-38.7.0/hy-AM.xpi) = 1cbcc4f6d2af58286fef32bdd657a66838c82919f0d2e9e01ea386b783449c89327d58ffc8f8e254d541b4c9f1560a21883fd1e23536b478e02dfd40f50d34bd -Size (firefox38-l10n-38.7.0/hy-AM.xpi) = 534265 bytes -SHA1 (firefox38-l10n-38.7.0/id.xpi) = 471cb65cab970076df555f7052a225fc2567fa85 -RMD160 (firefox38-l10n-38.7.0/id.xpi) = 0c2ed78bc4f6ee1098aae960a323654c47ad92ea -SHA512 (firefox38-l10n-38.7.0/id.xpi) = 8d94eed56c873f29796fb3c6d899c137a48ecfa7dd5f4cf1606584dfddd03c94c2d2c6b275240781e1756df9f4365aaae28eca6598890d8a6b45a09490db26c2 -Size (firefox38-l10n-38.7.0/id.xpi) = 431489 bytes -SHA1 (firefox38-l10n-38.7.0/is.xpi) = c7ae1dd64414c1f6b29c8ad84abd144a87b48139 -RMD160 (firefox38-l10n-38.7.0/is.xpi) = be118c67de34983c91f245618ee1daf71504063c -SHA512 (firefox38-l10n-38.7.0/is.xpi) = 88a2529327f91c33c0468ef00ee80eb92412e51e0502d5d46142dc04e8941e0b9ac33a88ee364fd20b0a8b2ebe19945b454fe9d0bd520890bf20147f8a0b1513 -Size (firefox38-l10n-38.7.0/is.xpi) = 485129 bytes -SHA1 (firefox38-l10n-38.7.0/it.xpi) = 6b38791b25070699f6b87617f87d5958233b1c48 -RMD160 (firefox38-l10n-38.7.0/it.xpi) = 415d7dc48bf751d2b84aa1afe4bc984fee01a69c -SHA512 (firefox38-l10n-38.7.0/it.xpi) = 6c3ce937174eb9bbcb592b9e7d8d7b7b38afd076bb680e2d7b44449d8793432285d05a7406d5c71eae55d9eb1242d45199d9cc690964d30ca29d2ac0d6f5decc -Size (firefox38-l10n-38.7.0/it.xpi) = 368409 bytes -SHA1 (firefox38-l10n-38.7.0/ja.xpi) = 94d717b068e714ead41c02d10a732149ad0062c3 -RMD160 (firefox38-l10n-38.7.0/ja.xpi) = 1588d3143bebe783532b2c850f475d1b176af91a -SHA512 (firefox38-l10n-38.7.0/ja.xpi) = 1dafe059e56754543abdebbe0960d2a5e1c20d8d1d06a9a862870710a0767e1038ca831712e1f0d297cd58aa813c97d604ec273ca43015310b4e4ba0409ff4e5 -Size (firefox38-l10n-38.7.0/ja.xpi) = 479113 bytes -SHA1 (firefox38-l10n-38.7.0/kk.xpi) = 00fd1d04448fd29738851d4e91da76157289122c -RMD160 (firefox38-l10n-38.7.0/kk.xpi) = 4f880211a1c3d82503af3c537a5c59cad8866f77 -SHA512 (firefox38-l10n-38.7.0/kk.xpi) = 82170818b27a2c7c94efcec7dcabfffd4239f6f65fa8bc84559fd9e2e25b357dc23a0ee0d10282efc96dc882e42b9a5b3329b9608a875bc78bfc5274f0cc44f4 -Size (firefox38-l10n-38.7.0/kk.xpi) = 503568 bytes -SHA1 (firefox38-l10n-38.7.0/km.xpi) = c5df7a1d2bb6f2d7cb407702be408c48ab840034 -RMD160 (firefox38-l10n-38.7.0/km.xpi) = b68f1037965c029b3423483bda6148cf8e34f4fd -SHA512 (firefox38-l10n-38.7.0/km.xpi) = b8e8e6959539bb136b430396ff8b7b7c6c71d944d3632550cae0c4c656e9f361bb1fed0cf6b3d9af4c4dde8bc1613eb6215780d3b547c763e3d9c9b89dc6f871 -Size (firefox38-l10n-38.7.0/km.xpi) = 565674 bytes -SHA1 (firefox38-l10n-38.7.0/kn.xpi) = a885720612a2f959bfe8fa53e6dd88a1a065217f -RMD160 (firefox38-l10n-38.7.0/kn.xpi) = 2b4bb60e60e1bf027a309943e71c0e3b42e784fa -SHA512 (firefox38-l10n-38.7.0/kn.xpi) = b32cb2d35ff8b585014d22486d446680c4ad81764464986b0cd43ec74274b3a049d3d952ed3e3315e75c352788cba50c95b863197c59b5ced75c65daa9c709ac -Size (firefox38-l10n-38.7.0/kn.xpi) = 533464 bytes -SHA1 (firefox38-l10n-38.7.0/ko.xpi) = 5e45ec90e83500cb2c1b3cb45c7cca45b41fd952 -RMD160 (firefox38-l10n-38.7.0/ko.xpi) = f6e56e3f59d8991fe5447721c352dff1cfe9019b -SHA512 (firefox38-l10n-38.7.0/ko.xpi) = 6c18951faa27cb2378e607b14bc17214ca9b8257672189b41fd60de1bdff7b403fb53bfec60db3763efb326c4ff1e9474336563b9142ad879938534bd7ffa2bc -Size (firefox38-l10n-38.7.0/ko.xpi) = 460854 bytes -SHA1 (firefox38-l10n-38.7.0/lij.xpi) = 39f27930ddd7a2a92926bbd24c79cff959493095 -RMD160 (firefox38-l10n-38.7.0/lij.xpi) = 03b6693388c495184d890d9036e3bfc4a76c35d5 -SHA512 (firefox38-l10n-38.7.0/lij.xpi) = c32a9fc6f8c23a509705a501de789b1c2a9ec43d76127d9fe9b1bb2667f18d7d8809cf675dfe400babaa68af20a9975a85f841a40ffbd226089aa6045ba6f518 -Size (firefox38-l10n-38.7.0/lij.xpi) = 444238 bytes -SHA1 (firefox38-l10n-38.7.0/lt.xpi) = 95338300bd57ed972a8388fd6dfd99ccdc583e5e -RMD160 (firefox38-l10n-38.7.0/lt.xpi) = 8adc31fccf589deeeb85b0305ced0614d193d1b9 -SHA512 (firefox38-l10n-38.7.0/lt.xpi) = 89086e8463a1abac1475f115ae8b82722115ab30d722cf83b36be55bdd6817af67efba29a809df1fa66a656d937b3899b95c60bd9d264bb669cdd1196be85f4c -Size (firefox38-l10n-38.7.0/lt.xpi) = 486451 bytes -SHA1 (firefox38-l10n-38.7.0/lv.xpi) = cef738a618b6c02d07007bf6c987ec9e8977b983 -RMD160 (firefox38-l10n-38.7.0/lv.xpi) = 7ddd1f0d31ba6e41c75a80b97f472c42ee43e0d5 -SHA512 (firefox38-l10n-38.7.0/lv.xpi) = 9222bde4d62019e9f43dac8fa1aaf6447f782f48581d59380dc8c7ac1b59dd380143bb83ca054f7d61e894d9a3a54810b44ca5fa6b6d63f51ed830455638bc5a -Size (firefox38-l10n-38.7.0/lv.xpi) = 467198 bytes -SHA1 (firefox38-l10n-38.7.0/mai.xpi) = 5cde9496c12f2585c7a3d649f84943e41378d1b1 -RMD160 (firefox38-l10n-38.7.0/mai.xpi) = 0bbf5078b409db64e105793969c74b491f06efa7 -SHA512 (firefox38-l10n-38.7.0/mai.xpi) = 2d8205d6840813102883f426d70edf0a77f7704e8646b546fc8ef893957958a39c53ee66f86de264db47350fda789bf89fdb9a6930462145a151a9e5a09da171 -Size (firefox38-l10n-38.7.0/mai.xpi) = 514666 bytes -SHA1 (firefox38-l10n-38.7.0/mk.xpi) = 3379efa6e4a0f901272c398a9a478a1ccc547c93 -RMD160 (firefox38-l10n-38.7.0/mk.xpi) = d3c4c914042bbe4b103abb1ac0f7266cabcf0273 -SHA512 (firefox38-l10n-38.7.0/mk.xpi) = 286930c3abce7a6d6d2ebf30bbbeeb9461e05f3025042cce6600f72f2e358bb40a2550cf0d8650dcb046bdcaf0a7c66aa275f4820d173238862a13399335116d -Size (firefox38-l10n-38.7.0/mk.xpi) = 529205 bytes -SHA1 (firefox38-l10n-38.7.0/ml.xpi) = c9520efe0c4c24232f0cee3928a8296d588ef506 -RMD160 (firefox38-l10n-38.7.0/ml.xpi) = 5fed7ce14681878f8eea4fe268dae1477ffadd69 -SHA512 (firefox38-l10n-38.7.0/ml.xpi) = 19416d4205b3873a5c83f5c1db790507f846205c17b9c45a5296d1afbf82d4589c3f5419dca228cde4c4d44a2ad9415d80b38c9185cd89f22ccbc1cfb0f25892 -Size (firefox38-l10n-38.7.0/ml.xpi) = 528919 bytes -SHA1 (firefox38-l10n-38.7.0/mr.xpi) = 4bfb9c5128bfaf4501618027b49903b6b4bce962 -RMD160 (firefox38-l10n-38.7.0/mr.xpi) = 7164040857a13e3a0086997f0369e9b8ae285bb2 -SHA512 (firefox38-l10n-38.7.0/mr.xpi) = 32623bd6baca6038bb94bf63ff85fd48f9382835f5ea98111121dfb42809fcb522e41debfe0e27ec29f76cbba43c966db18d421020e695b6f4a0be81c69510dd -Size (firefox38-l10n-38.7.0/mr.xpi) = 505962 bytes -SHA1 (firefox38-l10n-38.7.0/ms.xpi) = 9ae85880437ef262a5bb04dc0cb78e8e54f84051 -RMD160 (firefox38-l10n-38.7.0/ms.xpi) = 0d99ac3c12603275c6f15c16dae4307418a763fd -SHA512 (firefox38-l10n-38.7.0/ms.xpi) = 70d84de7612d086317ea470fd549d787b313aa6c284eaf8f994cc2127dda356422e95cb219ae55c6542ee082c76edaf4ad1da02a91f129ebf1349db8eedaec68 -Size (firefox38-l10n-38.7.0/ms.xpi) = 489872 bytes -SHA1 (firefox38-l10n-38.7.0/nb-NO.xpi) = 408d8038673d0416da8820cd2cea3ffc20510031 -RMD160 (firefox38-l10n-38.7.0/nb-NO.xpi) = fd01be508bd7475793120b2ac7712091dde75fc7 -SHA512 (firefox38-l10n-38.7.0/nb-NO.xpi) = 8a64890d778b765aeb20a1f21f5a019f26a88e024c647065d0d63cba21823bf0a3f8dfbb24648434ca8585162a7b6753f58c75a4743b525e30a96b465f3bd059 -Size (firefox38-l10n-38.7.0/nb-NO.xpi) = 444177 bytes -SHA1 (firefox38-l10n-38.7.0/nl.xpi) = b219b6f03b5c638457ee0567a3bb784f144e0c09 -RMD160 (firefox38-l10n-38.7.0/nl.xpi) = b502653bfd22e054d1e4cf4d62409e78c3be5d0a -SHA512 (firefox38-l10n-38.7.0/nl.xpi) = a6c63f5cd3bac49b2f1db10501ee2e923a4b629be1eccb8078bc899a5ea73aa125f1eba433101ce7a717f2f1915107e9a5947e53ad6891d01868ca10696f1b90 -Size (firefox38-l10n-38.7.0/nl.xpi) = 443994 bytes -SHA1 (firefox38-l10n-38.7.0/nn-NO.xpi) = e5fcc1ea7002e0e34933216474ee368fc906b14f -RMD160 (firefox38-l10n-38.7.0/nn-NO.xpi) = 79698703ce4c832f012e18c1ef1c4d05354c12a1 -SHA512 (firefox38-l10n-38.7.0/nn-NO.xpi) = f3eecf51ada16734f92cc899f00e259fea21ab9a02580fb1d12edc51d1d787fbccee5050c4d212a845a95f60b841fdd6ed4ff2ad4f341fd71aa2c4db84fcb93e -Size (firefox38-l10n-38.7.0/nn-NO.xpi) = 438451 bytes -SHA1 (firefox38-l10n-38.7.0/or.xpi) = 538640fb9bbc07bad631faab47a98c7c4c6fdf30 -RMD160 (firefox38-l10n-38.7.0/or.xpi) = 5efb8b9024dc29d0703f6f445bd56d1fa5cce58c -SHA512 (firefox38-l10n-38.7.0/or.xpi) = 09ff69013950ab38be290df9dc62967926bb734d6243ee6c0ca541bd14b4131d0e244db0f53765a7adaa6109b9313bc772e42bc835fd9f5d8df3c6d0b85e5ea4 -Size (firefox38-l10n-38.7.0/or.xpi) = 527049 bytes -SHA1 (firefox38-l10n-38.7.0/pa-IN.xpi) = a8b6857fa0bb2ebb42ee286c2b52f5636e9c3bc6 -RMD160 (firefox38-l10n-38.7.0/pa-IN.xpi) = 30c85360d9c3ab3f0e91c4e153fefcc6dbe8092b -SHA512 (firefox38-l10n-38.7.0/pa-IN.xpi) = b50872470a2206691d19087c298926eb066128132c73bbb34c4a07ea19031d783f15db55a4be90627fa6d2babc1e491813ef21024f8e8cfd9eac4c08afa608bd -Size (firefox38-l10n-38.7.0/pa-IN.xpi) = 493722 bytes -SHA1 (firefox38-l10n-38.7.0/pl.xpi) = 4e86aafb8d93a8955965dbf96d69d8a81979c34b -RMD160 (firefox38-l10n-38.7.0/pl.xpi) = 568aea98fc7fc1752f902a13e08530f97f94a2af -SHA512 (firefox38-l10n-38.7.0/pl.xpi) = ef78dca90d431ff0b86bc813012c8fedee36bc31e482f2f99969227cf2cb85f26c9318db251702951d539d339e726ed736305e7037308cbf7c4750ea3bdb8575 -Size (firefox38-l10n-38.7.0/pl.xpi) = 406566 bytes -SHA1 (firefox38-l10n-38.7.0/pt-BR.xpi) = 3be5f4e340a4bc482a9416293054a194272d5714 -RMD160 (firefox38-l10n-38.7.0/pt-BR.xpi) = 35c4323b386f0c77960e6a5aa53ae7ae6dfbb736 -SHA512 (firefox38-l10n-38.7.0/pt-BR.xpi) = 6bee3f4b02569c4e915bb51d0f5e55ac0f806bdd02d1b669ec8ae4427fb40e21b310cde24b4b941e5f4b13313f1a98ee3164bcef45735cb0ccaf90f83ec1a5f5 -Size (firefox38-l10n-38.7.0/pt-BR.xpi) = 459813 bytes -SHA1 (firefox38-l10n-38.7.0/pt-PT.xpi) = df0d50f60a7c812abd89e04f3d8be33d74bf60ca -RMD160 (firefox38-l10n-38.7.0/pt-PT.xpi) = 4bfcf76918b6480324ccf14fba7d4c68b2e24c0a -SHA512 (firefox38-l10n-38.7.0/pt-PT.xpi) = a18f7e1aaac527eb2796ea21cf4290d674a7b5af260daf84e00b388efacc2966ed3fb1f92fe6bfa3e6812921b923b2fadd6cd2d3d8b43b2ecd55e06e3c42172b -Size (firefox38-l10n-38.7.0/pt-PT.xpi) = 439975 bytes -SHA1 (firefox38-l10n-38.7.0/rm.xpi) = 763ebbc380cad6e4bbfd11c04483e24a1bbe6182 -RMD160 (firefox38-l10n-38.7.0/rm.xpi) = bba6d4238098934d7a803e4b5668d1a6c32fadca -SHA512 (firefox38-l10n-38.7.0/rm.xpi) = 8edb1dd22e6a4db8af3da9f323b938ce9ffb9b6c77d36266212f32fc5dca609da393a2b6493060f93d6f24e9bac3081700d5b0c9add9994b94373c64bafd4952 -Size (firefox38-l10n-38.7.0/rm.xpi) = 446287 bytes -SHA1 (firefox38-l10n-38.7.0/ro.xpi) = 7b63a733726e9f5ecfb850ffe7e939ac077f875b -RMD160 (firefox38-l10n-38.7.0/ro.xpi) = e90b4bce7af4e94fb78b354531427bdd9106beff -SHA512 (firefox38-l10n-38.7.0/ro.xpi) = c14edfc07d748bb1bfda41c80b8f9913289c787cd0eb65a605a117bbfdef3dd4370bb4c68781a5008439ef0f493e5f96a42737e95eaf20f95c9a481bc78de204 -Size (firefox38-l10n-38.7.0/ro.xpi) = 494079 bytes -SHA1 (firefox38-l10n-38.7.0/ru.xpi) = 87f44c32e15e0e20198f44bbb6408609b4e85fb9 -RMD160 (firefox38-l10n-38.7.0/ru.xpi) = d324976429b5e4aff4026d6a94ae6ac801887a8d -SHA512 (firefox38-l10n-38.7.0/ru.xpi) = cf7bb3d6e17542aa912756aa2e7ce3d30ccb4791ce43304f46400fe5ac21009c4eb3465f8f262aa24f58fa18f3d7951ff30e7b84772c8d7bf0b3ac73f76540d0 -Size (firefox38-l10n-38.7.0/ru.xpi) = 414419 bytes -SHA1 (firefox38-l10n-38.7.0/si.xpi) = 66c941b8354cb5c66779f936a0aed5235feda477 -RMD160 (firefox38-l10n-38.7.0/si.xpi) = f83ad4776a64fc162b1a9795085767bf53c2b726 -SHA512 (firefox38-l10n-38.7.0/si.xpi) = fecf670080e9b3050514d65e2fddeed039009e8e43861703077bf2fa94adc9ba9c2fa0f8d654b400b86056998b829d22192deb373484a991b2980dd0f9e0f962 -Size (firefox38-l10n-38.7.0/si.xpi) = 537393 bytes -SHA1 (firefox38-l10n-38.7.0/sk.xpi) = ec9a290474b28bd64887927d6b23e2f4a99ddc4e -RMD160 (firefox38-l10n-38.7.0/sk.xpi) = 18b39fe20acffc84affcad6dd2c6aac8c23b0b50 -SHA512 (firefox38-l10n-38.7.0/sk.xpi) = 9be480cec42d50a37f082caaedd58dff728c64437e285b5d50c1beee9d318069457775ee3786fdc4c1f27e7e57989b4a24d7e424c2a008b4ad7b84dd4727da7f -Size (firefox38-l10n-38.7.0/sk.xpi) = 469436 bytes -SHA1 (firefox38-l10n-38.7.0/sl.xpi) = e2b025dbb372d13d0e99c4b097a310f7de8ae078 -RMD160 (firefox38-l10n-38.7.0/sl.xpi) = 5c176c31da556d5e87779df0959c633983471cb3 -SHA512 (firefox38-l10n-38.7.0/sl.xpi) = db726cb2ac8827baa4b61f41a25b4b94890f70e00a16fec9939268de09e3731ed00cee9efd08660f2cff4f9ffbf0977e04e49d2812c45ba0c15870e727245e61 -Size (firefox38-l10n-38.7.0/sl.xpi) = 441594 bytes -SHA1 (firefox38-l10n-38.7.0/son.xpi) = 16aec6c648b1239758f752bce82d3329470606ac -RMD160 (firefox38-l10n-38.7.0/son.xpi) = b79fd94890b8ef286109c488d5558ad731dc4859 -SHA512 (firefox38-l10n-38.7.0/son.xpi) = 3ca22ec20047839a237367ab878b902107c42c7b764deb3221db1c0c473b8672780656960b6d6461cc631d3847cc2ab7d82d8ed7baaa73d25a7295e6b1297d22 -Size (firefox38-l10n-38.7.0/son.xpi) = 449267 bytes -SHA1 (firefox38-l10n-38.7.0/sq.xpi) = c22e19c227479394370f81893555da722fe66cbd -RMD160 (firefox38-l10n-38.7.0/sq.xpi) = 113f001de9e95ec24764996d1a0a08cb501b870e -SHA512 (firefox38-l10n-38.7.0/sq.xpi) = b4a3fd49720b5d92622eede71b0c23014045b4c3321895a12bf6cf28e8dcd15ebf24bc36b04b292440473080edd58429ff279669cd8e1fbc481d80d29ee2db0b -Size (firefox38-l10n-38.7.0/sq.xpi) = 486075 bytes -SHA1 (firefox38-l10n-38.7.0/sr.xpi) = 2d297e16825223006e05284eb45aa8fee4037c45 -RMD160 (firefox38-l10n-38.7.0/sr.xpi) = 6e22dbcecd031767021f9643380a2936e0176ab4 -SHA512 (firefox38-l10n-38.7.0/sr.xpi) = 485e21dc04a7ce6fe588eb3f09f0788e46183e71a2a7e2c7c3cd7f4e990b91dd36e0c5830454a953c34bf86d6d729630cc4d2b07b3c846bbaad650309bddd269 -Size (firefox38-l10n-38.7.0/sr.xpi) = 479419 bytes -SHA1 (firefox38-l10n-38.7.0/sv-SE.xpi) = f67d313729cc36fa7a65aa0e7579f237e041cee9 -RMD160 (firefox38-l10n-38.7.0/sv-SE.xpi) = 569c71afa9a0a182d3ee24f4183c3e0b65c194ce -SHA512 (firefox38-l10n-38.7.0/sv-SE.xpi) = df7f4e40e710df9eb11b10cc1823820dc1ba77b38629232828feaea73f09df865d20258e68028fe04a8a909365a7fa6ff86b346eb3cfe52b2245d05aab8cf142 -Size (firefox38-l10n-38.7.0/sv-SE.xpi) = 452632 bytes -SHA1 (firefox38-l10n-38.7.0/ta.xpi) = 63f838dd893e7e5f30dc77638aec4e0ccd014a48 -RMD160 (firefox38-l10n-38.7.0/ta.xpi) = 9102f3e2b5299a230bbf65404f614265fa6a46b8 -SHA512 (firefox38-l10n-38.7.0/ta.xpi) = be1c76f6e09cf37856689c365844df3551fbd5bb5d4b004e7f24f2f0c7b531f8b55dc3f2666863691155b64b5d8b5832591de63a8884b996ea3c4c71e1b89b26 -Size (firefox38-l10n-38.7.0/ta.xpi) = 506607 bytes -SHA1 (firefox38-l10n-38.7.0/te.xpi) = 00cc16ba85c615bdca675bdbe02404367f54f0ac -RMD160 (firefox38-l10n-38.7.0/te.xpi) = 4b3e144a6c83173bfa01540dd787af0af72fce3e -SHA512 (firefox38-l10n-38.7.0/te.xpi) = 80db80824f68bceceb22cc16285d86616811cccf71ff7d3980bfb0e4cd7f6cc554fe4cfb57c0c3d80374073de87c062fe4c2e7d89f7c545a0be2c95ee5bbd167 -Size (firefox38-l10n-38.7.0/te.xpi) = 526253 bytes -SHA1 (firefox38-l10n-38.7.0/th.xpi) = d96b4b89f0c0a677f9304a7818713cdf8afa015e -RMD160 (firefox38-l10n-38.7.0/th.xpi) = fa428faca626ec102bcfd1f7a6be4ff94247fd60 -SHA512 (firefox38-l10n-38.7.0/th.xpi) = b8ff8ab72655bec3f84b0484a649225d708ce31e49b4300f7dc13468f9987eb2114e6e9289defae36aba9d92fef6405a7a7f1b3f79f5de9804631d58bf2f9921 -Size (firefox38-l10n-38.7.0/th.xpi) = 534269 bytes -SHA1 (firefox38-l10n-38.7.0/tr.xpi) = ebcc252d7cb96357e4380dcaa9ef58dc992e31da -RMD160 (firefox38-l10n-38.7.0/tr.xpi) = 23cfee2ed2ba884f0d99861b0867a917330abfc1 -SHA512 (firefox38-l10n-38.7.0/tr.xpi) = e1f7909f81b2c7b1475bbe6b5327c663a72800d0172823336d719a25da9692469f8f720d26c93e3d043af49869e871a71095eabc6054635160d30ec8cdc454a8 -Size (firefox38-l10n-38.7.0/tr.xpi) = 481076 bytes -SHA1 (firefox38-l10n-38.7.0/uk.xpi) = 01d3c95094904ba9446c3918cf9cbc3df42a2f5c -RMD160 (firefox38-l10n-38.7.0/uk.xpi) = fc7e4f7abfd3c6d4976fce7fafee9bee8c3b9c69 -SHA512 (firefox38-l10n-38.7.0/uk.xpi) = d8f44b9a44649cdd9c5c000446b702646ad6ed06eb6f9430666c956c09f5a06c3e04e1c2bfb485f74ee731bcc09a58e6dfc67e632dd012e06b2ef83c837950c3 -Size (firefox38-l10n-38.7.0/uk.xpi) = 493313 bytes -SHA1 (firefox38-l10n-38.7.0/uz.xpi) = 4e890f4641b2f34430311e76879908402ea21b69 -RMD160 (firefox38-l10n-38.7.0/uz.xpi) = e4d08c8b4400ae0bdcd9eeafb1b871013894dbc8 -SHA512 (firefox38-l10n-38.7.0/uz.xpi) = 12d488bc7bc96074026d884b572949df53bef64b3570e05b424435c59a6b674bdc77042b92b573d0dfd5b8f4e61bc757649d59971b631ac7e75f28c44f501909 -Size (firefox38-l10n-38.7.0/uz.xpi) = 496192 bytes -SHA1 (firefox38-l10n-38.7.0/vi.xpi) = cd9f988533f587ad656fc7d98af88d468b61c07e -RMD160 (firefox38-l10n-38.7.0/vi.xpi) = f0d64fa854cdf0d71fd7c3e641b45a577b97c235 -SHA512 (firefox38-l10n-38.7.0/vi.xpi) = 7a7e1c25087840122e52cd50c474e37c939fc1c83ca5c465571572d8496d8da75d231bc0b8677b475ad07271d7ada5b8436d7e7ede522e1b6cb05fb9fb82c8e0 -Size (firefox38-l10n-38.7.0/vi.xpi) = 467505 bytes -SHA1 (firefox38-l10n-38.7.0/xh.xpi) = 770dd1c7354ca50d38e03ecc9125e5e1bce03171 -RMD160 (firefox38-l10n-38.7.0/xh.xpi) = 98a4c0ce7f988421bb71018b377642561f2af035 -SHA512 (firefox38-l10n-38.7.0/xh.xpi) = 9222090836e150da7287f6f631640fb787ad235a1c1449fefa750e30304dd00c7a72fe293f1b88a038989f07dd355a89dd881f9898a4c1b47410e4cb45a46e1e -Size (firefox38-l10n-38.7.0/xh.xpi) = 450242 bytes -SHA1 (firefox38-l10n-38.7.0/zh-CN.xpi) = 862558ff03cadc34465e8b82c438b4c11d664c45 -RMD160 (firefox38-l10n-38.7.0/zh-CN.xpi) = aad6589806ba3cb7597c9f7afd4a30e99c92d3fe -SHA512 (firefox38-l10n-38.7.0/zh-CN.xpi) = f918114ce026ed76fd642f78bb65f6982dff450980a8b85560ab59116eb33a78f7de8e8bc960ed69600dcd4d8497bd6ab57945f5b1e547a50f2558ae4a3b7c65 -Size (firefox38-l10n-38.7.0/zh-CN.xpi) = 488277 bytes -SHA1 (firefox38-l10n-38.7.0/zh-TW.xpi) = 7e5bd303b194405aebc90641088db672f2394a17 -RMD160 (firefox38-l10n-38.7.0/zh-TW.xpi) = 9c7cba81a5e55a59a3ef3fe05eb525d33c5c66af -SHA512 (firefox38-l10n-38.7.0/zh-TW.xpi) = 9fadf5722becefa313bf73b3568a67368b9b3b1d986b030f5fd3f0171d20f9eb8dee6c299dd041022c58d08c1a8c78106d0681a40833c3cccc00f1150cb98dd5 -Size (firefox38-l10n-38.7.0/zh-TW.xpi) = 467843 bytes +SHA1 (firefox38-l10n-38.7.1/ach.xpi) = 93d7c059cdfb5db2c309b5a22b1d1952c1dc7133 +RMD160 (firefox38-l10n-38.7.1/ach.xpi) = b6368e6c6c69b417b05027ec4d7d4a0e3451802c +SHA512 (firefox38-l10n-38.7.1/ach.xpi) = 63a4dac3b519ccc71dae46d97a720dffe956d986979c51f38b51c8395373988203816e10ecacf4216344d2086ee5c74aebf379c78cec92551fc1740e0a81c520 +Size (firefox38-l10n-38.7.1/ach.xpi) = 477969 bytes +SHA1 (firefox38-l10n-38.7.1/af.xpi) = 2e5262aacf8463d09f385266c35009c704fe5c66 +RMD160 (firefox38-l10n-38.7.1/af.xpi) = 214223a8c594115282b545d8b4aa663cb4e61a39 +SHA512 (firefox38-l10n-38.7.1/af.xpi) = 84d3d1bd91609729fb9660101de048cd566da494a06a2bcad33541534dd4b755a655209930db4b36e5ac4cf92dc3348883cea7f6c2eac730de1cc31ebf1b48ea +Size (firefox38-l10n-38.7.1/af.xpi) = 483326 bytes +SHA1 (firefox38-l10n-38.7.1/an.xpi) = 3b9f302c97ad9ec1bff1047785a1910df332978b +RMD160 (firefox38-l10n-38.7.1/an.xpi) = bbdcae7395e37c37dcade413ea755a3c92751a09 +SHA512 (firefox38-l10n-38.7.1/an.xpi) = f54119c2d932b516b0a0a000cacf1f318fbb544e22efc81b94276b2fc07c8b06069e403704404e107c817b5735759de15859bcafa4e71c55ec7e1aafffc2e298 +Size (firefox38-l10n-38.7.1/an.xpi) = 461423 bytes +SHA1 (firefox38-l10n-38.7.1/ar.xpi) = 9f955919d0807822f77b3d221392a6c8c6e28701 +RMD160 (firefox38-l10n-38.7.1/ar.xpi) = 196be3307bc66e8365d41d621f93a102cb01e9e6 +SHA512 (firefox38-l10n-38.7.1/ar.xpi) = 2080b3752f0d2f1c0c43b0ec089d06074388b6fd0bfb5df5a39de7a88523841bff8683c971c9b9182423020325a342902de77dd81072b6ff77d0506a81308829 +Size (firefox38-l10n-38.7.1/ar.xpi) = 516495 bytes +SHA1 (firefox38-l10n-38.7.1/as.xpi) = 46acdf489e269d8df6a212809e220c7444123bf3 +RMD160 (firefox38-l10n-38.7.1/as.xpi) = 2d8082d56a55713be3fbfbb560e2ccdf1fb1a9a4 +SHA512 (firefox38-l10n-38.7.1/as.xpi) = f5d88638977a7e916339c465ef8e487f0f5f7e8f7b3e6986ff12729472c4936cc4d3e1eb12c42b579bdb06e27bd8f20ad224cbec6c5115dd452b1f52a01bfb82 +Size (firefox38-l10n-38.7.1/as.xpi) = 509574 bytes +SHA1 (firefox38-l10n-38.7.1/ast.xpi) = 495fd5fa512b3b1f7ffaa93c6f66c7c671a1295d +RMD160 (firefox38-l10n-38.7.1/ast.xpi) = 522b03320308d38c60597baf1df616fec1947d34 +SHA512 (firefox38-l10n-38.7.1/ast.xpi) = d95500da4bb351b7fe5251ff132153147316ec663451727c070781c16f4c3f8300248708ae7d6c194ef9814040001767cf7de85561b74f76072e28b8958e366b +Size (firefox38-l10n-38.7.1/ast.xpi) = 397202 bytes +SHA1 (firefox38-l10n-38.7.1/az.xpi) = dae93849764438aa4cc27d38caa62e1db654bd5b +RMD160 (firefox38-l10n-38.7.1/az.xpi) = 982d01cb2a42402389746c7b78b50754188faa83 +SHA512 (firefox38-l10n-38.7.1/az.xpi) = 5b47a12c4d1ecebd3ec5afb39f8a0636a74fdca772a8741dfbb5e98aeb96f967724728f33cbefcb4cefc97275a75d585e9b216c4fc7588e885847b7c98318bb9 +Size (firefox38-l10n-38.7.1/az.xpi) = 489153 bytes +SHA1 (firefox38-l10n-38.7.1/be.xpi) = 8be32fb1480de58947817a914f0d839aebc9fff7 +RMD160 (firefox38-l10n-38.7.1/be.xpi) = d53e7c0126dcf10993c443d3e42aafe8397a94d9 +SHA512 (firefox38-l10n-38.7.1/be.xpi) = d26cc38edd4b0af98cd1cb00736893547632d8dbc48733d4e5cd5ad9e135ee9addecf5a7f25aed21909edefe61b858bb56c232bf682c8c6c4c5448a4efba6eca +Size (firefox38-l10n-38.7.1/be.xpi) = 441057 bytes +SHA1 (firefox38-l10n-38.7.1/bg.xpi) = 6da5bfbed278ce1c160641460ff214564bb0630b +RMD160 (firefox38-l10n-38.7.1/bg.xpi) = a98c3538f046db7da6dd4ac596e431c86dbbfddd +SHA512 (firefox38-l10n-38.7.1/bg.xpi) = cffb6f2a429d95c1b443205d8882464d48d3babf4ddff32550f98edf1b40c570998600933fde29bb1d959db4ddf485abc0301eabf66b921c94882028f8918534 +Size (firefox38-l10n-38.7.1/bg.xpi) = 487819 bytes +SHA1 (firefox38-l10n-38.7.1/bn-BD.xpi) = 429cb5290c34a2792e6689a3b1b746ff30972129 +RMD160 (firefox38-l10n-38.7.1/bn-BD.xpi) = 25da301ec11c5d21edaa15e1903fae2fd92b86bb +SHA512 (firefox38-l10n-38.7.1/bn-BD.xpi) = f24c34e02d7893b4159d5334016d0e49ed799168343a1000ed11cea5688a772c56be9b0e54909ef886719496cf95ae0c9d6086005d300a9600495e497689bce5 +Size (firefox38-l10n-38.7.1/bn-BD.xpi) = 528690 bytes +SHA1 (firefox38-l10n-38.7.1/bn-IN.xpi) = fd3d28fd64a9204f3f07773e2e2f7c69c5d739e9 +RMD160 (firefox38-l10n-38.7.1/bn-IN.xpi) = 1c23dc012f9ddc67f7eb2fdd433b62b8ee8120e7 +SHA512 (firefox38-l10n-38.7.1/bn-IN.xpi) = d07767cace73800be8597e056ec05d943c540f43bfc778467091a781cc59ed75320c106e7fafff03976236e200ff6bb8a51682172cae4b4fc934c2bd067daa0c +Size (firefox38-l10n-38.7.1/bn-IN.xpi) = 527927 bytes +SHA1 (firefox38-l10n-38.7.1/br.xpi) = 59f3da289bbd6f09baa224db9e00bce75bc9383f +RMD160 (firefox38-l10n-38.7.1/br.xpi) = 1b8e1a7e7fe08e6ed9eec038072d692553ed799c +SHA512 (firefox38-l10n-38.7.1/br.xpi) = a98fc25c1551c1e38ba25acd385353aed067568300dbdc2c01d2f02e8d60f704627c9cec9d867897c815da448231cf8aa17398cf5e9d3abfaa5adf4ec6c0a4be +Size (firefox38-l10n-38.7.1/br.xpi) = 441962 bytes +SHA1 (firefox38-l10n-38.7.1/bs.xpi) = 8ce15179fcf3d68cbbe2a617d396444f74477c91 +RMD160 (firefox38-l10n-38.7.1/bs.xpi) = b25d294ad043695d3fddbc2ff1247e43cf566a98 +SHA512 (firefox38-l10n-38.7.1/bs.xpi) = be62a4ed3e59618fa3a96e22caa3784f88dfac7e6f91a1f45fb799324b3cbf8095705e3bee1b9949d85ea2cd2a5d7cbad25774afe0939c3e303663f1cd063999 +Size (firefox38-l10n-38.7.1/bs.xpi) = 485305 bytes +SHA1 (firefox38-l10n-38.7.1/ca.xpi) = 5f9e4464bac0e8aaf0beb01ed74f0f515c1983c3 +RMD160 (firefox38-l10n-38.7.1/ca.xpi) = dd2c209a2b370420eb23a2fcaa2bcf3e31d6bf93 +SHA512 (firefox38-l10n-38.7.1/ca.xpi) = bb367db71d32c70b004828fa24552712c14d905a0a988869706c08fc26f6ca0f069369e2cbff3ca1d178f91e51043b4bf2e679ec5999434fdda9c1daa35562fb +Size (firefox38-l10n-38.7.1/ca.xpi) = 458092 bytes +SHA1 (firefox38-l10n-38.7.1/cs.xpi) = 0fd968bb8a459d9527ab828d258e57915014c6c2 +RMD160 (firefox38-l10n-38.7.1/cs.xpi) = 678aff480147d87a24fed47ca6b7a076f45fa0b6 +SHA512 (firefox38-l10n-38.7.1/cs.xpi) = c52b88571ae14896e4fea4c98cb16a7cade3d944f43a51e5001a63af46922589cfcf1c2b3975e26ec0932453b95d3c8998c18d5a43c09cd204c8451ec7c64478 +Size (firefox38-l10n-38.7.1/cs.xpi) = 446726 bytes +SHA1 (firefox38-l10n-38.7.1/cy.xpi) = 3c0e06e9a139c7862946b0e170b71c417096a516 +RMD160 (firefox38-l10n-38.7.1/cy.xpi) = 3059c0682e018932550fb04f12209da5c619e9cb +SHA512 (firefox38-l10n-38.7.1/cy.xpi) = 0ac3fea8a6d22abe5853631afd97cccf71bdc0177be0db5c4c2bf1b4a3383b9fc79877b1b50685b80088a953d7068449979a4a3a1085456caf1c968f0733a0b0 +Size (firefox38-l10n-38.7.1/cy.xpi) = 444385 bytes +SHA1 (firefox38-l10n-38.7.1/da.xpi) = 174f809cf81f948f0b518125f2fd011779e15a3e +RMD160 (firefox38-l10n-38.7.1/da.xpi) = 68c13964e436f6db76cbd2e3f51001216ab3b0de +SHA512 (firefox38-l10n-38.7.1/da.xpi) = bf62b34088587a66da9b26b290b52b3a41a23e6153686fe24edf14bbb7170abd5d6952094bb7b75c3849f887e86be7dd9bdfb4480e3e89f4c97cc1b307eb70e2 +Size (firefox38-l10n-38.7.1/da.xpi) = 450762 bytes +SHA1 (firefox38-l10n-38.7.1/de.xpi) = 73bbef5358b11c791959228ddbab12c72a04fe86 +RMD160 (firefox38-l10n-38.7.1/de.xpi) = a55560903676cb9b3efdafd3fd91630712ce49a6 +SHA512 (firefox38-l10n-38.7.1/de.xpi) = c0e5e211fc6992dfd412ca1a4c02a5e4306c49ef4e1564480938148005f62b5da0200ba910aef26ef31ff27af1a9a51e4f83d580a40db8cdc8aa0edd0abcbae5 +Size (firefox38-l10n-38.7.1/de.xpi) = 451629 bytes +SHA1 (firefox38-l10n-38.7.1/dsb.xpi) = 878cb9fe1532f3e345120116009865d16b6bba58 +RMD160 (firefox38-l10n-38.7.1/dsb.xpi) = 8532aaf5889b2e44d680fd73a0058579957226df +SHA512 (firefox38-l10n-38.7.1/dsb.xpi) = 433ff5716eaeed162d58ee2be4ac0d74f352f8a969474df1fdd3b4214376d59eee6f18735f955208af3cf8c85420286a32f02512d3a69ea26605e5f1ad614c9c +Size (firefox38-l10n-38.7.1/dsb.xpi) = 470923 bytes +SHA1 (firefox38-l10n-38.7.1/el.xpi) = bf4c4f6aca874d524777b9920d6c544b0d5cba1f +RMD160 (firefox38-l10n-38.7.1/el.xpi) = 28ab88cd52fcb6b68d79464100946a538e8bee87 +SHA512 (firefox38-l10n-38.7.1/el.xpi) = db92315ee88ef5529a11915a42482b88b2e551e6b57261b83ba989e3862ed14e1ea7044157807642c92449f690b1275c800378e08c4ba0ba8ba9a293d968126b +Size (firefox38-l10n-38.7.1/el.xpi) = 498370 bytes +SHA1 (firefox38-l10n-38.7.1/en-GB.xpi) = 5c907f8f4ccc4f6761c5319867af71419b176d2e +RMD160 (firefox38-l10n-38.7.1/en-GB.xpi) = 3a0e7af2336e7003a3f33fc406511f73ec9f42a2 +SHA512 (firefox38-l10n-38.7.1/en-GB.xpi) = a0b7fa1d021294c6537511ff0e3b925e9d11cb94e6e3987a9ef9db17306df3a3f95532c571c6c6297952fb9389a74ff692a204b1670df9f7a2422ad1c3c928f2 +Size (firefox38-l10n-38.7.1/en-GB.xpi) = 437845 bytes +SHA1 (firefox38-l10n-38.7.1/en-US.xpi) = e61b9404ea9593edfffb072c0c7271a9b4d448ef +RMD160 (firefox38-l10n-38.7.1/en-US.xpi) = 9db14a1788cf795c8b337269d6b43c353d497ce0 +SHA512 (firefox38-l10n-38.7.1/en-US.xpi) = 4be98bfc671813a1091f1b60471b6273aad25ea90ced4d2c28c1ffbf6ed07271dd99a003184073f7db50ffde52fa7439cb1035613373a045825c26e333f20e9e +Size (firefox38-l10n-38.7.1/en-US.xpi) = 469718 bytes +SHA1 (firefox38-l10n-38.7.1/en-ZA.xpi) = 9c105fab1896d8559af298d0c6b3ae0d4ee168a9 +RMD160 (firefox38-l10n-38.7.1/en-ZA.xpi) = 6382294ba7a4496dc4b0dbd3fd9a2f5d55195a9e +SHA512 (firefox38-l10n-38.7.1/en-ZA.xpi) = 86e003b473968485883b8ca4a5978f6d56faf86577c2a0ee4c5f02ad49245706330555ada0fe63e7d70686ceda1cca684e28d0d5a0577aa3bd4ebef74d58bf10 +Size (firefox38-l10n-38.7.1/en-ZA.xpi) = 439925 bytes +SHA1 (firefox38-l10n-38.7.1/eo.xpi) = ebe2a6679a468223efebc918fad765f2cb16b878 +RMD160 (firefox38-l10n-38.7.1/eo.xpi) = 7cab20645d7fdeb07448f349400bf063f76fefd8 +SHA512 (firefox38-l10n-38.7.1/eo.xpi) = 1621d94ff6a8be857f956b3683b945e52c763cfaf63effa23050fabb69794a7aa68511db3da3535e9e65c4b11cd8ba1e924954d3d66c8f20e39c6ac6b44712ca +Size (firefox38-l10n-38.7.1/eo.xpi) = 488369 bytes +SHA1 (firefox38-l10n-38.7.1/es-AR.xpi) = 955148417b56ce1abf6fd3573c81c05f7a7fcfc3 +RMD160 (firefox38-l10n-38.7.1/es-AR.xpi) = dece43c7755ba8261cd411cb87c68c346023e8ec +SHA512 (firefox38-l10n-38.7.1/es-AR.xpi) = 1d91e0f22c697dc52c01315c31b2e2ec2b871bb4675891bb0818516aedb1524749e3f1bd0b1aba4a244ea7c861ca253cf5da6b6f596492a1b076e40f48d659af +Size (firefox38-l10n-38.7.1/es-AR.xpi) = 453983 bytes +SHA1 (firefox38-l10n-38.7.1/es-CL.xpi) = 885c171e07ed75db455ad4904171d26652a6f04d +RMD160 (firefox38-l10n-38.7.1/es-CL.xpi) = ad45acfeeb4b0c0dd5b508e6432debda6a296801 +SHA512 (firefox38-l10n-38.7.1/es-CL.xpi) = 9e411ebce6bd0f626e4aaa6b7ff9e80b1369f5c107562165550efc3c8db44caafa7ce9b11c32e6702fedd76aee4468b30cc28591240ea467e02c60dbc665bfe4 +Size (firefox38-l10n-38.7.1/es-CL.xpi) = 384678 bytes +SHA1 (firefox38-l10n-38.7.1/es-ES.xpi) = 16b466ebfb706b191e1714a70b892c6b7960c073 +RMD160 (firefox38-l10n-38.7.1/es-ES.xpi) = d04c2fc44910cff250b11203985469e5237080c8 +SHA512 (firefox38-l10n-38.7.1/es-ES.xpi) = 6ab36942b0cec8c5687405b6a1a9fa4497480b31c9f4aa044184106f76995a4e145644c7b0bb737c731ea0fd4c82e2497b135010d10cbf1a7dea9ac36f371f7e +Size (firefox38-l10n-38.7.1/es-ES.xpi) = 374073 bytes +SHA1 (firefox38-l10n-38.7.1/es-MX.xpi) = b56898321908b13cc7f038eb3102f67be2639ffc +RMD160 (firefox38-l10n-38.7.1/es-MX.xpi) = 2dc9a249a100ec1e714acebc19728f7b7dea2d89 +SHA512 (firefox38-l10n-38.7.1/es-MX.xpi) = 94a1bb297999392d3e2e87632f556c2981d1b57886d1cb5ac8492d7c9854b153ed4f3a8f6e4b773f7f40252492443638a1fb78ec3e335296471e82082f16eb53 +Size (firefox38-l10n-38.7.1/es-MX.xpi) = 457049 bytes +SHA1 (firefox38-l10n-38.7.1/et.xpi) = 652933b3fe16f78c549866c09aa90f5dde776f57 +RMD160 (firefox38-l10n-38.7.1/et.xpi) = 554608c13a08c5924c566753885228694571a511 +SHA512 (firefox38-l10n-38.7.1/et.xpi) = 625e3a5a6330268bbbb09abddc6d5a18d0be8d8c680a68f93cc1fc7accf7e5ec0ba2db267b63f3d17caac317b847b5644e13a8d98b332ec30012b140e2b883e0 +Size (firefox38-l10n-38.7.1/et.xpi) = 443229 bytes +SHA1 (firefox38-l10n-38.7.1/eu.xpi) = 35e64d0c7d2f7403d9419fb5efcc3d941a3cf382 +RMD160 (firefox38-l10n-38.7.1/eu.xpi) = 7f59b7ac9e658412cb1c1d9d4c12e852881ea6ba +SHA512 (firefox38-l10n-38.7.1/eu.xpi) = c5a393553121d771b6f9b0b85da33632ed4c718b286cf908a8f92ef0832c8101e387d8957115111e0443eb8131d2d104af013182a609e2774da27a0781c99357 +Size (firefox38-l10n-38.7.1/eu.xpi) = 466555 bytes +SHA1 (firefox38-l10n-38.7.1/fa.xpi) = 161910f51ae6a33665036cafe7db6f05380a7bf7 +RMD160 (firefox38-l10n-38.7.1/fa.xpi) = 1a98e6d94c3f49da3cb467450cad7d95e5635e0c +SHA512 (firefox38-l10n-38.7.1/fa.xpi) = 23b5c10ed19e2087bfce7568d85d366c732f87edc47b564f2c7538ebc36801957f48b6b70d4776e3434a12185c63ac5da48ad288e137cbeb944ff05cb86c9e77 +Size (firefox38-l10n-38.7.1/fa.xpi) = 518282 bytes +SHA1 (firefox38-l10n-38.7.1/ff.xpi) = d52e3b0bfb2ee651630e0b2a7521f93414680c85 +RMD160 (firefox38-l10n-38.7.1/ff.xpi) = 7d99f1f6f63bd9b32ca72bf9f1b19de9ff01cec1 +SHA512 (firefox38-l10n-38.7.1/ff.xpi) = 6f45378860ec20a0d0cb1719b8477a33e24ec77ef3757e604801161252f1f0eb621c0e2caa0c14a21ba96a10ff3e5d2047569795ef4761d50f48d246f8e1b9fa +Size (firefox38-l10n-38.7.1/ff.xpi) = 454587 bytes +SHA1 (firefox38-l10n-38.7.1/fi.xpi) = 6398f809a816acc0f9f236675f0bbb9b9d561bdb +RMD160 (firefox38-l10n-38.7.1/fi.xpi) = 76f8e8e4ebf752decbaa869496e18d97b871aac9 +SHA512 (firefox38-l10n-38.7.1/fi.xpi) = 57bfb7c37cc8cc264445f78907fabf2c079e75cfac7016d5770076e4a2b08e891f14a84eeb4cf69a3f1364c762432f7a62de718e79cb5b98a9c6ae62f5c2013d +Size (firefox38-l10n-38.7.1/fi.xpi) = 444852 bytes +SHA1 (firefox38-l10n-38.7.1/fr.xpi) = c8beef0da00553e9a4e9004c70be5f9d29145378 +RMD160 (firefox38-l10n-38.7.1/fr.xpi) = 5154bb270e621e625d4e33da62143e2f0baf90ad +SHA512 (firefox38-l10n-38.7.1/fr.xpi) = 0a2f322b2808f41555c05d1ea07491309f981b2127a376e42a1aba19df3b627231180e2155d995149a795bd3863048cc870723ed3d5950f7e38322b242937553 +Size (firefox38-l10n-38.7.1/fr.xpi) = 461402 bytes +SHA1 (firefox38-l10n-38.7.1/fy-NL.xpi) = fcec4b014a53212f04805fe21960040e5fd676ce +RMD160 (firefox38-l10n-38.7.1/fy-NL.xpi) = d01fd89a3801877a5603c747b26843eb1541790e +SHA512 (firefox38-l10n-38.7.1/fy-NL.xpi) = bce0ddc5ffa7a794ffd15df98f49240bb0aa367fd587332be73072149df2188432c90783e33dfb6c08b12edb9e6208b6529429e2a9f73ba0940973fadb4c2aa9 +Size (firefox38-l10n-38.7.1/fy-NL.xpi) = 455541 bytes +SHA1 (firefox38-l10n-38.7.1/ga-IE.xpi) = 7d74c0cc3d771a1dfe4b2f06176ddaaa78f1b491 +RMD160 (firefox38-l10n-38.7.1/ga-IE.xpi) = c7b71888dbc029ec77a60030ec810d4e7f130356 +SHA512 (firefox38-l10n-38.7.1/ga-IE.xpi) = 9b7fc8dc0caebb125086f09afb58238202c33b08084330b0bbe4433a55fea7c193d96a25d968306de9829d8e244dfaa405a56cfebddd133f48de1d43358b8a5e +Size (firefox38-l10n-38.7.1/ga-IE.xpi) = 469623 bytes +SHA1 (firefox38-l10n-38.7.1/gd.xpi) = f5b23d679ef1e3eb420403d4bf3d939bd9ed0f09 +RMD160 (firefox38-l10n-38.7.1/gd.xpi) = 067953a10d42ab380bff2dbfd171b77d91876daf +SHA512 (firefox38-l10n-38.7.1/gd.xpi) = 7148bfa60794c63bd6dd935b99ddc611cac96a4e0a430baf55fe446f0e185744fd42b05b365729c5dd10fb5d95911fbd5507e5153d87834bd234aa33c88a37b9 +Size (firefox38-l10n-38.7.1/gd.xpi) = 454616 bytes +SHA1 (firefox38-l10n-38.7.1/gl.xpi) = 40950a8090b8aa0d86d8f98b9bf1f0c82bdfc418 +RMD160 (firefox38-l10n-38.7.1/gl.xpi) = 2718726bf8414a2c140acc44ad9a1e2d56c98dbf +SHA512 (firefox38-l10n-38.7.1/gl.xpi) = 26383d81fd809ee08e97662b050b5286a8eb6d3cbade3c7dad54493f482115000df41380c6918aadf8d86d3e0974b4505b5f08550a01e6230392bf1b10e946d7 +Size (firefox38-l10n-38.7.1/gl.xpi) = 448925 bytes +SHA1 (firefox38-l10n-38.7.1/gu-IN.xpi) = eb0fe1f401b7a6ee33ecb286e2249eac7b15399c +RMD160 (firefox38-l10n-38.7.1/gu-IN.xpi) = e357208c883b09d1dd08b937b48c56bac76fde77 +SHA512 (firefox38-l10n-38.7.1/gu-IN.xpi) = f3784006acba735c6727ec0eaa70015b897706c33037e0d86889296c33725c1293f69ea51d32b3f6ae011b95615c770200e8d3543cf8085985f34dfd46e1b04c +Size (firefox38-l10n-38.7.1/gu-IN.xpi) = 477980 bytes +SHA1 (firefox38-l10n-38.7.1/he.xpi) = 80ba060c9507471bff31ae0ab3b033573f11358a +RMD160 (firefox38-l10n-38.7.1/he.xpi) = 3d3482f2e0e90cfdd578b384feab9d370779aa37 +SHA512 (firefox38-l10n-38.7.1/he.xpi) = 335acd25da005b2c3fc58f7b0c19ac3e9c862184a3b1064443a3b12c6cf9f036667c0ee2779fc77ef68bea45b98769406564564f208ac3432dbab7dcdad2bd83 +Size (firefox38-l10n-38.7.1/he.xpi) = 486786 bytes +SHA1 (firefox38-l10n-38.7.1/hi-IN.xpi) = d67d8d1b0eb411613e2d9a026d1057539ba988c9 +RMD160 (firefox38-l10n-38.7.1/hi-IN.xpi) = 0bec320e6913867c6f987c83dc85a59807dfe5b7 +SHA512 (firefox38-l10n-38.7.1/hi-IN.xpi) = de3a6e8be13cd2fafcf67e839cb8adc127a454197c09431cb824d22ef19ce94edd5c24124f78cbf4f9be1246d164a24a111cc692334b0ad4bf41529fcd8112ab +Size (firefox38-l10n-38.7.1/hi-IN.xpi) = 508167 bytes +SHA1 (firefox38-l10n-38.7.1/hr.xpi) = 6c2fef9f43fdba948213235789d617bee4aff18c +RMD160 (firefox38-l10n-38.7.1/hr.xpi) = 298f5bca1c0861da31aa720efa85a2bb6671997a +SHA512 (firefox38-l10n-38.7.1/hr.xpi) = aa41abe39116a377c3197c6b749463279d934143a72f80f8d10ae271839b3e69f7f7a06045fce7bd168694ef1a4495c8148ffb79fc027ca7e87fed8266c15f42 +Size (firefox38-l10n-38.7.1/hr.xpi) = 478272 bytes +SHA1 (firefox38-l10n-38.7.1/hsb.xpi) = d419800b3b6adc4f4d479fba5723152ecb50edf3 +RMD160 (firefox38-l10n-38.7.1/hsb.xpi) = 18e56d5d38a93c89d3aa79f9934ddd29732c8188 +SHA512 (firefox38-l10n-38.7.1/hsb.xpi) = ec641a6653cd86a5108da1b513fe12ac38769b3b3bba1e9961457e13388facd227a80fd0b6da3d369a4cee0af4197f505a20199728e646ee3a198eb7211bcf55 +Size (firefox38-l10n-38.7.1/hsb.xpi) = 468719 bytes +SHA1 (firefox38-l10n-38.7.1/hu.xpi) = a04a4052dbeae7b1326fdbace2f91c4ac5792807 +RMD160 (firefox38-l10n-38.7.1/hu.xpi) = 0b39bce2526345fa8dc9b9e1905eb56d4c462c26 +SHA512 (firefox38-l10n-38.7.1/hu.xpi) = 8892e1919683df8c584c011bcfd21c5156a0731495145a259801c84ff3f0058c313f60bab399ccb2520a5f2ed36413b1e57582734b245684d1b5efd166624e97 +Size (firefox38-l10n-38.7.1/hu.xpi) = 453555 bytes +SHA1 (firefox38-l10n-38.7.1/hy-AM.xpi) = a3fef68c794fc7ed83a6a25591ca1566e8a1135c +RMD160 (firefox38-l10n-38.7.1/hy-AM.xpi) = 7ec40b3afeee9a3c569e1e97b1d47f9a451eff39 +SHA512 (firefox38-l10n-38.7.1/hy-AM.xpi) = f8614add7352c831dbe303cae5615de15c5a711091c30ff943a76c9c7e5684f2f2568817fd78018cd802c00c46ab0a153e30fdf08561cb2cda1af7dc6379a276 +Size (firefox38-l10n-38.7.1/hy-AM.xpi) = 534265 bytes +SHA1 (firefox38-l10n-38.7.1/id.xpi) = 42e039c3292a165781a439aa17dffc1b70ac8dd2 +RMD160 (firefox38-l10n-38.7.1/id.xpi) = 3fe088092b01b21bced2340704e7f1c3d043ef65 +SHA512 (firefox38-l10n-38.7.1/id.xpi) = 2460c100a84e50305c68b9fe27c7048b125c5d95d83bb80113e72132d2f68bc671ed4175569eba154ca0d4c7a5e3f69d4e4bfb4e1735cb21367aaf890102b621 +Size (firefox38-l10n-38.7.1/id.xpi) = 431489 bytes +SHA1 (firefox38-l10n-38.7.1/is.xpi) = 49101ce79d80953af3d5a6113d2dc430a0eef2d1 +RMD160 (firefox38-l10n-38.7.1/is.xpi) = d92ac06822c162d3dd1d6b0f8625c2f5b9b9c085 +SHA512 (firefox38-l10n-38.7.1/is.xpi) = 2c241333c24cacec39968ba5e3230d09e8353b94a42e3ddc047121af144e98c4667c0357cb73da58b339becdbd3b90904519030b9f30b4b19530384c51428317 +Size (firefox38-l10n-38.7.1/is.xpi) = 485128 bytes +SHA1 (firefox38-l10n-38.7.1/it.xpi) = 4f06a65d525fc69935233e75d088b757eb552415 +RMD160 (firefox38-l10n-38.7.1/it.xpi) = 2f6fac7731452e6f8e098f886de0cfaa2a1cd73f +SHA512 (firefox38-l10n-38.7.1/it.xpi) = 49b1a7c459dd2394187f5224c6e2a7d28c4db90613ef3b608cdc7736dbeece5950109adc2fa6620b5376665fcc615d4fdd5c1882c0d58d1f4f3f41999ec690d8 +Size (firefox38-l10n-38.7.1/it.xpi) = 368409 bytes +SHA1 (firefox38-l10n-38.7.1/ja.xpi) = 0838f84b65fa2eedb7a8edf7249faabeaca25080 +RMD160 (firefox38-l10n-38.7.1/ja.xpi) = 8bec82c5407dd0ee9678a5a30b2d9b8c92cbc611 +SHA512 (firefox38-l10n-38.7.1/ja.xpi) = 0f4d51778f751d3bd3ed84b9ee5d0c41b8b94da6d703877a99c4b3b803b37366a8a5ca627fc287ce4b7d12b3c3c8ac663c6fae4a74cffc7fe598fe37cfdb62e5 +Size (firefox38-l10n-38.7.1/ja.xpi) = 479113 bytes +SHA1 (firefox38-l10n-38.7.1/kk.xpi) = c67990b947cc31d58637faa95ee02621e2f84ed6 +RMD160 (firefox38-l10n-38.7.1/kk.xpi) = 31e5e249f51c51c922a528e22142f7ace3a72722 +SHA512 (firefox38-l10n-38.7.1/kk.xpi) = ec9928525205c07cb3f6b5e0bcb8d9cef6f2bf2253308edf4f51d4270fc598f05b5e7a197b82d84a645d73c4e7af062887a014bf127173467fed08d59a60a102 +Size (firefox38-l10n-38.7.1/kk.xpi) = 503568 bytes +SHA1 (firefox38-l10n-38.7.1/km.xpi) = 593b896c1c0529fdff4284fb5428b627a82e9522 +RMD160 (firefox38-l10n-38.7.1/km.xpi) = 7a56c3bd96d3d430d8b072d8be4d88993ef038ec +SHA512 (firefox38-l10n-38.7.1/km.xpi) = 21a709e87f7670b948c2bc32c5ad77f1b8542676ef00440666bd5adb924cdbaf3c64aeb35c328343070f4b9597eb6a48089e93fea9511e7b08447dc53b9b215f +Size (firefox38-l10n-38.7.1/km.xpi) = 565674 bytes +SHA1 (firefox38-l10n-38.7.1/kn.xpi) = 73d0f530b2721faf4dc2861b5ef05bf77b5243d4 +RMD160 (firefox38-l10n-38.7.1/kn.xpi) = 474c2790c707011ec6c4ffb0105026f0f2bd68c7 +SHA512 (firefox38-l10n-38.7.1/kn.xpi) = 3f9b979efa07b6f60a0e5ca584ccb9cf1126f8330c9600b69497933bbb7ea3fef9b1863e4a643b752ac947afa3a9f1ad1aedd8c93301a85e2382724f5721d2e8 +Size (firefox38-l10n-38.7.1/kn.xpi) = 533464 bytes +SHA1 (firefox38-l10n-38.7.1/ko.xpi) = a465f9a4283f968db08b8294c27f912c9b437204 +RMD160 (firefox38-l10n-38.7.1/ko.xpi) = 1b6df4d594e12fbb326fd00543103abbb047331d +SHA512 (firefox38-l10n-38.7.1/ko.xpi) = 9100dd0298a430d713edae6e324c6d4faa2325acf0d08ef0daf57d01a9182375c42b844e581952f30eb81083dfde660f903e9e0b2a4ba725e309e3330640edd3 +Size (firefox38-l10n-38.7.1/ko.xpi) = 460854 bytes +SHA1 (firefox38-l10n-38.7.1/lij.xpi) = d61044108cdcb965238f14bd66ca538127c26cc3 +RMD160 (firefox38-l10n-38.7.1/lij.xpi) = 3cc6887e21919433b9ef06ffbe327760711e744b +SHA512 (firefox38-l10n-38.7.1/lij.xpi) = fc4f189318d2d5fe86b75660114448cda083558c31e3db84ebb161a855393f2f433f7de208330fc3c5f379440f7671ebe8df768b0097ebfc480e4054c485381d +Size (firefox38-l10n-38.7.1/lij.xpi) = 444241 bytes +SHA1 (firefox38-l10n-38.7.1/lt.xpi) = eea3404135291551eeb88e807f9fed1b8cb8e2bc +RMD160 (firefox38-l10n-38.7.1/lt.xpi) = 9a0d996fa26a91e339a9e9010ffc62996c6015aa +SHA512 (firefox38-l10n-38.7.1/lt.xpi) = f6c04de63789cb3a6f22f62f74963139486c6de9c27821a77f85af50c504b25c15e704d902e777b20d093d9f148277421377332f18cc588df20b5c1780af337d +Size (firefox38-l10n-38.7.1/lt.xpi) = 486452 bytes +SHA1 (firefox38-l10n-38.7.1/lv.xpi) = a359f62b3caa83e13364ffe66f293d9985801af8 +RMD160 (firefox38-l10n-38.7.1/lv.xpi) = 3f9d693d406376d3a55f75ecf46ecc2b5bac3a69 +SHA512 (firefox38-l10n-38.7.1/lv.xpi) = 891f5ab03aaa96fced247253af30a3d0cb966063ac75272761fc7d2eda8bcc6f16e1b04bd099dc9b1c93af4da693f4b38e96823876920c37457c7e1378d05bbf +Size (firefox38-l10n-38.7.1/lv.xpi) = 467198 bytes +SHA1 (firefox38-l10n-38.7.1/mai.xpi) = b86555a881abac560666761b420a8df4f971c1ff +RMD160 (firefox38-l10n-38.7.1/mai.xpi) = 83b00494077d3e3e672f1c8b755e756691ad9d23 +SHA512 (firefox38-l10n-38.7.1/mai.xpi) = fa6254a32f1498796f0480568e786d281bf33230b7d753434c7048230425bf2fbe22eb7feea11cdab974caa9e2000fbbd00106edf2185e8285d7cd0a794e2b68 +Size (firefox38-l10n-38.7.1/mai.xpi) = 514665 bytes +SHA1 (firefox38-l10n-38.7.1/mk.xpi) = 0aed3e06c7c1aae84cd41ebf4bc0351031c37a02 +RMD160 (firefox38-l10n-38.7.1/mk.xpi) = 8200c4d0f8470cd7bd8e12b97440b9c24294aba0 +SHA512 (firefox38-l10n-38.7.1/mk.xpi) = 13ada7ccf264ae34558cf3e5fd6b576b7f89c5e70b359a1df01f59ad19c188b7c437bd16f3a261742a46902feb75fd8c5cb6052aeaefb179a1d4e51eb2518292 +Size (firefox38-l10n-38.7.1/mk.xpi) = 529205 bytes +SHA1 (firefox38-l10n-38.7.1/ml.xpi) = a39ba48cf04bc5433f489e06b6863d90af049006 +RMD160 (firefox38-l10n-38.7.1/ml.xpi) = 26516fbd0b36149ef8e621f8ac92f6f179ee7dd1 +SHA512 (firefox38-l10n-38.7.1/ml.xpi) = ff406ad997e8b2d4cc2b575e07bb5abb50083ef5c32ed7618cdf14e5dd1c395adb5cbe6ce3daed36284741c275318df014559dc23ea997f9c45ba2d4bc40825f +Size (firefox38-l10n-38.7.1/ml.xpi) = 528919 bytes +SHA1 (firefox38-l10n-38.7.1/mr.xpi) = ef8640e37fe07223b2029a28c457cdd58bf36442 +RMD160 (firefox38-l10n-38.7.1/mr.xpi) = a489716c3e95328b96ad60327d3fb42e239d949d +SHA512 (firefox38-l10n-38.7.1/mr.xpi) = adb3a0fa8e6bda74961fac63e4300f9ac06bc8e364519fcbdc125b8f8a4c5f63a907ba14b9a64d9f993a6e024744044fb577fef38ba412b7d370f82bfd39ae7d +Size (firefox38-l10n-38.7.1/mr.xpi) = 505961 bytes +SHA1 (firefox38-l10n-38.7.1/ms.xpi) = 7ad4522fd94bd6c8cca920bc37d4a0e5ad060fe8 +RMD160 (firefox38-l10n-38.7.1/ms.xpi) = efb23e45257c90d0527777f91e4389f1f6bb95dc +SHA512 (firefox38-l10n-38.7.1/ms.xpi) = eb689299b0b57d01cdde446efaa50da0e2097e8c7254b4383befcbd6cf1c4451735cf083e2de679073a9f2396afb746f3d9873c7e440da3c6222ca8c847d979c +Size (firefox38-l10n-38.7.1/ms.xpi) = 489872 bytes +SHA1 (firefox38-l10n-38.7.1/nb-NO.xpi) = 082daeb2bc7ab948acd1424fa4cc7dd026db3ff3 +RMD160 (firefox38-l10n-38.7.1/nb-NO.xpi) = 6e4fb9dec49cde116a033832ae965c624dc0face +SHA512 (firefox38-l10n-38.7.1/nb-NO.xpi) = 49d46fa1212ba1cd56f6320ec14e309c1b45fd1a32a5078606a29915fe2029d6f26244fb301ff56568892366018ac781da3a2c4afb9703b63c964dce4e10eb2e +Size (firefox38-l10n-38.7.1/nb-NO.xpi) = 444176 bytes +SHA1 (firefox38-l10n-38.7.1/nl.xpi) = 19e74d686ccc899fda37c0a0cb2409e1f3e8c667 +RMD160 (firefox38-l10n-38.7.1/nl.xpi) = ce721adbc1e04b9f33b0a0b33228df63ed9d46f9 +SHA512 (firefox38-l10n-38.7.1/nl.xpi) = 39f2a3997904480de057859eee869a8c3f019894cb841100de585fe1f711a624274cb609bf4677960f8269f8ba6db4e6c65ec1a263bfb3a0a871c5774929f662 +Size (firefox38-l10n-38.7.1/nl.xpi) = 443994 bytes +SHA1 (firefox38-l10n-38.7.1/nn-NO.xpi) = 6b89e139808769c4db0fd6d9ba33ea3289bba405 +RMD160 (firefox38-l10n-38.7.1/nn-NO.xpi) = e78cb4c29f24fd5f22cb3cb8a2890e768ab40e68 +SHA512 (firefox38-l10n-38.7.1/nn-NO.xpi) = 37324b79f438b69d11a812c42e245ade3376fbdb7f4e47e47d7efa15397bc85526ffe79f22f41b76026a4f018e537c5f0d5785a55d6f1e35214cc52865a09d6a +Size (firefox38-l10n-38.7.1/nn-NO.xpi) = 438451 bytes +SHA1 (firefox38-l10n-38.7.1/or.xpi) = a96a53b13c22351bbd2afec8c2cab7cd94ad09b7 +RMD160 (firefox38-l10n-38.7.1/or.xpi) = 8a01c6fbfb7a6d8c6072d55c28f32b59f1b67631 +SHA512 (firefox38-l10n-38.7.1/or.xpi) = a89f828eef1b61702241939625fd7a9c3939466ed5cb3c5bde2bc9e0c98bd929dba1a77c04ee1be4930610eedb8fc614b1df89a74ead53fffc32a9c5054b54bd +Size (firefox38-l10n-38.7.1/or.xpi) = 527049 bytes +SHA1 (firefox38-l10n-38.7.1/pa-IN.xpi) = 0f2cd71883cc3e303aba57d2260aac907770a6f0 +RMD160 (firefox38-l10n-38.7.1/pa-IN.xpi) = 414f6d42cee59326f64494e275ecd7cea0a84c5b +SHA512 (firefox38-l10n-38.7.1/pa-IN.xpi) = 25a52b5c832bb42a5a808d0536dcf117a59f4adc755825ce38a8add0bee2408e202010ad2fe009834b1eaf78b7eb8a2a357914bb4ed9b4e833e820d2d4fe3573 +Size (firefox38-l10n-38.7.1/pa-IN.xpi) = 493722 bytes +SHA1 (firefox38-l10n-38.7.1/pl.xpi) = 30ac12be0cceb6a35edb74892b1cd4ab5c172caf +RMD160 (firefox38-l10n-38.7.1/pl.xpi) = ac363f84752c8e1c49b8fa5fb38c9013ff756d71 +SHA512 (firefox38-l10n-38.7.1/pl.xpi) = 7ff2aa5c5d0981289aa91ceaf4827ddbfb94cfe74ff9846022f9ac9db2c5d76044be20588150d2d0ea217b303d438cdc54941b0ffb7c590aa2f49a9fa4439763 +Size (firefox38-l10n-38.7.1/pl.xpi) = 406566 bytes +SHA1 (firefox38-l10n-38.7.1/pt-BR.xpi) = 08c4c9c326af8e2219e30c72bc1e1bce242eaa57 +RMD160 (firefox38-l10n-38.7.1/pt-BR.xpi) = 8967e3eb8721aa110206c734eb34cafcf2f08b89 +SHA512 (firefox38-l10n-38.7.1/pt-BR.xpi) = 59898a93e94f2c7519d103b7831ca1192387ca03d842f7819d83c91e051dc0616471fbb9c5f6969b243aed8c0d2ca90205ee1ba2ab1557dd18c454eeb5cdb52d +Size (firefox38-l10n-38.7.1/pt-BR.xpi) = 459810 bytes +SHA1 (firefox38-l10n-38.7.1/pt-PT.xpi) = 3c90210d0e338f221c003a1a83089ed1cb3dc239 +RMD160 (firefox38-l10n-38.7.1/pt-PT.xpi) = aa3ce7c8f229d2924395ea9ac646775716cc6fab +SHA512 (firefox38-l10n-38.7.1/pt-PT.xpi) = 02c70136352b796f2119bec4989f21b3854c070518142270601a60e256c0c6f5b9ba4e36bd34ec4ffd84aba671230996fcd08eee97bd8086af07d7f52b573923 +Size (firefox38-l10n-38.7.1/pt-PT.xpi) = 439975 bytes +SHA1 (firefox38-l10n-38.7.1/rm.xpi) = 17a44839272bb58ca8102a035f6ef046af43e4b1 +RMD160 (firefox38-l10n-38.7.1/rm.xpi) = 9ddbfc0e699f010e347bcc36674295f75e3c01b6 +SHA512 (firefox38-l10n-38.7.1/rm.xpi) = 7e40a88dfb8e37944cbacaf8b3c63fda459533a9fe09cb1ce13595f28c3fbcf5faed8213876fdaeb841e9adcdbdb09fc2c78b28a754f50270248a6679667c6ce +Size (firefox38-l10n-38.7.1/rm.xpi) = 446287 bytes +SHA1 (firefox38-l10n-38.7.1/ro.xpi) = f3d0058172f0ba4c8ae072e3369e30f6be162a2d +RMD160 (firefox38-l10n-38.7.1/ro.xpi) = e97c2849761429645416504c65cb87e7bc702b69 +SHA512 (firefox38-l10n-38.7.1/ro.xpi) = ca78c8e0b725f99dc5e51fa8ebef466412c4b974b09037233d780efa160761ad94ab2bff5772c2d961ada01f8959b5329666ea1c69184d40f346c5df42ba7c4a +Size (firefox38-l10n-38.7.1/ro.xpi) = 494078 bytes +SHA1 (firefox38-l10n-38.7.1/ru.xpi) = ec6c59e64825ed196e96d9df0f9d5d025d939eb1 +RMD160 (firefox38-l10n-38.7.1/ru.xpi) = 6c332c4a677cf15ec4f54c5d4a6b25dc24501ce3 +SHA512 (firefox38-l10n-38.7.1/ru.xpi) = 1a47686624362d270f627ea8318042b79e3b171bb4151a2f70a5f9131a53ff4d9a6668e5cd17d4501ecc40d06761deb77782380bd86349642e9f40a6299b4be2 +Size (firefox38-l10n-38.7.1/ru.xpi) = 414419 bytes +SHA1 (firefox38-l10n-38.7.1/si.xpi) = 8dea401276d6bf7e9c96d6f37bf215024653c6a5 +RMD160 (firefox38-l10n-38.7.1/si.xpi) = 5a947a6ffd233b4096f58e8749727650095cbede +SHA512 (firefox38-l10n-38.7.1/si.xpi) = d2172b429291a7739fc05229aac4ca2c79d129fe4f92d86c2e9af8ecb2b9be222f754da681a7fbf1811da1199edb3ee44a4e9e84fb9e2c681bb357fd9db46d9f +Size (firefox38-l10n-38.7.1/si.xpi) = 537393 bytes +SHA1 (firefox38-l10n-38.7.1/sk.xpi) = bd0bac3b977816cd687ef12fd39a5f18d7d4009f +RMD160 (firefox38-l10n-38.7.1/sk.xpi) = 8cea6915cf08b7e7168050061dceca61edc0f5eb +SHA512 (firefox38-l10n-38.7.1/sk.xpi) = f37607691cf3f5e3cb701f877e5fddb5e69572a0542926456d2d7fbef34df4376f76e0c9ab329bbe912aa654f2156e2fde050df214a718b06f77ee73e7296672 +Size (firefox38-l10n-38.7.1/sk.xpi) = 469436 bytes +SHA1 (firefox38-l10n-38.7.1/sl.xpi) = 9d31cdb369f88c0b1bef914d3e20425930eb32cc +RMD160 (firefox38-l10n-38.7.1/sl.xpi) = 89d6a60cff7b0af0d18db1e6862c7c162a038584 +SHA512 (firefox38-l10n-38.7.1/sl.xpi) = 1e8871e8b55208a8e40604f2a2e639b242841864547b1e7d7f399e41afa88732bf82bd31dbfe15d44c6daabe6380d39f541487957c09946db44f3a2ab55bcca0 +Size (firefox38-l10n-38.7.1/sl.xpi) = 441594 bytes +SHA1 (firefox38-l10n-38.7.1/son.xpi) = 71112496d6efcb61a733cea76480c2ef9378d5dd +RMD160 (firefox38-l10n-38.7.1/son.xpi) = bf90661e44a792ac6dc79198d623f98e61a0e200 +SHA512 (firefox38-l10n-38.7.1/son.xpi) = b462b2bd26635a09fe52d5628a80ec477497af44b64d9527797363e2734f5d24c60b46123db1480cc63452510179f904be095414a158e1a4ea847b7c809aef93 +Size (firefox38-l10n-38.7.1/son.xpi) = 449268 bytes +SHA1 (firefox38-l10n-38.7.1/sq.xpi) = 85937578e5388de19be97294ff67bb067fa3486b +RMD160 (firefox38-l10n-38.7.1/sq.xpi) = 361a99e40bfcf4bfddb051f16fb705249f77d779 +SHA512 (firefox38-l10n-38.7.1/sq.xpi) = 333d57718d329236ee5e44663d62fd980bfc1db0996b6ab8b450e4669ec0cd97050642e6e650e254b1e10b4daa33cc07602c54712e6f97488815292317f6ea81 +Size (firefox38-l10n-38.7.1/sq.xpi) = 486076 bytes +SHA1 (firefox38-l10n-38.7.1/sr.xpi) = 00f9452384c78e02ac80906ec231f50cc5504eed +RMD160 (firefox38-l10n-38.7.1/sr.xpi) = 6037e9f2596994ff4a2b190955193d1e60b55273 +SHA512 (firefox38-l10n-38.7.1/sr.xpi) = 061c08e33ce1c3178b53f27079d3d544320a16bacfa9be0544e3052d762a7b0c7bcbf2f8792f8642379857928c8d8952a5aecc46ef89f6aef61835fe827a5a8f +Size (firefox38-l10n-38.7.1/sr.xpi) = 479419 bytes +SHA1 (firefox38-l10n-38.7.1/sv-SE.xpi) = 0efa0d5f0cb3c7cc00662ca977fbb1d46a4b0007 +RMD160 (firefox38-l10n-38.7.1/sv-SE.xpi) = 2c8ebd4605ffd3b68d337c7a7d9c9680913313eb +SHA512 (firefox38-l10n-38.7.1/sv-SE.xpi) = 9357cc8dced330bccbffc1cdb7982d7fdf71a643dffd8e0c273b253e64b78ed65178d0ae6ec6c1dd3058b357f529a9615776363edfa51b7acc248dd5c8f59231 +Size (firefox38-l10n-38.7.1/sv-SE.xpi) = 452633 bytes +SHA1 (firefox38-l10n-38.7.1/ta.xpi) = 24e8f3ec4e939381e4b12469d7b7a02296b27724 +RMD160 (firefox38-l10n-38.7.1/ta.xpi) = 45de0f99dab9eb3cf6e303d337afe4e015083a33 +SHA512 (firefox38-l10n-38.7.1/ta.xpi) = 207536c1130d9fe4ca30896d8b3bad32d308c4fb1a9899545e2aaf0b2df781cae1174c922fcdc65b99ca70c0f91cf65540ccac22a031d0e9d6ad2194d0bc39c4 +Size (firefox38-l10n-38.7.1/ta.xpi) = 506607 bytes +SHA1 (firefox38-l10n-38.7.1/te.xpi) = ac0c4f02b25001d52e432853c133a4c7eb8e57c1 +RMD160 (firefox38-l10n-38.7.1/te.xpi) = c0cdb38d8e2fcbfea0516a39d8451076f4e5e460 +SHA512 (firefox38-l10n-38.7.1/te.xpi) = 9500fe051955c19bfb6e99670b275310fda02d68b1ec043ca798e37dbc529b8f03128015d5c7c2b271db00e8c546fc8d3d48b36057148cab796c93b20cd72cfb +Size (firefox38-l10n-38.7.1/te.xpi) = 526250 bytes +SHA1 (firefox38-l10n-38.7.1/th.xpi) = 5891dbbd872561d3b21471668e989ac8f3ca0244 +RMD160 (firefox38-l10n-38.7.1/th.xpi) = 5b2fa975aebba920cdba8636ee58d18404dad0cb +SHA512 (firefox38-l10n-38.7.1/th.xpi) = 69237832fe1d69c10e37f4dbe2b00933993165d6e289173ab22b7c1ebeea24e45f996fac49d6a408c237cc47510a4ea5ef89e40a93786eb4f0b1f40698ac6a51 +Size (firefox38-l10n-38.7.1/th.xpi) = 534270 bytes +SHA1 (firefox38-l10n-38.7.1/tr.xpi) = 2cac5a338126931e8403c12a9121a18a8c745430 +RMD160 (firefox38-l10n-38.7.1/tr.xpi) = 98f642b2cba99b062d358d9077e9f10e2d12b84c +SHA512 (firefox38-l10n-38.7.1/tr.xpi) = 260cb8b0f5e803511d662bfd1d7e2867072d514079c2c4dc78c5e1b1c5524198918937628b93b878b426d5f24e8fe590c2f101c3d5ec2d7343c0fa5146a4b843 +Size (firefox38-l10n-38.7.1/tr.xpi) = 481076 bytes +SHA1 (firefox38-l10n-38.7.1/uk.xpi) = e32911f6e708226193f56c73839bef8d72aede49 +RMD160 (firefox38-l10n-38.7.1/uk.xpi) = c7b6f17bccb20256234ef31c3ed10327ab80ec6e +SHA512 (firefox38-l10n-38.7.1/uk.xpi) = bdf93a2d3c803606338bf8a8396594e099a8484035d03673e318447d0fec7371bed10971d37ed900e8d5161962c5c6fa8b0221d1a01f06a2daa188799ac0bf7b +Size (firefox38-l10n-38.7.1/uk.xpi) = 493313 bytes +SHA1 (firefox38-l10n-38.7.1/uz.xpi) = 2732bb6b0dd1483edd4f3d0404bf0577ed9af1ff +RMD160 (firefox38-l10n-38.7.1/uz.xpi) = 8d0bbe07b1d2bda04d1dd8d92f7f234019e6d070 +SHA512 (firefox38-l10n-38.7.1/uz.xpi) = d70d099ad9350415522844417f4fe509bc6a81ce824427e63426e9ee8cff88c04c8523a0cb471b1a921ac840b6220893a76cf02bbf6ed62a5a0f4ba74f1e8469 +Size (firefox38-l10n-38.7.1/uz.xpi) = 496191 bytes +SHA1 (firefox38-l10n-38.7.1/vi.xpi) = 38f5093e3fb16825d6177628338e2708d141eebd +RMD160 (firefox38-l10n-38.7.1/vi.xpi) = 734af18028df75f97227529751fd7b1f5ffd711f +SHA512 (firefox38-l10n-38.7.1/vi.xpi) = eb7cc3ff16c7f3ccb20725fa601b4178978312f37c1ba7d488428973acc4ed182084894ceef375d7bcb476f0ad0a4d4e0fede0b9aa0fe90f5470854ce2b60759 +Size (firefox38-l10n-38.7.1/vi.xpi) = 467504 bytes +SHA1 (firefox38-l10n-38.7.1/xh.xpi) = 5e10ff2616ac4184181b251598939847c57fa300 +RMD160 (firefox38-l10n-38.7.1/xh.xpi) = 752ca95edee3a47c1ab0731ff33821b54d60576d +SHA512 (firefox38-l10n-38.7.1/xh.xpi) = 9c32c1cec651a3e4951923ff24698685fc47ee4bce77fe926a849487e17c36a4c530f6887c8c674526bd86b32ebf35fe498f735691e1f03f5cb7b814a96e5165 +Size (firefox38-l10n-38.7.1/xh.xpi) = 450242 bytes +SHA1 (firefox38-l10n-38.7.1/zh-CN.xpi) = 2d730a67ba60a14a2e1ebe98911f566aaa1776be +RMD160 (firefox38-l10n-38.7.1/zh-CN.xpi) = e651cd8ae45c8ec380c450e099043060bb1633c6 +SHA512 (firefox38-l10n-38.7.1/zh-CN.xpi) = a75287e0deed7b9ea1416dc6c0746e11e5ea1c81e23c42a13cb51748ee8916aa496f73a52834e3776c55b0b899d10af3f72a6e334ce4e1d034f3d3d0c9715b95 +Size (firefox38-l10n-38.7.1/zh-CN.xpi) = 488276 bytes +SHA1 (firefox38-l10n-38.7.1/zh-TW.xpi) = 0a54b52e36a4b13c833f5d566662b6ca0e4c603d +RMD160 (firefox38-l10n-38.7.1/zh-TW.xpi) = 92f01e8b96905a0d2ee77b82dc07d9a15cdec500 +SHA512 (firefox38-l10n-38.7.1/zh-TW.xpi) = 631e3ebfd31e75fe28a5e966b13d8d3ca90356a58fb3a5ce0d19cc5e3ffa6784113a0307f7b02385739421d100e51228b14751fb557b4d56432ec022817b4a85 +Size (firefox38-l10n-38.7.1/zh-TW.xpi) = 467843 bytes From 57bbc1254d454cdf251c1b12e6a1655da9f58fa8 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:03:09 +0000 Subject: [PATCH 0306/2457] Updated www/firefox38-l10n to 38.7.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 9e7a3734b8afe..9e7e6162d8af1 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1254 2016/03/19 23:01:56 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1255 2016/03/19 23:03:09 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1652,3 +1652,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/firefox to 45.0.1 [ryoon 2016-03-19] Updated www/firefox-l10n to 45.0.1 [ryoon 2016-03-19] Updated www/firefox38 to 38.7.1 [ryoon 2016-03-19] + Updated www/firefox38-l10n to 38.7.1 [ryoon 2016-03-19] From f21e6fa2e29b6aa12d00540088c7769581c86954 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:04:25 +0000 Subject: [PATCH 0307/2457] Update to 38.7.1 * Sync with firefox38-38.7.1 --- devel/xulrunner38/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/xulrunner38/Makefile b/devel/xulrunner38/Makefile index 74c97b6111961..35233e87af0aa 100644 --- a/devel/xulrunner38/Makefile +++ b/devel/xulrunner38/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2016/03/05 11:27:47 jperkin Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/19 23:04:25 ryoon Exp $ -MOZ_BRANCH= 38.6 +MOZ_BRANCH= 38.7 MOZ_BRANCH_MINOR= .1esr MOZ_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} DISTNAME= firefox-${MOZ_VER}.source From 7fdd8766d0c953b89e773cb33324bc1a2edd6329 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:05:02 +0000 Subject: [PATCH 0308/2457] Reset PKGREVISION --- devel/xulrunner38/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/devel/xulrunner38/Makefile b/devel/xulrunner38/Makefile index 35233e87af0aa..c9427968241e7 100644 --- a/devel/xulrunner38/Makefile +++ b/devel/xulrunner38/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/03/19 23:04:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2016/03/19 23:05:02 ryoon Exp $ MOZ_BRANCH= 38.7 MOZ_BRANCH_MINOR= .1esr @@ -9,7 +9,6 @@ MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${MOZ_VER}/source/} EXTRACT_SUFX= .tar.bz2 PKGNAME= xulrunner38-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//:S/b/beta/} -PKGREVISION= 1 CATEGORIES= devel www MAINTAINER= ryoon@NetBSD.org From cda4728d54550c24f46e18a7a1cfd142720cff6b Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:05:36 +0000 Subject: [PATCH 0309/2457] Updated devel/xulrunner38 to 38.7.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 9e7e6162d8af1..fef93836b54ee 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1255 2016/03/19 23:03:09 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1256 2016/03/19 23:05:36 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1653,3 +1653,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/firefox-l10n to 45.0.1 [ryoon 2016-03-19] Updated www/firefox38 to 38.7.1 [ryoon 2016-03-19] Updated www/firefox38-l10n to 38.7.1 [ryoon 2016-03-19] + Updated devel/xulrunner38 to 38.7.1 [ryoon 2016-03-19] From 0dedd1fa52061ef13a4eb922ae5433a9fba28312 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Mar 2016 23:12:41 +0000 Subject: [PATCH 0310/2457] Fix build on NetBSD --- converters/libkkc/distinfo | 3 ++- converters/libkkc/patches/patch-configure | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 converters/libkkc/patches/patch-configure diff --git a/converters/libkkc/distinfo b/converters/libkkc/distinfo index 2a894289e69a7..9e950341305cd 100644 --- a/converters/libkkc/distinfo +++ b/converters/libkkc/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 01:43:49 agc Exp $ +$NetBSD: distinfo,v 1.4 2016/03/19 23:12:41 ryoon Exp $ SHA1 (libkkc-0.3.4.tar.gz) = f2dfa3bf5f639a7ede6968cd5d5b0d70e3d52147 RMD160 (libkkc-0.3.4.tar.gz) = 90ffe5614843f1ac5bf18d69d03e281044ec9d98 SHA512 (libkkc-0.3.4.tar.gz) = ec6afc488e8e176b7c180254a21097ba4de2091c1959f4088c01c915c641a7eca28bf709e65c2aeed9f2f327090125ae4b48d1b71a9e12cf7667947769537759 Size (libkkc-0.3.4.tar.gz) = 1397822 bytes +SHA1 (patch-configure) = f345119d46ea48a1b5038820f32872b6bdfc58ec diff --git a/converters/libkkc/patches/patch-configure b/converters/libkkc/patches/patch-configure new file mode 100644 index 0000000000000..4633a903d0ce0 --- /dev/null +++ b/converters/libkkc/patches/patch-configure @@ -0,0 +1,13 @@ +$NetBSD: patch-configure,v 1.1 2016/03/19 23:12:41 ryoon Exp $ + +--- configure.orig 2014-12-19 05:07:20.000000000 +0000 ++++ configure +@@ -18480,7 +18480,7 @@ $as_echo "yes" >&6; } + fi + + # libstdc++ needs to be linked with libmarisa-glib.a +-MARISA_GLIB_STATIC_DEPENDENCIES="$postdeps_CXX" ++MARISA_GLIB_STATIC_DEPENDENCIES=`echo $postdeps_CXX | $SED -e "s:-lgcc_s -lgcc -lc -lgcc_s -lgcc::"` + + + LIBKKC_CFLAGS="$GIO_CFLAGS $GEE_CFLAGS $JSON_GLIB_CFLAGS" From c9057632a636a4f1caa0a7d09503f223d239a6b0 Mon Sep 17 00:00:00 2001 From: dbj Date: Sat, 19 Mar 2016 23:40:25 +0000 Subject: [PATCH 0311/2457] fix build using cmake 3.5 upstream: https://github.com/gnuradio/volk/pull/65 --- ham/gnuradio-core/distinfo | 4 +- .../patches/patch-volk_apps_CMakeLists.txt | 37 +++++ .../patches/patch-volk_lib_CMakeLists.txt | 127 ++++++++++++++++++ 3 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 ham/gnuradio-core/patches/patch-volk_apps_CMakeLists.txt create mode 100644 ham/gnuradio-core/patches/patch-volk_lib_CMakeLists.txt diff --git a/ham/gnuradio-core/distinfo b/ham/gnuradio-core/distinfo index 90cae543d77e0..89471ddc35153 100644 --- a/ham/gnuradio-core/distinfo +++ b/ham/gnuradio-core/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2016/03/07 13:14:31 mef Exp $ +$NetBSD: distinfo,v 1.24 2016/03/19 23:40:25 dbj Exp $ SHA1 (gnuradio-3.7.9.1.tar.gz) = 6b9960ebed57610e52da2c23ef953674faefb849 RMD160 (gnuradio-3.7.9.1.tar.gz) = a058199b480db264d2ca6b8b87a7b18d2a876d62 @@ -10,3 +10,5 @@ SHA1 (patch-gnuradio_runtime_lib_thread_thread_cc) = c05628aa88ac968928f9eabd8c5 SHA1 (patch-gr-audio_lib_CMakeLists.txt) = 00ff8c14658acd2d1dc8be18ea6a19ace8d12968 SHA1 (patch-gr-audio_lib_alsa_alsa__impl_h) = d61dcd31058c04a6050479a6e8c321ca15420d49 SHA1 (patch-grc_script_gnuradio-companion) = 15dde8f3a9e057061e56157533f8af1919240b93 +SHA1 (patch-volk_apps_CMakeLists.txt) = 1523b725fdf83751bd6f8d73d62a8f8b9a618886 +SHA1 (patch-volk_lib_CMakeLists.txt) = 67a1545e138d6472803caa1f601c7b430101b83f diff --git a/ham/gnuradio-core/patches/patch-volk_apps_CMakeLists.txt b/ham/gnuradio-core/patches/patch-volk_apps_CMakeLists.txt new file mode 100644 index 0000000000000..89658f6bc42df --- /dev/null +++ b/ham/gnuradio-core/patches/patch-volk_apps_CMakeLists.txt @@ -0,0 +1,37 @@ +$NetBSD: patch-volk_apps_CMakeLists.txt,v 1.1 2016/03/19 23:40:25 dbj Exp $ + +Fix compilation with cmake 3.5 +upstream: https://github.com/gnuradio/volk/pull/65 + +--- volk/apps/CMakeLists.txt.orig 2016-02-07 17:09:12.000000000 +0000 ++++ volk/apps/CMakeLists.txt +@@ -19,23 +19,23 @@ + # Setup profiler + ######################################################################## + if(MSVC) +- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) ++ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc) + endif(MSVC) + + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} +- ${CMAKE_SOURCE_DIR}/include +- ${CMAKE_BINARY_DIR}/include +- ${CMAKE_SOURCE_DIR}/lib +- ${CMAKE_BINARY_DIR}/lib ++ ${PROJECT_SOURCE_DIR}/include ++ ${PROJECT_BINARY_DIR}/include ++ ${PROJECT_SOURCE_DIR}/lib ++ ${PROJECT_BINARY_DIR}/lib + ${Boost_INCLUDE_DIRS} + ) + + # MAKE volk_profile + add_executable(volk_profile + ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc +- ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc ++ ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc + ) + + diff --git a/ham/gnuradio-core/patches/patch-volk_lib_CMakeLists.txt b/ham/gnuradio-core/patches/patch-volk_lib_CMakeLists.txt new file mode 100644 index 0000000000000..97115460dff50 --- /dev/null +++ b/ham/gnuradio-core/patches/patch-volk_lib_CMakeLists.txt @@ -0,0 +1,127 @@ +$NetBSD: patch-volk_lib_CMakeLists.txt,v 1.1 2016/03/19 23:40:25 dbj Exp $ + +Fix compilation with cmake 3.5 +upstream: https://github.com/gnuradio/volk/pull/65 + +--- volk/lib/CMakeLists.txt.orig 2016-02-07 17:09:12.000000000 +0000 ++++ volk/lib/CMakeLists.txt +@@ -90,7 +90,7 @@ endif() + ######################################################################## + execute_process( + COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} +- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py ++ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py + --mode "arch_flags" --compiler "${COMPILER_NAME}" + OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE + ) +@@ -278,7 +278,7 @@ message(STATUS "Available architectures: + ######################################################################## + execute_process( + COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} +- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py ++ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py + --mode "machines" --archs "${available_archs}" + OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE + ) +@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${av + ######################################################################## + + #dependencies are all python, xml, and header implementation files +-file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml) +-file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py) +-file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h) ++file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml) ++file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py) ++file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h) + + macro(gen_template tmpl output) + list(APPEND volk_gen_sources ${output}) +@@ -320,21 +320,21 @@ macro(gen_template tmpl output) + OUTPUT ${output} + DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl} + COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} +- ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py ++ ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py + --input ${tmpl} --output ${output} ${ARGN} + ) + endmacro(gen_template) + +-make_directory(${CMAKE_BINARY_DIR}/include/volk) ++make_directory(${PROJECT_BINARY_DIR}/include/volk) + +-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk.h) +-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk.c) +-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h) +-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h) +-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_cpu.c) +-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h) +-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${CMAKE_BINARY_DIR}/lib/volk_machines.h) +-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_machines.c) ++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk.h) ++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk.c) ++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h) ++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h) ++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_cpu.c) ++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h) ++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${PROJECT_BINARY_DIR}/lib/volk_machines.h) ++gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_machines.c) + + set(BASE_CFLAGS NONE) + string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU) +@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}:: + foreach(machine_name ${available_machines}) + #generate machine source + set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c) +- gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name}) ++ gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name}) + + #determine machine flags + execute_process( + COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} +- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py ++ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py + --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}" + OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE + ) +@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO + # Set local include directories first + ######################################################################## + include_directories( +- ${CMAKE_BINARY_DIR}/include +- ${CMAKE_SOURCE_DIR}/include +- ${CMAKE_SOURCE_DIR}/kernels ++ ${PROJECT_BINARY_DIR}/include ++ ${PROJECT_SOURCE_DIR}/include ++ ${PROJECT_SOURCE_DIR}/kernels + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ) +@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8 + # setup architecture specific assembler flags + set(ARCH_ASM_FLAGS "-mfpu=neon -g") + # then add the files +- include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon) +- file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s) ++ include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon) ++ file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s) + foreach(asm_file ${asm_files}) + list(APPEND volk_sources ${asm_file}) + message(STATUS "Adding source file: ${asm_file}") +@@ -453,7 +453,7 @@ if(ORC_FOUND) + list(APPEND volk_libraries ${ORC_LIBRARIES}) + + #setup orc functions +- file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc) ++ file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc) + foreach(orc_file ${orc_files}) + + #extract the name for the generated c source from the orc file +@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machin + + if(MSVC) + #add compatibility includes for stdint types +- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) ++ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc) + add_definitions(-DHAVE_CONFIG_H) + #compile the sources as C++ due to the lack of complex.h under MSVC + set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX) From c54ea937b613ce67710ecd87a0c9f9a102a72146 Mon Sep 17 00:00:00 2001 From: dbj Date: Sat, 19 Mar 2016 23:44:13 +0000 Subject: [PATCH 0312/2457] the oss conf file should only be in PLIST.oss fixes build on platforms without oss --- ham/gnuradio-core/PLIST | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ham/gnuradio-core/PLIST b/ham/gnuradio-core/PLIST index c9108b6fa1b20..9cf2ccca339ea 100644 --- a/ham/gnuradio-core/PLIST +++ b/ham/gnuradio-core/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2016/03/07 13:14:31 mef Exp $ +@comment $NetBSD: PLIST,v 1.23 2016/03/19 23:44:13 dbj Exp $ bin/gnuradio-config-info bin/gr_filter_design bin/volk-config-info @@ -955,7 +955,6 @@ share/gnuradio/examples/filter/synth_filter.py share/gnuradio/examples/filter/synth_to_chan.py share/gnuradio/examples/gnuradio-runtime.conf share/gnuradio/examples/gr-audio-jack.conf -share/gnuradio/examples/gr-audio-oss.conf share/gnuradio/examples/gr-audio-portaudio.conf share/gnuradio/examples/gr-audio.conf share/gnuradio/examples/metadata/file_metadata_sink.grc From 4a6f6ec257de5b6566737321620ca679e879ee1d Mon Sep 17 00:00:00 2001 From: ryoon Date: Sun, 20 Mar 2016 06:53:37 +0000 Subject: [PATCH 0313/2457] Update to 5.5.4 * Based on Firefox 38.7.1 * Fix PR pkg/50975: security/tor-browser is built without -pie * Store cache in ~/.tor-browser-caches instead of ~/Caches --- security/tor-browser/Makefile | 7 ++++--- security/tor-browser/distinfo | 12 ++++++------ .../patches/patch-toolkit_xre_nsXREDirProvider.cpp | 12 ++++++++---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/security/tor-browser/Makefile b/security/tor-browser/Makefile index 2db08d082fd9a..8d6317afabae6 100644 --- a/security/tor-browser/Makefile +++ b/security/tor-browser/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2016/03/14 14:30:47 ryoon Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/20 06:53:37 ryoon Exp $ -TORBVER= 5.5.3 +TORBVER= 5.5.4 -DISTNAME= tor-browser-38.7.0esr-5.5-1 +DISTNAME= tor-browser-38.7.1esr-5.5-1 PKGNAME= tor-browser-${TORBVER} CATEGORIES= www MASTER_SITES+= ${MASTER_SITE_LOCAL} @@ -30,6 +30,7 @@ CONFIGURE_ARGS+= --disable-gio CONFIGURE_ARGS+= --disable-dbus CONFIGURE_ARGS+= --disable-gnomeui CONFIGURE_ARGS+= --disable-libnotify +CONFIGURE_ARGS+= --enable-pie # Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601 CFLAGS+= -fpermissive diff --git a/security/tor-browser/distinfo b/security/tor-browser/distinfo index 5f52d51adf6b3..32cdff458b987 100644 --- a/security/tor-browser/distinfo +++ b/security/tor-browser/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2016/03/14 14:30:47 ryoon Exp $ +$NetBSD: distinfo,v 1.3 2016/03/20 06:53:37 ryoon Exp $ -SHA1 (tor-browser-38.7.0esr-5.5-1.tar.xz) = b6a35f91470572d175b461b6ba6e31be56c47e34 -RMD160 (tor-browser-38.7.0esr-5.5-1.tar.xz) = 751bb7429cecbb151df550aab7f53486c705ff8b -SHA512 (tor-browser-38.7.0esr-5.5-1.tar.xz) = 3d2ab2f82af7dfa1b1f777916ba450f8107da8c9c6a272fb0fe66281f4d89450c8cb9a02ae229b0c3bb8d063f825a359b1ca66af5fecad8ea4ba861ec11b2070 -Size (tor-browser-38.7.0esr-5.5-1.tar.xz) = 150084572 bytes +SHA1 (tor-browser-38.7.1esr-5.5-1.tar.xz) = 332d04fc222f9d0778341284736c6da0f61e4607 +RMD160 (tor-browser-38.7.1esr-5.5-1.tar.xz) = c57cbdbb0a4a5f0ca8f9963daa4075bbcd754f2e +SHA512 (tor-browser-38.7.1esr-5.5-1.tar.xz) = d2d68de30c58a0d90063ec42ee6c76ea044c5c570471e0a0765dd92057f571f52262e47629381a5b24adad610ee360ab291e3a7dd21bf41fef063c6948f413c8 +Size (tor-browser-38.7.1esr-5.5-1.tar.xz) = 150066780 bytes SHA1 (patch-aa) = e9e8400fa86ae8d6910b49e3a98127122e714f1a SHA1 (patch-accessible_atk_Platform.cpp) = c2deb81b300de44c4500328589185bbd4b6b02fb SHA1 (patch-al) = cca5df21d018bb9f428ad26d00718f33afe88ec5 @@ -142,7 +142,7 @@ SHA1 (patch-toolkit_components_osfile_modules_osfile__unix__front.jsm) = f5adba2 SHA1 (patch-toolkit_library_moz.build) = 625d78e64959f78a5d0b8148749bb43a0abcbcf7 SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = f335d64cb0e1d248fd2c41a167ee1874218e7db6 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 6ee6fba04a3ecc6596f8aed67f752a1075901fa8 -SHA1 (patch-toolkit_xre_nsXREDirProvider.cpp) = 373b66e02f2afd731d3ef47cf654e5f6486c78b1 +SHA1 (patch-toolkit_xre_nsXREDirProvider.cpp) = b0e2eb1359fb30e5e5134ae76e56c98fd3d43e8f SHA1 (patch-webapprt_moz.build) = 177468d5e12c49db1ad5376f0f3df34fa9df070c SHA1 (patch-widget_gtk_gtk2drawing.c) = dd63fd368a86aef1b9568ae625904ffd9542a874 SHA1 (patch-widget_gtk_gtk3drawing.c) = 7224a3ef02ef98b6013ffeafcf6819c726bacbe6 diff --git a/security/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider.cpp b/security/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider.cpp index 39abcfd164ee7..f719c689020c6 100644 --- a/security/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider.cpp +++ b/security/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider.cpp @@ -1,10 +1,10 @@ -$NetBSD: patch-toolkit_xre_nsXREDirProvider.cpp,v 1.1 2016/02/14 07:30:54 ryoon Exp $ +$NetBSD: patch-toolkit_xre_nsXREDirProvider.cpp,v 1.2 2016/03/20 06:53:37 ryoon Exp $ https://github.com/torbsd/openbsd-ports/blob/beeb760037237c6e1864942356b8135e9c430d78/www/tbb/tor-browser/patches/patch-toolkit_xre_nsXREDirProvider_cpp ---- toolkit/xre/nsXREDirProvider.cpp.orig 2016-02-13 07:06:53.000000000 +0000 +--- toolkit/xre/nsXREDirProvider.cpp.orig 2016-03-19 23:19:47.000000000 +0000 +++ toolkit/xre/nsXREDirProvider.cpp -@@ -1222,12 +1222,19 @@ nsXREDirProvider::GetUserDataDirectoryHo +@@ -1222,15 +1222,22 @@ nsXREDirProvider::GetUserDataDirectoryHo NS_ENSURE_ARG_POINTER(aFile); nsCOMPtr localDir; @@ -23,7 +23,11 @@ +#endif if (aLocal) { - rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); +- rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches")); ++ rv = localDir->AppendNative(NS_LITERAL_CSTRING(".tor-browser-caches")); + NS_ENSURE_SUCCESS(rv, rv); + } + @@ -1338,6 +1345,7 @@ nsXREDirProvider::GetAppRootDir(nsIFile* nsresult rv = GetAppDir()->Clone(getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); From 0343e71029bf4e3e842bbc85d9b59eee5d606842 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sun, 20 Mar 2016 06:54:38 +0000 Subject: [PATCH 0314/2457] Updated security/tor-browser to 5.5.4 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index fef93836b54ee..c6df478c923bd 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1256 2016/03/19 23:05:36 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1257 2016/03/20 06:54:38 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1654,3 +1654,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/firefox38 to 38.7.1 [ryoon 2016-03-19] Updated www/firefox38-l10n to 38.7.1 [ryoon 2016-03-19] Updated devel/xulrunner38 to 38.7.1 [ryoon 2016-03-19] + Updated security/tor-browser to 5.5.4 [ryoon 2016-03-20] From c9acde8194f6555595461f9641a7006224daffce Mon Sep 17 00:00:00 2001 From: ryoon Date: Sun, 20 Mar 2016 07:24:53 +0000 Subject: [PATCH 0315/2457] The Tor Browser is packaged now. Thank you, pgoyette@. --- net/tor/MESSAGE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/tor/MESSAGE b/net/tor/MESSAGE index 4ee3c5d7adcd9..6d04ef35e85ad 100644 --- a/net/tor/MESSAGE +++ b/net/tor/MESSAGE @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.8 2014/06/25 13:08:37 drochner Exp $ +$NetBSD: MESSAGE,v 1.9 2016/03/20 07:24:53 ryoon Exp $ Please note that the only way the Tor Project recommends browsing the -web through Tor is the Tor Browser, which is currently not packaged in -pkgsrc. See . +web through Tor is the Tor Browser, which is packaged as +security/tor-browser. See security/tor-browser/MESSAGE too. =========================================================================== From f65a9c13ca8dfae954c385530848018116b8638f Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 20 Mar 2016 09:17:42 +0000 Subject: [PATCH 0316/2457] + Sigil-0.9.4, calibre-2.53.0, git-base-2.7.4, global-6.5.3, harfbuzz-1.2.4, libxkbcommon-0.6.0, musicpd-0.19.14, p5-CGI-4.28, p5-Canary-Stability-2011, p5-Crypt-ECB-2.15, p5-Crypt-PWSafe3-1.22, p5-DateTime-TimeZone-1.96, p5-HTML-Escape-1.10, p5-Scalar-List-Utils-1.44, p5-Socket6-0.26, p5-Sub-Name-0.15, poppler-0.42.0, py-cryptography-1.3, py-lxml-3.6.0, py-setuptools-20.3.1, py-test-2.9.1, py-twisted-16.0.0, py-vdirsyncer-0.9.2, py-virtualenv-15.0.1, qt5-5.6.0, qt5-qtbase-5.6.0, wine-devel-1.9.6, x264-devel-20160319. --- doc/TODO | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/doc/TODO b/doc/TODO index fa0e2a70db9a0..d4bcd739969cf 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15605 2016/03/19 06:46:10 pettai Exp $ +$NetBSD: TODO,v 1.15606 2016/03/20 09:17:42 wiz Exp $ Suggested new packages ====================== @@ -397,6 +397,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o SDL2_image-2.0.1 o SDL2_net-2.0.1 o SOPE-3.0.2 + o Sigil-0.9.4 o TeXmacs-1.99.4 o TeXmacs-devel-1.0.7.21 o TiffIO-140a @@ -516,6 +517,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o cal3d-0.11.0 o calc-2.11.10.1 o calcoo-2.1.0 + o calibre-2.53.0 o calligra-2.9.9 [in wip; koffice successor] o camlp5-6.15 o cardboard-schedule-1.14c [at http://www.bright-green.com/downloads/] @@ -772,6 +774,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o gfract-0.33 o ghc7-7.10.1 o gifsicle-1.88 + o git-base-2.7.4 o gkrellm-2.3.5 o gkrellm-multiping-2.0.13 o gkrellm-server-2.3.5 @@ -781,6 +784,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o glade3-3.8.5 [GNOME 2.34] o gle-4.2.5 [wip] o gliv-1.9.7 + o global-6.5.3 o glom-1.14.2 [GNOME 2.26] o gloox-1.0.14 o glpk-4.59 @@ -878,6 +882,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o hamster-applet-2.32.1 [GNOME 2.32] o handbrake-0.10.2 o hanzim-3.5 + o harfbuzz-1.2.4 o harminv-1.4 o haskell-mode-1.45 o hdevtools-0.1.3.0 @@ -1088,6 +1093,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o libvdpau-1.1.1 o libvirt-1.3.2 o libxdg-basedir-1.2.0 + o libxkbcommon-0.6.0 o libykneomgr-0.1.8 o libyubikey-1.13 o licq-1.3.8 @@ -1184,6 +1190,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o munin-node-1.4.6 o munin-server-1.4.6 o muse-0.9.2 + o musicpd-0.19.14 o mutagen-tools-1.31 o myodbc-5.3.4 o mysql-5.7.9 @@ -1273,10 +1280,12 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-Bytes-Random-Secure-0.29 o p5-CDB_File-0.98 o p5-CDDB-2.00 + o p5-CGI-4.28 o p5-CHI-1.27 o p5-CPAN-Perl-Releases-2.58 o p5-CPAN-Reporter-1.2017 o p5-CPANPLUS-2.102 + o p5-Canary-Stability-2011 o p5-Captcha-reCAPTCHA-0.97 o p5-Capture-Tiny-0.36 o p5-Carp-Assert-1.14 @@ -1294,8 +1303,10 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-Convert-Binary-C-0.78 o p5-Convert-NLS_DATE_FORMAT-0.06 o p5-Convert-UUlib-1.50 + o p5-Crypt-ECB-2.15 o p5-Crypt-GeneratePassword-0.05 o p5-Crypt-OpenPGP-1.12 + o p5-Crypt-PWSafe3-1.22 o p5-DBD-DB2-1.85 o p5-DBD-ODBC-1.52 o p5-DBD-Oracle-1.74 @@ -1309,6 +1320,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-Data-Peek-0.45 o p5-Data-SimplePassword-0.11 o p5-Date-Extract-0.05 + o p5-DateTime-TimeZone-1.96 o p5-Devel-PatchPerl-1.40 o p5-Devel-Pragma-0.62 o p5-Devel-REPL-1.003028 @@ -1348,6 +1360,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-GraphViz2-2.37 o p5-GraphicsMagick-1.4.020160216 o p5-Gtk2-1.223 + o p5-HTML-Escape-1.10 o p5-HTML-Format-2.12 o p5-HTTP-Server-EV-0.69 o p5-Hash-Util-FieldHash-Compat-0.10 @@ -1461,6 +1474,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-SNMP-Info-3.31 o p5-SVG-Graph-0.0402 o p5-SVN-Simple-0.312 + o p5-Scalar-List-Utils-1.44 o p5-Schedule-Cron-Events-1.94 o p5-Search-Elasticsearch-2.00 o p5-Search-Indexer-0.78 @@ -1468,6 +1482,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-Sereal-Decoder-3.014 o p5-Sereal-Encoder-3.014 o p5-Smart-Comments-1.06 + o p5-Socket6-0.26 o p5-Software-License-0.103011 o p5-Sort-Versions-1.62 o p5-Spreadsheet-Read-0.63 @@ -1477,6 +1492,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-Statistics-Descriptive-3.0612 o p5-Struct-Dumb-0.08 o p5-Sub-Exporter-GlobExporter-0.005 + o p5-Sub-Name-0.15 o p5-Swim-0.1.43 o p5-Switch-2.17 o p5-Sys-Utmp-1.7 @@ -1608,6 +1624,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o policyd-weight-0.1.15.2 o polsms-2.1.0 o poppass-4.0.14 + o poppler-0.42.0 o posh-0.12.6 o postal-0.72 o postfix-3.0.4 @@ -1647,6 +1664,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-collectd-5.5.1 o py-colorama-0.3.6 o py-creole-1.1.1 + o py-cryptography-1.3 o py-cups-1.9.73 o py-d2to1-0.2.12 o py-daemon-2.1.1 @@ -1671,6 +1689,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-keybinder-0.3.1 o py-lasso-2.5.1 o py-lupa-1.2 + o py-lxml-3.6.0 o py-markdown-2.6.5 o py-matplotlib-1.4.3 o py-mccabe-0.4.0 @@ -1694,6 +1713,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-rope-0.9.4 o py-scgi-1.15 o py-serpent-1.12 + o py-setuptools-20.3.1 o py-simpletal-5.1 o py-smb-1.1.17 o py-spf-2.0.12t @@ -1703,11 +1723,14 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-stdnum-1.2 o py-suds-0.4.1 o py-sybase-0.37 - o py-test-2.9.0 + o py-test-2.9.1 o py-test-httpbin-0.2.3 o py-tlslite-0.4.6 + o py-twisted-16.0.0 o py-uliweb-0.5b0 o py-uwsgi-2.0.12 + o py-vdirsyncer-0.9.2 + o py-virtualenv-15.0.1 o py-wxWidgets-3.0.0 o py-yubiauth-0.3.10 o py-zconfig-3.0.3 @@ -1719,6 +1742,8 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o qlandkartegt-1.8.1 [pkg/49910] o qnetwalk-1.4 o qt4-creator-3.4.0 + o qt5-5.6.0 + o qt5-qtbase-5.6.0 o quodlibet2-3.5.3 o rabbitmq-3.6.1 o radare2-0.10.0 @@ -1998,7 +2023,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o whowatch-1.8.5 o windowlab-1.40 o wine-1.8.1 - o wine-devel-1.9.5 + o wine-devel-1.9.6 o wmi-11 o wmii+ixp-3.9.2 [pkg/43459; wip (wmii-devel); see also libixp entry] o wmx-8 @@ -2009,7 +2034,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o wwwoffle-2.9i o wxGTK-3.1.0 o wxRemind-101 - o x264-devel-20160312 + o x264-devel-20160319 o x2vnc-1.31 o xa65-2.3.7 o xaric-0.13.7 From b620e2680038371db5870429351d74bd21d5b87d Mon Sep 17 00:00:00 2001 From: pettai Date: Sun, 20 Mar 2016 09:57:12 +0000 Subject: [PATCH 0317/2457] Release Notes - XMLTooling - C++ - Version 1.5.6 ** Bug * [CPPXT-105] - PKIX revocation checking calls OpenSSL's X509_verify_cert in an unsupported way (breaks with OpenSSL 1.0.1p/1.0.2d and later) Release Notes - XMLTooling - C++ - Version 1.5.5 ** Bug * [CPPXT-102] - BOOST autoconf macros break with gcc5 Release Notes - XMLTooling - C++ - Version 1.5.4 ** Bug * [CPPXT-97] - Segfault in HTTPResponse::setResponseHeader when used to clear a header * [CPPXT-99] - Slightly incorrect User-Agent string with libcurl requests ** Task * [CPPXT-100] - Update Windows build to latest libraries ** Improvement * [CPPXT-101] - Disable SSLv3 by default in SOAP client This is part of fixing PR pkg/50354 --- textproc/xmltooling/Makefile | 7 +++---- textproc/xmltooling/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/textproc/xmltooling/Makefile b/textproc/xmltooling/Makefile index c43a28a32c516..75bad038b9131 100644 --- a/textproc/xmltooling/Makefile +++ b/textproc/xmltooling/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.21 2016/03/05 11:29:33 jperkin Exp $ +# $NetBSD: Makefile,v 1.22 2016/03/20 09:57:12 pettai Exp $ -DISTNAME= xmltooling-1.5.3 -PKGREVISION= 9 +DISTNAME= xmltooling-1.5.6 CATEGORIES= textproc -MASTER_SITES= http://www.shibboleth.net/downloads/c++-opensaml/${PKGVERSION_NOREV}/ +MASTER_SITES= http://www.shibboleth.net/downloads/c++-opensaml/2.5.5/ MAINTAINER= pettai@NetBSD.org HOMEPAGE= http://shibboleth.net/ diff --git a/textproc/xmltooling/distinfo b/textproc/xmltooling/distinfo index bb75e0cf9140b..e7b1d5d45f527 100644 --- a/textproc/xmltooling/distinfo +++ b/textproc/xmltooling/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2015/11/04 02:00:16 agc Exp $ +$NetBSD: distinfo,v 1.10 2016/03/20 09:57:12 pettai Exp $ -SHA1 (xmltooling-1.5.3.tar.gz) = b8498a8dafe18bf612a6651ab7af662add5c2a68 -RMD160 (xmltooling-1.5.3.tar.gz) = 2b8530f41576511b222f515a86e39981f34c2102 -SHA512 (xmltooling-1.5.3.tar.gz) = 25cc3b619aabb420d061e809388695ca31ae8ccb47e8f3c8a96d0f34e662f22f74fa02b7ba0a22ed552f66e60f066919ad8336ba161cc654b6e02a93c6316706 -Size (xmltooling-1.5.3.tar.gz) = 675350 bytes +SHA1 (xmltooling-1.5.6.tar.gz) = 45da82345758a9871cbf1200f6b2cdd0898722f2 +RMD160 (xmltooling-1.5.6.tar.gz) = 4bffdd47c8062c352c0aa5d26fc5bc588779514b +SHA512 (xmltooling-1.5.6.tar.gz) = 4fa247fd8e8c4354cf4c6d515847b891c6de4f631198dc220063c30d48cbccf9c3a9a66e660b04a2d37950929e76e649b3857391c0691c962e5a6a25fde13652 +Size (xmltooling-1.5.6.tar.gz) = 713425 bytes SHA1 (patch-xmltooling_Makefile.in) = 9c6764c89d0c81c46486283063e02791c22c37e2 SHA1 (patch-xmltooling_util_XMLHelper.cpp) = 2dc0915af93e4b2aeb0a946ea14f2de89050867f SHA1 (patch-xmltooling_util_XMLHelper.h) = 98c6c0552c81a8599c5337642bcdcaa9cdb76d80 From aed85df2c4153030254851f84b0579374b2dedbe Mon Sep 17 00:00:00 2001 From: pettai Date: Sun, 20 Mar 2016 09:57:35 +0000 Subject: [PATCH 0318/2457] Updated textproc/xmltooling to 1.5.6 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index c6df478c923bd..62d319f197f78 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1257 2016/03/20 06:54:38 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1258 2016/03/20 09:57:35 pettai Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1655,3 +1655,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/firefox38-l10n to 38.7.1 [ryoon 2016-03-19] Updated devel/xulrunner38 to 38.7.1 [ryoon 2016-03-19] Updated security/tor-browser to 5.5.4 [ryoon 2016-03-20] + Updated textproc/xmltooling to 1.5.6 [pettai 2016-03-20] From 972047e0dba44ebd45a52059f29871494aebcc28 Mon Sep 17 00:00:00 2001 From: pettai Date: Sun, 20 Mar 2016 10:04:14 +0000 Subject: [PATCH 0319/2457] Release Notes - OpenSAML 2 - C++ - Version 2.5.5 ** Bug * [CPPOST-91] - BOOST autoconf macros break with gcc5 Release Notes - OpenSAML 2 - C++ - Version 2.5.4 ** Bug * [CPPOST-87] - legacyOrgNames doesn't work as expected with empty mdui:UIInfo * [CPPOST-88] - Insufficient XML entity encoding in Metadata Status generation * [CPPOST-90] - Condition validation for empty element incorrectly requires either a NotBefore or a NotOnOrAfter attribute This is part of fixing PR pkg/50354 --- security/opensaml/Makefile | 5 ++--- security/opensaml/PLIST | 4 ++-- security/opensaml/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/security/opensaml/Makefile b/security/opensaml/Makefile index 0b9edc357cb72..f22cd31c7afa8 100644 --- a/security/opensaml/Makefile +++ b/security/opensaml/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2016/03/05 11:27:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2016/03/20 10:04:14 pettai Exp $ -DISTNAME= opensaml-2.5.3 -PKGREVISION= 7 +DISTNAME= opensaml-2.5.5 CATEGORIES= security MASTER_SITES= http://www.shibboleth.net/downloads/c++-opensaml/${PKGVERSION_NOREV}/ diff --git a/security/opensaml/PLIST b/security/opensaml/PLIST index ab90fd3126080..8fbbab037ea73 100644 --- a/security/opensaml/PLIST +++ b/security/opensaml/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2013/09/13 21:17:35 pettai Exp $ +@comment $NetBSD: PLIST,v 1.7 2016/03/20 10:04:14 pettai Exp $ bin/samlsign include/saml/Assertion.h include/saml/RootObject.h @@ -51,7 +51,7 @@ include/saml/version.h lib/libsaml.a lib/libsaml.so lib/libsaml.so.8 -lib/libsaml.so.8.0.3 +lib/libsaml.so.8.0.5 lib/pkgconfig/opensaml.pc share/doc/${PKGNAME}/LICENSE.txt share/doc/${PKGNAME}/LOG4CPP.LICENSE diff --git a/security/opensaml/distinfo b/security/opensaml/distinfo index e280ba7a4b809..cc3f6089d8d96 100644 --- a/security/opensaml/distinfo +++ b/security/opensaml/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 01:17:52 agc Exp $ +$NetBSD: distinfo,v 1.6 2016/03/20 10:04:14 pettai Exp $ -SHA1 (opensaml-2.5.3.tar.gz) = 412d0807821f7ee5d419e59fd9fd85613d64da7b -RMD160 (opensaml-2.5.3.tar.gz) = 1ed3e0badd53c60a60d17ad3d4bc490ab8366b50 -SHA512 (opensaml-2.5.3.tar.gz) = 4f1827dadc9f96dd4c9cde2b086885bdc029e41b873af856f6205e0cd1046bd90d16a7ae4c52c8758454aa17a1751e0f7039dfd225210f05ec0214ffeca8d2bd -Size (opensaml-2.5.3.tar.gz) = 703021 bytes +SHA1 (opensaml-2.5.5.tar.gz) = beb3a45ff88076f31eb91f573ddf4ff57984c73a +RMD160 (opensaml-2.5.5.tar.gz) = 8048b89a7f496d0f5920e64991f69afe8b1a9698 +SHA512 (opensaml-2.5.5.tar.gz) = a590b20efa3f8f688393b8f9f0d2add8614e93e54181870736b6efd05e9c3a12d35789f6b6feab426d8a9e2604b5eae4e183c37f30aced215622bd3a7239b43f +Size (opensaml-2.5.5.tar.gz) = 739776 bytes From 56171663050970bb3b42aae4be1a69429038d893 Mon Sep 17 00:00:00 2001 From: pettai Date: Sun, 20 Mar 2016 10:04:32 +0000 Subject: [PATCH 0320/2457] Updated security/opensaml to 2.5.5 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 62d319f197f78..a64e94450f4c2 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1258 2016/03/20 09:57:35 pettai Exp $ +$NetBSD: CHANGES-2016,v 1.1259 2016/03/20 10:04:32 pettai Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1656,3 +1656,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/xulrunner38 to 38.7.1 [ryoon 2016-03-19] Updated security/tor-browser to 5.5.4 [ryoon 2016-03-20] Updated textproc/xmltooling to 1.5.6 [pettai 2016-03-20] + Updated security/opensaml to 2.5.5 [pettai 2016-03-20] From 45f3b80c8ba30b034e3ad3b524dc4d611ade7144 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 20 Mar 2016 19:09:53 +0000 Subject: [PATCH 0321/2457] Avoid a call to malloc() that gets passed (size_t)-1. print/lilypond triggers this. Bump PKGREVISION. --- devel/gtexinfo/Makefile | 4 +- devel/gtexinfo/distinfo | 3 +- ...ch-tp_Texinfo_Convert_XSParagraph_xspara.c | 37 +++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_xspara.c diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile index d4d8a9b0f3a89..52bacd1e41021 100644 --- a/devel/gtexinfo/Makefile +++ b/devel/gtexinfo/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.92 2016/03/17 05:35:47 richard Exp $ +# $NetBSD: Makefile,v 1.93 2016/03/20 19:09:53 wiz Exp $ DISTNAME= texinfo-6.1 PKGNAME= g${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel sysutils MASTER_SITES= ${MASTER_SITE_GNU:=texinfo/} diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo index 65a38fd560093..a29097f29f824 100644 --- a/devel/gtexinfo/distinfo +++ b/devel/gtexinfo/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2016/03/17 05:35:47 richard Exp $ +$NetBSD: distinfo,v 1.48 2016/03/20 19:09:53 wiz Exp $ SHA1 (texinfo-6.1.tar.gz) = b6ed8b4af3fe9a4aa7c72081dc61f095f73d895c RMD160 (texinfo-6.1.tar.gz) = 6ab09576dab209cf8784c8052039126e0b21d941 @@ -10,4 +10,5 @@ SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4 SHA1 (patch-texindex_texindex.awk) = 1f022f1495c951337997036ef1cd758ef9c116a7 SHA1 (patch-tp_Texinfo_Convert_XSParagraph_configure) = d4557bae4417cd42297bceaa76478b00b3875df3 +SHA1 (patch-tp_Texinfo_Convert_XSParagraph_xspara.c) = 198d64b5bc38a3b934ade641c282e8be3e41c4df SHA1 (patch-util_texi2dvi) = d17608312d4b5546a2295e1be2b193124ad97256 diff --git a/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_xspara.c b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_xspara.c new file mode 100644 index 0000000000000..5bec457ff46e3 --- /dev/null +++ b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_xspara.c @@ -0,0 +1,37 @@ +$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_xspara.c,v 1.1 2016/03/20 19:09:53 wiz Exp $ + +Do not call text_append_n with (size_t)-1. + +--- tp/Texinfo/Convert/XSParagraph/xspara.c.orig 2016-01-23 11:31:17.000000000 +0000 ++++ tp/Texinfo/Convert/XSParagraph/xspara.c +@@ -872,7 +872,7 @@ xspara_add_text (char *text) + { + if (state.space_counter > 0) + { +- /* Truncuate to at most 2 spaces, and replace any ++ /* Truncate to at most 2 spaces, and replace any + '\n' or '\r' characters with ' '. */ + + TEXT new_space; +@@ -892,12 +892,18 @@ xspara_add_text (char *text) + break; + len = mbrlen (pspace, pspace_left, NULL); + +- /* Subtitute newlines in the pending space ++ /* Substitute newlines in the pending space + with spaces. */ + if (*pspace == '\n' || *pspace == '\r') + text_append_n (&new_space, " ", 1); +- else +- text_append_n (&new_space, pspace, len); ++ else { ++ if (len > 0) { ++ text_append_n (&new_space, pspace, len); ++ } else { ++ /* skip one character and try again */ ++ len = 1; ++ } ++ } + state.space_counter++; + + pspace += len; From 70ba634522fdcf028ba8ef8d7b1e19ea713aa24f Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 20 Mar 2016 19:10:05 +0000 Subject: [PATCH 0322/2457] Updated devel/gtexinfo to 6.1nb2 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index a64e94450f4c2..de5795d0d954a 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1259 2016/03/20 10:04:32 pettai Exp $ +$NetBSD: CHANGES-2016,v 1.1260 2016/03/20 19:10:05 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1657,3 +1657,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/tor-browser to 5.5.4 [ryoon 2016-03-20] Updated textproc/xmltooling to 1.5.6 [pettai 2016-03-20] Updated security/opensaml to 2.5.5 [pettai 2016-03-20] + Updated devel/gtexinfo to 6.1nb2 [wiz 2016-03-20] From 3ad4c4d5607eda2d9445a4ff2fc1562592a21271 Mon Sep 17 00:00:00 2001 From: seb Date: Sun, 20 Mar 2016 19:15:33 +0000 Subject: [PATCH 0323/2457] whitespace fix PR pkg/38651 --- pkgtools/libkver/files/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgtools/libkver/files/Makefile.inc b/pkgtools/libkver/files/Makefile.inc index 06583e5125e35..6eb651a59d604 100644 --- a/pkgtools/libkver/files/Makefile.inc +++ b/pkgtools/libkver/files/Makefile.inc @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.4 2003/12/13 17:45:59 seb Exp $ +# $NetBSD: Makefile.inc,v 1.5 2016/03/20 19:15:33 seb Exp $ .if defined(PREFIX) # build from pkgsrc -LIBDIR= ${PREFIX}/lib +LIBDIR= ${PREFIX}/lib BINDIR= ${PREFIX}/sbin MANDIR= ${PREFIX}/man .else From db73dadb22ade366cccabbc5a911dc0496998ba8 Mon Sep 17 00:00:00 2001 From: darcy Date: Sun, 20 Mar 2016 22:01:22 +0000 Subject: [PATCH 0324/2457] Release 5.0 of PyGreSQL. The biggest change here is Python 3.x compatibility. Other changes are too numerous to list. See http://www.pygresql.org/ for all the changes. --- databases/py-postgresql/Makefile | 7 +++---- databases/py-postgresql/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index 1d757c2d95fbe..a14178c48967f 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.76 2016/02/18 18:38:38 darcy Exp $ +# $NetBSD: Makefile,v 1.77 2016/03/20 22:01:22 darcy Exp $ -DISTNAME= PyGreSQL-4.2.1 -PKGNAME= ${PYPKGPREFIX}-postgresql-4.2.1 +DISTNAME= PyGreSQL-5.0 +PKGNAME= ${PYPKGPREFIX}-postgresql-5.0 CATEGORIES= databases python MASTER_SITES= http://pygresql.org/files/ @@ -20,7 +20,6 @@ MAKE_ENV+= INSTALLED_LIBPQ=1 PY_PATCHPLIST= yes PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} REPLACE_PYTHON= pg.py pgdb.py -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 4.1.1 .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/databases/py-postgresql/distinfo b/databases/py-postgresql/distinfo index 87d6d1324a4af..3643b66f51c49 100644 --- a/databases/py-postgresql/distinfo +++ b/databases/py-postgresql/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.22 2016/02/18 18:38:38 darcy Exp $ +$NetBSD: distinfo,v 1.23 2016/03/20 22:01:22 darcy Exp $ -SHA1 (PyGreSQL-4.2.1.tar.gz) = 93575cf33c47d88fb484b39687d75014dfd418e2 -RMD160 (PyGreSQL-4.2.1.tar.gz) = f2eca0f082d84aa076752f45119ccc5cf275af96 -SHA512 (PyGreSQL-4.2.1.tar.gz) = e6f2854ee2da3f87cae3fc56e52d7c5bec85d8b1fa50ccb894e3ab4d7a08a565bc09c7cd2c39e3ed369cb8ef18386622625c5f261764ba8bf692efb25a68533a -Size (PyGreSQL-4.2.1.tar.gz) = 480155 bytes +SHA1 (PyGreSQL-5.0.tar.gz) = d3d38fd67c8f6ea20c416160ff1c7aac9f3f2626 +RMD160 (PyGreSQL-5.0.tar.gz) = c6e82a87a13049bdecd4d1292660c28f99aadbfc +SHA512 (PyGreSQL-5.0.tar.gz) = 6363c8891c005ae7a35202f1176f96a9278bd700cee5bea2d6b140e249577eb8dbcc00fda51c6bacdcfebabcbbaa7fb9677608c49ec77dc77e030350bf602268 +Size (PyGreSQL-5.0.tar.gz) = 633822 bytes From 88e4b2a9d55c36b5adf96fa88ed59ed50d49d640 Mon Sep 17 00:00:00 2001 From: darcy Date: Sun, 20 Mar 2016 22:03:10 +0000 Subject: [PATCH 0325/2457] Upgrade databases/py-postgresql to 5.0. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index de5795d0d954a..7cfa4b6b9c518 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1260 2016/03/20 19:10:05 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1261 2016/03/20 22:03:10 darcy Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1658,3 +1658,4 @@ Changes to the packages collection and infrastructure in 2016: Updated textproc/xmltooling to 1.5.6 [pettai 2016-03-20] Updated security/opensaml to 2.5.5 [pettai 2016-03-20] Updated devel/gtexinfo to 6.1nb2 [wiz 2016-03-20] + Updated databases/py-postgresql to 5.0 [darcy 2016-03-20] From 3f9d5961eef7a722c19b43880a7a3d3f483ed8ba Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 20 Mar 2016 22:03:17 +0000 Subject: [PATCH 0326/2457] Fix pinentry configure argument. Found by coypu. --- security/gnupg2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index d291533f2bdc0..5b5b62ad90f80 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2016/03/05 11:29:20 jperkin Exp $ +# $NetBSD: Makefile,v 1.65 2016/03/20 22:03:17 wiz Exp $ DISTNAME= gnupg-2.0.29 PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} @@ -19,7 +19,7 @@ USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sharedstatedir=${VARBASE} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-pinentry-pgm=${BUILDLINK_PREFIX.pinentry}/bin/pinentry +CONFIGURE_ARGS+= --with-pinentry-pgm=${PREFIX}/bin/pinentry .include "../../mk/bsd.prefs.mk" From 245c9372be68ce612df6fd64aedb14a0134e8172 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 20 Mar 2016 22:10:13 +0000 Subject: [PATCH 0327/2457] Convert to distutils.mk. Mark as ready for python-3.x now that py-postgresql is. Bump PKGREVISION. --- databases/py-pgnotify/Makefile | 10 +++------- databases/py-pgnotify/PLIST | 3 ++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile index 285bc184029d2..45dde40cd762b 100644 --- a/databases/py-pgnotify/Makefile +++ b/databases/py-pgnotify/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2015/12/05 21:25:32 adam Exp $ +# $NetBSD: Makefile,v 1.19 2016/03/20 22:10:13 wiz Exp $ DISTNAME= pgnotify-0.1 PKGNAME= ${PYPKGPREFIX}-pgnotify-0.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= databases python MASTER_SITES= http://sandbox.rulemaker.net/ngps/Dist/ EXTRACT_SUFX= .zip @@ -17,9 +17,5 @@ MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} MAKE_ENV+= BINDIR=${PREFIX}/bin USE_TOOLS+= gmake -PYDISTUTILSPKG= yes -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-postgresql - -.include "../../lang/python/extension.mk" +.include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-pgnotify/PLIST b/databases/py-pgnotify/PLIST index e39b0fecb4ed9..717015e20ab77 100644 --- a/databases/py-pgnotify/PLIST +++ b/databases/py-pgnotify/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2006/01/03 18:58:58 darcy Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/20 22:10:13 wiz Exp $ +${PYSITELIB}/${EGG_FILE} ${PYSITELIB}/pgnotify.py ${PYSITELIB}/pgnotify.pyc ${PYSITELIB}/pgnotify.pyo From 1292663fe638571cddebdf7f805818a2b9bc1b3d Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 20 Mar 2016 22:10:24 +0000 Subject: [PATCH 0328/2457] Updated databases/py-pgnotify to 0.1nb3 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 7cfa4b6b9c518..0bcaaab787a08 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1261 2016/03/20 22:03:10 darcy Exp $ +$NetBSD: CHANGES-2016,v 1.1262 2016/03/20 22:10:24 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1659,3 +1659,4 @@ Changes to the packages collection and infrastructure in 2016: Updated security/opensaml to 2.5.5 [pettai 2016-03-20] Updated devel/gtexinfo to 6.1nb2 [wiz 2016-03-20] Updated databases/py-postgresql to 5.0 [darcy 2016-03-20] + Updated databases/py-pgnotify to 0.1nb3 [wiz 2016-03-20] From 2a56fd49930461373bbe6d7eae700bc9f27be30d Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 20 Mar 2016 22:10:50 +0000 Subject: [PATCH 0329/2457] py-postgresql is no reason for python-2.x any longer. --- meta-pkgs/bulk-medium/Makefile | 4 ++-- www/py-mezzanine/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-pkgs/bulk-medium/Makefile b/meta-pkgs/bulk-medium/Makefile index f80cfa685bc9b..75aeca59a706d 100644 --- a/meta-pkgs/bulk-medium/Makefile +++ b/meta-pkgs/bulk-medium/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2016/03/14 00:54:43 tnn Exp $ +# $NetBSD: Makefile,v 1.35 2016/03/20 22:10:50 wiz Exp $ DISTNAME= bulk-medium-20160314 CATEGORIES= meta-pkgs @@ -10,7 +10,7 @@ COMMENT= Meta-package for a standard medium-sized limited bulk build META_PACKAGE= yes -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-postgresql, py-matplotlib-gtk2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-matplotlib-gtk2 RESTRICTED= Just for test build purpose NO_BIN_ON_CDROM= ${RESTRICTED} diff --git a/www/py-mezzanine/Makefile b/www/py-mezzanine/Makefile index d86cd1a117ffb..eed3abd1fa80a 100644 --- a/www/py-mezzanine/Makefile +++ b/www/py-mezzanine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2015/12/05 21:26:06 adam Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/20 22:11:16 wiz Exp $ DISTNAME= Mezzanine-1.2.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -26,7 +26,7 @@ DEPENDS+= ${PYPKGPREFIX}-django-mezzanine-grappelli-[0-9]*:../../www/py-django-m USE_PKGLOCALEDIR= yes USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-postgresql, py-django-mezzanine-filebrowser, py-django-mezzanine-grappelli, py-imaging +PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # py-django-mezzanine-filebrowser, py-django-mezzanine-grappelli, py-imaging MESSAGE_SUBST+= PYTHONBIN=${PYTHONBIN} From 50693cc4337949898c8252af3dbae84d1c36d134 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 00:29:04 +0000 Subject: [PATCH 0330/2457] Update to 38.7.0 Changelog: Fixed in Thunderbird 38.7 2016-37 Font vulnerabilities in the Graphite 2 library 2016-35 Buffer overflow during ASN.1 decoding in NSS 2016-34 Out-of-bounds read in HTML parser following a failed allocation 2016-31 Memory corruption with malicious NPAPI plugin 2016-27 Use-after-free during XML transformations 2016-24 Use-after-free in SetBody 2016-23 Use-after-free in HTML5 string parser 2016-20 Memory leak in libstagefright when deleting an array during MP4 processing 2016-17 Local file overwriting and potential privilege escalation through CSP reports 2016-16 Miscellaneous memory safety hazards (rv:45.0 / rv:38.7) --- mail/thunderbird/Makefile | 5 ++--- mail/thunderbird/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 49913a17677df..ca91f9699ce43 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.164 2016/03/05 11:28:51 jperkin Exp $ +# $NetBSD: Makefile,v 1.165 2016/03/21 00:29:04 ryoon Exp $ DISTNAME= # empty PKGNAME= thunderbird-${TB_VER} -PKGREVISION= 1 -TB_VER= 38.6.0 +TB_VER= 38.7.0 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} DISTFILES= thunderbird-${TB_VER}.source.tar.bz2 diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 2b5f143f0bfc8..4790e9b9c9ed6 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.173 2016/02/28 09:55:35 ryoon Exp $ +$NetBSD: distinfo,v 1.174 2016/03/21 00:29:04 ryoon Exp $ -SHA1 (thunderbird-38.6.0.source.tar.bz2) = 5fc8c1a92142321bd75dcff7bcaa1bc2d382b95f -RMD160 (thunderbird-38.6.0.source.tar.bz2) = 88a9d0ac2f557d439a9a9d9b8cdc111fec77809f -SHA512 (thunderbird-38.6.0.source.tar.bz2) = 9f6cb6b7c9b4935603333366a21cbb3e142fbdbded61adea44c39d45327207e1478d268fb721ee914ae1b0e762507f3665e40e1c315bd454fe1d019bd7972a08 -Size (thunderbird-38.6.0.source.tar.bz2) = 204415129 bytes +SHA1 (thunderbird-38.7.0.source.tar.bz2) = aece33eba30dffa7eaf6fdb5c7c26ae47743c35f +RMD160 (thunderbird-38.7.0.source.tar.bz2) = 42a5e32bbf79aa5398b2d410bf6854b27d64ec51 +SHA512 (thunderbird-38.7.0.source.tar.bz2) = 35d3c4ffc2d78947c93a167256e814aed84236cdc95f4576da33d7c0c655990d99b17e42a1d57f35967674e8805a40efb1ca640847531d2d991c8c0e2c336d2a +Size (thunderbird-38.7.0.source.tar.bz2) = 204453995 bytes SHA1 (patch-aa) = 199400ee6dc3c727c950e33ccc65cf57b81cdcb7 SHA1 (patch-al) = 81a733e9b13a47abfef818ecd10d7ef18a191855 SHA1 (patch-ao) = 2b4cfb8f06cb137058be7aa47ab7a3cada7cbfe1 From 0c830a537aad61e55b8488cefaef7733047a5631 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 00:29:53 +0000 Subject: [PATCH 0331/2457] Updated mail/thunderbird to 38.7.0 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 0bcaaab787a08..08001ea6d091d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1262 2016/03/20 22:10:24 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1263 2016/03/21 00:29:53 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1660,3 +1660,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/gtexinfo to 6.1nb2 [wiz 2016-03-20] Updated databases/py-postgresql to 5.0 [darcy 2016-03-20] Updated databases/py-pgnotify to 0.1nb3 [wiz 2016-03-20] + Updated mail/thunderbird to 38.7.0 [ryoon 2016-03-21] From 80f9f4b2746902763c850eb3cc543c55b495e4a4 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 00:30:18 +0000 Subject: [PATCH 0332/2457] Update to 38.7.0 * Sync with thunderbird-38.7.0 --- mail/thunderbird-l10n/Makefile | 4 +- mail/thunderbird-l10n/distinfo | 362 ++++++++++++++++----------------- 2 files changed, 183 insertions(+), 183 deletions(-) diff --git a/mail/thunderbird-l10n/Makefile b/mail/thunderbird-l10n/Makefile index 71f83d7a26a0f..02a34348cda87 100644 --- a/mail/thunderbird-l10n/Makefile +++ b/mail/thunderbird-l10n/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2016/02/28 10:03:34 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2016/03/21 00:30:18 ryoon Exp $ # -TB_VER= 38.6.0 +TB_VER= 38.7.0 PKGNAME= thunderbird-l10n-${TB_VER} DISTNAME= # empty CATEGORIES= mail diff --git a/mail/thunderbird-l10n/distinfo b/mail/thunderbird-l10n/distinfo index dea922822ff22..52d90653de8e6 100644 --- a/mail/thunderbird-l10n/distinfo +++ b/mail/thunderbird-l10n/distinfo @@ -1,182 +1,182 @@ -$NetBSD: distinfo,v 1.41 2016/02/28 10:03:34 ryoon Exp $ +$NetBSD: distinfo,v 1.42 2016/03/21 00:30:18 ryoon Exp $ -SHA1 (thunderbird-l10n-38.6.0/ar.xpi) = aeca70f3b90a7bde7b184a3568bb69d24e38db23 -RMD160 (thunderbird-l10n-38.6.0/ar.xpi) = 5b1338acc994a29143f9e0a4dc2179910e4335a5 -SHA512 (thunderbird-l10n-38.6.0/ar.xpi) = c255b3473efb9f9e74cebac2c9adadd502a6f73153ca352313ff1c823c9c128c441600e112066406b54d08d5a908360c7cd4cd5f4ac971e68ba32d34f038494c -Size (thunderbird-l10n-38.6.0/ar.xpi) = 475296 bytes -SHA1 (thunderbird-l10n-38.6.0/be.xpi) = 9cad3ddf04cf308c3de80256ae321e730616f295 -RMD160 (thunderbird-l10n-38.6.0/be.xpi) = 8f66e44740ff348440bc36d0211f6ed1db765d34 -SHA512 (thunderbird-l10n-38.6.0/be.xpi) = de7aa166df63d6885bd9c37a97f3397f2eb92a08d582a9e4bc8f3c5edc524eab3c7c04db3b44427dd849f245269f7540bf4e0fa63f587bb3d61e2f427b75fb33 -Size (thunderbird-l10n-38.6.0/be.xpi) = 442452 bytes -SHA1 (thunderbird-l10n-38.6.0/bn-BD.xpi) = 6d805c07833f536b9605a9098704147f946e0617 -RMD160 (thunderbird-l10n-38.6.0/bn-BD.xpi) = c0ae7ee54b5868e3be6c76889926c6137d8003ed -SHA512 (thunderbird-l10n-38.6.0/bn-BD.xpi) = 2668dcc956009a8055fec2f050647c8d91687ff0f884a39136a9b0a12e72a9321a01823e916a1f5ef669a5897a38df240162f70fbda198eb25ab64cce8fff703 -Size (thunderbird-l10n-38.6.0/bn-BD.xpi) = 560627 bytes -SHA1 (thunderbird-l10n-38.6.0/br.xpi) = d818164db3f81e3b4ea7cc71e881f1cd18a2b5be -RMD160 (thunderbird-l10n-38.6.0/br.xpi) = 87b7696512e5a9b79fd5218485c99719fd3414db -SHA512 (thunderbird-l10n-38.6.0/br.xpi) = d5965d74c3f867bff8c44727dafa664e1096695be1a5c95cc9448c9fd3735b2354c7697022d1cbdf0f274580d51fdb9a3854c9b2d9cf26b697507928e5a20ad8 -Size (thunderbird-l10n-38.6.0/br.xpi) = 449767 bytes -SHA1 (thunderbird-l10n-38.6.0/ca.xpi) = 126972a8cd7559e55eb08454ac034063a97346fa -RMD160 (thunderbird-l10n-38.6.0/ca.xpi) = 3688167df55ab0e1f15981345e0ae2139a18df65 -SHA512 (thunderbird-l10n-38.6.0/ca.xpi) = 65a95368e7d03095e34afb3fa982cc65c743868c5d9479e4bc70062d25f488dc51abf599869293a110bc96432a5ba908abdc2fb7fafeccdd40a5d3cd1a24ef16 -Size (thunderbird-l10n-38.6.0/ca.xpi) = 450325 bytes -SHA1 (thunderbird-l10n-38.6.0/cs.xpi) = 10b286017de366aa18cc8e407f1dd043b540688f -RMD160 (thunderbird-l10n-38.6.0/cs.xpi) = 2c09023c9d8817568117ac401bf8cdc2e98e24e8 -SHA512 (thunderbird-l10n-38.6.0/cs.xpi) = 49a517e56f53a2ab629c21c5cd7cea5d2c98ebfd2fb63f49464bee4448cda1734a493bf53ee9895c443f013d00e2bdc65a930a6e09bc41b5b9289378bf329583 -Size (thunderbird-l10n-38.6.0/cs.xpi) = 448724 bytes -SHA1 (thunderbird-l10n-38.6.0/da.xpi) = 2240ec0321da16b28cc91f4ccbf511887fd8c7ea -RMD160 (thunderbird-l10n-38.6.0/da.xpi) = a547c0e6bf5fdee30e6408910f74ea0b6e1782a9 -SHA512 (thunderbird-l10n-38.6.0/da.xpi) = 86226f35330d0ba7d928fa8dcef3b2bd3a5147ba4ea510ea715af2561e9491e75b6aa8edb0e16a0faa1b72e22f31e32bd4979648c2bf4538dfa366cc6f70e1a2 -Size (thunderbird-l10n-38.6.0/da.xpi) = 425829 bytes -SHA1 (thunderbird-l10n-38.6.0/de.xpi) = 955d9e17675243fc95aaca11c675fdeec7feb844 -RMD160 (thunderbird-l10n-38.6.0/de.xpi) = ff93ae2d5eceef835fb5d76d49092d3ae6e60b2d -SHA512 (thunderbird-l10n-38.6.0/de.xpi) = 7e8aabc807d106f66b16dbb74a12330106e96c4c3e886b59396d280e975be58dde6f051fa3d42bbad705547af28b32032982bbd59060b1b71f77de593fc8f5f3 -Size (thunderbird-l10n-38.6.0/de.xpi) = 429877 bytes -SHA1 (thunderbird-l10n-38.6.0/el.xpi) = 64f1478594ca5d2c71594f8892a6b171c3878b3a -RMD160 (thunderbird-l10n-38.6.0/el.xpi) = 4af83b8c181e1b888fcf6cc06cf63a2f47c74171 -SHA512 (thunderbird-l10n-38.6.0/el.xpi) = 220afdf26a63f32bb38535816c665200710e126ec6620c82b9397631e6216dd384ddf65ee0f34762eb61329892443a956dae3b8e54dad37d22e6ccbfba95f3d1 -Size (thunderbird-l10n-38.6.0/el.xpi) = 493490 bytes -SHA1 (thunderbird-l10n-38.6.0/en-GB.xpi) = 50a8cd28964a7ad297dedf19be0dc7d511ebc0b1 -RMD160 (thunderbird-l10n-38.6.0/en-GB.xpi) = 005da4f95f3b5c45f73cd9def7feadf0d4532383 -SHA512 (thunderbird-l10n-38.6.0/en-GB.xpi) = 681cc1e767381c85a6e503378b767d13d3f0c7b5123561569475d06f0d94727017d44a81050f656a4193e2b593263ba5bb766b2e44cb6011c57a7fce36a8ef42 -Size (thunderbird-l10n-38.6.0/en-GB.xpi) = 416572 bytes -SHA1 (thunderbird-l10n-38.6.0/en-US.xpi) = 457170d42fee7cda0035f96c8b10b10b0fd4e86d -RMD160 (thunderbird-l10n-38.6.0/en-US.xpi) = 4c3c2bdd6f75d1fd306b6e3b56eb682be0f0de8a -SHA512 (thunderbird-l10n-38.6.0/en-US.xpi) = 6c8372bc02b83d905f46abf6d710c52ce985764b1af10f1e10da8e0ea11dcf5807388fdd7ef9e165070fed2340fc236fe79ad8500a41451e5e203f9c8955586f -Size (thunderbird-l10n-38.6.0/en-US.xpi) = 416618 bytes -SHA1 (thunderbird-l10n-38.6.0/es-AR.xpi) = fa54b3d670bef3966457472e95fa2075a96446b4 -RMD160 (thunderbird-l10n-38.6.0/es-AR.xpi) = 9c7f04bcfd1f2f3ed22afda3f8d905b8a382d80a -SHA512 (thunderbird-l10n-38.6.0/es-AR.xpi) = 7f382176349e9058978839f410f339653a983b0001e3726b9ea85acc2d2327e27a34adeee371bd6001019b49d3ff667de0eb63efd1995bdd7337c499f8b195af -Size (thunderbird-l10n-38.6.0/es-AR.xpi) = 442641 bytes -SHA1 (thunderbird-l10n-38.6.0/es-ES.xpi) = ee1eb219cebef2203b6ed9a621870acccb3cbd7c -RMD160 (thunderbird-l10n-38.6.0/es-ES.xpi) = afdfda3162102ed255fe7d0ab12759345bae8622 -SHA512 (thunderbird-l10n-38.6.0/es-ES.xpi) = 63c3ba7d66bb90fa4fd539f07a88bd138db7836e3bc875b6272e297742aaf7ebe045a72acf9c15a9ef86b0c2d8593b5ceecf6dd1320bc99e567dac99050be983 -Size (thunderbird-l10n-38.6.0/es-ES.xpi) = 376067 bytes -SHA1 (thunderbird-l10n-38.6.0/et.xpi) = de7c78a435027cb2a9cd00caf5579883be7ff4fa -RMD160 (thunderbird-l10n-38.6.0/et.xpi) = db6d1ad3473490137a35261fb74e886bff094bf5 -SHA512 (thunderbird-l10n-38.6.0/et.xpi) = ea426e07cb5160c205ebfaf9642d10b3b6bc9d4ff20880f272bbeb855e5a8a0a57e3ecf66d246cf92da147f41c041f3e760abde7f068c03f063ea735d9264a9f -Size (thunderbird-l10n-38.6.0/et.xpi) = 438262 bytes -SHA1 (thunderbird-l10n-38.6.0/eu.xpi) = c0f45cc65aca0fcfd9d4ca987cd9a7d32da977d0 -RMD160 (thunderbird-l10n-38.6.0/eu.xpi) = c6eb6bf881cb8c9af90353c9e5a15cdaa1643c05 -SHA512 (thunderbird-l10n-38.6.0/eu.xpi) = e72ba8a523e6b79de7bd19d9d5cbc7dfdf4b607d595bcf1d91b787706bbfd496ef3c95c796845bf007308f15308664ce36f72806e47610f30f4b2aaabf6aed5e -Size (thunderbird-l10n-38.6.0/eu.xpi) = 434838 bytes -SHA1 (thunderbird-l10n-38.6.0/fi.xpi) = 5c211d20fb2bb258dbc01ebaf47fed927be9601d -RMD160 (thunderbird-l10n-38.6.0/fi.xpi) = 59205b6a495049d88390b9223e5ae620fdcaaecb -SHA512 (thunderbird-l10n-38.6.0/fi.xpi) = 9c7a2b9046136ba04fa7419adcdcb56799f8b0ef6182600bcfe3888c66f85399454c744dba1d397facb786442bd68d33c45887989955c679bc2f7bfa5fc95bf3 -Size (thunderbird-l10n-38.6.0/fi.xpi) = 438889 bytes -SHA1 (thunderbird-l10n-38.6.0/fr.xpi) = bb58c5026ed252224cba10deacbf6efeb4d4ab41 -RMD160 (thunderbird-l10n-38.6.0/fr.xpi) = 2469254a8a8128e49464933f733f4a409c42b30e -SHA512 (thunderbird-l10n-38.6.0/fr.xpi) = e9c058cb81990472275daecb0dbeae99d64ac47b6bed051a76b4b9061e648392987f2b6db24fe41ddd11c1c9624787187e9d32f15b82cd00816ffa31a3a694cf -Size (thunderbird-l10n-38.6.0/fr.xpi) = 448228 bytes -SHA1 (thunderbird-l10n-38.6.0/fy-NL.xpi) = 34855b618808a48df123b1d91133d7f871e1d3ec -RMD160 (thunderbird-l10n-38.6.0/fy-NL.xpi) = 080a4def0dace1c808b1c90b4a050288c042ed01 -SHA512 (thunderbird-l10n-38.6.0/fy-NL.xpi) = 8400e1bdbc808454d6e87bddee7c2e95cb52fc213570f3477705dc70ffb58abba5ebd4bbfad452ea15695b0730c0efc6ebc7824ba616e09128579987ef27e000 -Size (thunderbird-l10n-38.6.0/fy-NL.xpi) = 442161 bytes -SHA1 (thunderbird-l10n-38.6.0/ga-IE.xpi) = fdf58d1dc78ac90b80ba8916499819c746babd15 -RMD160 (thunderbird-l10n-38.6.0/ga-IE.xpi) = eb1782fc2c6e2f75496f2591f61d44651191b16f -SHA512 (thunderbird-l10n-38.6.0/ga-IE.xpi) = 09b3a67d533ec1924759611a61c44199e12f70a24e01545f88f53c7025c4a038ae4a6124d9311029889b2429ea86bd06bd27030d4ccb06e16f6fc1f614990fc7 -Size (thunderbird-l10n-38.6.0/ga-IE.xpi) = 457413 bytes -SHA1 (thunderbird-l10n-38.6.0/he.xpi) = 6a91b8280789dc3661b37a4698770efab1790b1d -RMD160 (thunderbird-l10n-38.6.0/he.xpi) = 43ca13397b60516d3c3270ac1636e3ee0f487cee -SHA512 (thunderbird-l10n-38.6.0/he.xpi) = 8801b351569210f0f261a9c0e7ebaab597391d35b279f90ff6c685dd9714efcaa16530618257233a2ec4d02ed880667028d4705a878792ca3e4cec8a7062b3e5 -Size (thunderbird-l10n-38.6.0/he.xpi) = 485868 bytes -SHA1 (thunderbird-l10n-38.6.0/hu.xpi) = 3b5ae5c505abcf09346b301b7791c3579c06134b -RMD160 (thunderbird-l10n-38.6.0/hu.xpi) = 9c4e0e35b6f125e7f79b1ea7028f1082268fdc8b -SHA512 (thunderbird-l10n-38.6.0/hu.xpi) = f99930e65742fc2fa474df28e3dcfa64c3a1fd613c0b5f8becd5567aaafe2f32a756a1683a4656b9b36224813637b8512784312645db7ad43d424bbe03d37417 -Size (thunderbird-l10n-38.6.0/hu.xpi) = 457988 bytes -SHA1 (thunderbird-l10n-38.6.0/id.xpi) = c1db78f4684ddf98c12fa404c2626534c3564430 -RMD160 (thunderbird-l10n-38.6.0/id.xpi) = 1f716a1fc3ae87f6f45d3d2ef2a16b53fe3881bb -SHA512 (thunderbird-l10n-38.6.0/id.xpi) = ddc0f7be70f6189b98b9a60911abfc248049026191efab3b2b0991c912beae116984fd60bb75775b05415dd4d10297b6a0719a89fd3fbf74bed11f8b9d51f67c -Size (thunderbird-l10n-38.6.0/id.xpi) = 483188 bytes -SHA1 (thunderbird-l10n-38.6.0/is.xpi) = 2e2fbcf030f0a5b6a6c8fb8d4ca83cadd9973ca9 -RMD160 (thunderbird-l10n-38.6.0/is.xpi) = b941e134701943401c1bac7f003c065085241939 -SHA512 (thunderbird-l10n-38.6.0/is.xpi) = f8cdcdbad24b1a8b3ec0e07626b05efe81183de46cee429d428fb4a1d0ed0c1c5c5050670b3651146335dbc928fa9bd3fd3617f18cda70ee17658aeaaa072edc -Size (thunderbird-l10n-38.6.0/is.xpi) = 443008 bytes -SHA1 (thunderbird-l10n-38.6.0/it.xpi) = d14e5ed75b6becddf5c5004fa8be5e5624956b30 -RMD160 (thunderbird-l10n-38.6.0/it.xpi) = 81408b5a872c03a791f291c9c0a8394dff1404b3 -SHA512 (thunderbird-l10n-38.6.0/it.xpi) = 79b899f6581731034ae8ceaa54a754255fb265350dd6a6f37bd01b2983351b8ee73462de65884b069d9828b3d5ab201a5896140cc6bf63d1d2a0c82337922a20 -Size (thunderbird-l10n-38.6.0/it.xpi) = 369024 bytes -SHA1 (thunderbird-l10n-38.6.0/ja.xpi) = 997dad9789ec77b586c33d4fc0212c7f59fab561 -RMD160 (thunderbird-l10n-38.6.0/ja.xpi) = 999e519a7b0463a778601558858c6b22bb0c7678 -SHA512 (thunderbird-l10n-38.6.0/ja.xpi) = 4178868f0bbbc4ad3e2d57610d90ed5cef374ff4debedcfa9f520445571062f3b9fe1fca8d924981c143d1c95ed32773845f5031878a97690f84fe0c213886c7 -Size (thunderbird-l10n-38.6.0/ja.xpi) = 492861 bytes -SHA1 (thunderbird-l10n-38.6.0/ko.xpi) = dd2774ea58680634312919cec7337c9e0d979ec3 -RMD160 (thunderbird-l10n-38.6.0/ko.xpi) = 566557081e34dde9ee9565e77342c61d087d5e1d -SHA512 (thunderbird-l10n-38.6.0/ko.xpi) = bd43686b5ea5b198d9ca712816ee056dd2a5c6e6e8f894f975711c7d1cf93fd6a2ded993deeef71a137bff9b7dab6497aaf55bd51005b17c74f0fb3cb6af00ae -Size (thunderbird-l10n-38.6.0/ko.xpi) = 454852 bytes -SHA1 (thunderbird-l10n-38.6.0/lt.xpi) = 18e6e27e24931534b41517817f99868d90ccf359 -RMD160 (thunderbird-l10n-38.6.0/lt.xpi) = 04f5eee60019c8b330b596c5c94f0bef5ba94510 -SHA512 (thunderbird-l10n-38.6.0/lt.xpi) = 8c0cbc575841bc42eb0c278b1d56ae0d8d3a9c2782802c27c9b189933e33cb04047930d9f6277e42acbb84aa2447f4f55b22e518761de43c5bc0b1b6b662640d -Size (thunderbird-l10n-38.6.0/lt.xpi) = 454572 bytes -SHA1 (thunderbird-l10n-38.6.0/nb-NO.xpi) = 4bc17e1fe6335dbcfb31a068f9a828c8fd1f4d25 -RMD160 (thunderbird-l10n-38.6.0/nb-NO.xpi) = 42d10255916b5b2776754a761cb20d5158e87657 -SHA512 (thunderbird-l10n-38.6.0/nb-NO.xpi) = b0cb592f6e4bcd7412a24d4fd0bd65497637c18dc84a7ce0d482803b24fdbbd0325d57b228578df6b5e0300bd4dd830b507ef180556bc5c215c027f69bdc0329 -Size (thunderbird-l10n-38.6.0/nb-NO.xpi) = 434341 bytes -SHA1 (thunderbird-l10n-38.6.0/nl.xpi) = 7630ade38bb355f7726b5992128e446636ccc65b -RMD160 (thunderbird-l10n-38.6.0/nl.xpi) = d7574bc5465a1eaad4a478feeb3d892a83171b1d -SHA512 (thunderbird-l10n-38.6.0/nl.xpi) = da400eee03f859edbea152ec979780b62ec408ba5cad7b4936cc734debac575cf9d5005eeab6b6fedfd35ec262c61ba226011091377ff5976a8d03ea46ce6e2e -Size (thunderbird-l10n-38.6.0/nl.xpi) = 435108 bytes -SHA1 (thunderbird-l10n-38.6.0/nn-NO.xpi) = adae48303a76450abca243729c404a948d1d5f85 -RMD160 (thunderbird-l10n-38.6.0/nn-NO.xpi) = 44f7f92620c8f8605488f968adfb92b0861e97f3 -SHA512 (thunderbird-l10n-38.6.0/nn-NO.xpi) = 34f3c8b6bd4bbe0eb717efda251c56d0d08a29dcf9e5660fde370adb4e4807897e70f1d21b537c94153543e84c9588b7e5ce6982f8e19886e72a24002a292f17 -Size (thunderbird-l10n-38.6.0/nn-NO.xpi) = 436623 bytes -SHA1 (thunderbird-l10n-38.6.0/pt-BR.xpi) = f1909c34a58be763db1257c9ab5a3558e4d9420a -RMD160 (thunderbird-l10n-38.6.0/pt-BR.xpi) = 92607fb2f2f4fa524fd0accd12eaac1620a44458 -SHA512 (thunderbird-l10n-38.6.0/pt-BR.xpi) = 7e13c54930cb18bfe4820d8ebd07c43f9b4b1972cdfa86413b25a87e9472fa0120abc728965684c3bddf132d04df3d17ec45a96bf26f42ce018645ddaf64d698 -Size (thunderbird-l10n-38.6.0/pt-BR.xpi) = 443752 bytes -SHA1 (thunderbird-l10n-38.6.0/pt-PT.xpi) = 117d03caa525eff7554bdb31c37cf90c9afa3f21 -RMD160 (thunderbird-l10n-38.6.0/pt-PT.xpi) = c8e09f890e2771cd9241d5c0654d9fd7b17eb8b0 -SHA512 (thunderbird-l10n-38.6.0/pt-PT.xpi) = 6387c75dcb963cc8b02ea56c545483b93cc127cc9b461fab3ffa92436d25dd10d11294afa452c11a731679780ee5cf89509268fd6a8c5b4068bfebf1e3f4a09a -Size (thunderbird-l10n-38.6.0/pt-PT.xpi) = 442064 bytes -SHA1 (thunderbird-l10n-38.6.0/rm.xpi) = ef09a930c2363b812dedd6f98fc0936ca809f85b -RMD160 (thunderbird-l10n-38.6.0/rm.xpi) = ba75616544b128da707d789b5527f378a08063b1 -SHA512 (thunderbird-l10n-38.6.0/rm.xpi) = cd7a6171ec9962a9b956f3c9bd25578b75dbe47aad9b9217ea27859c4aa22fe6b7c2145db73a4d26392c1d43ec626764d931c7b6da7c5c5d830b474c5827631a -Size (thunderbird-l10n-38.6.0/rm.xpi) = 442112 bytes -SHA1 (thunderbird-l10n-38.6.0/ru.xpi) = c080febfceeba58e9b723b358553dbb0a2e83766 -RMD160 (thunderbird-l10n-38.6.0/ru.xpi) = f02118a71179037bdfceec70c97f27263340c726 -SHA512 (thunderbird-l10n-38.6.0/ru.xpi) = 8f8918a5cc99017fd78055e5338fe0297878c66fcbe3c8c0919dddb185ecf88322b9684f8f2dbdabde8eaf6a366e4773322fe992e2c2c75b8003cfe799c0ed06 -Size (thunderbird-l10n-38.6.0/ru.xpi) = 437591 bytes -SHA1 (thunderbird-l10n-38.6.0/si.xpi) = 0d8df3ec695462d363656012fa8bcdeb731bc966 -RMD160 (thunderbird-l10n-38.6.0/si.xpi) = 50289af3d88ba1b7e8b2665e1eb49a95786c4a63 -SHA512 (thunderbird-l10n-38.6.0/si.xpi) = a075860f8be48023da148707003e959ebf09d6b6f00d87d5669e33119091d2361199497e083dee39311f16f8cf6c223712f6289eceefe3e59865909dda6ecca2 -Size (thunderbird-l10n-38.6.0/si.xpi) = 535341 bytes -SHA1 (thunderbird-l10n-38.6.0/sk.xpi) = 3960d255c2304bfd7b236c95506c0138719f48da -RMD160 (thunderbird-l10n-38.6.0/sk.xpi) = 84241a06fcf90edfeee8860150f5e56cd7d75b3a -SHA512 (thunderbird-l10n-38.6.0/sk.xpi) = 1de0672350eb1a9e071e98801210b395cee23bb835037305d809937d0b476b0661a58db7adec88762240de3abd01ef2446c82088dc53d7ed04ed13bddc19d7b9 -Size (thunderbird-l10n-38.6.0/sk.xpi) = 456606 bytes -SHA1 (thunderbird-l10n-38.6.0/sl.xpi) = 8348e3eb508778d0e88e715346dd0db9a4d3e285 -RMD160 (thunderbird-l10n-38.6.0/sl.xpi) = b148f1a346d6e0fdb9d91f4c4563e43734ccce08 -SHA512 (thunderbird-l10n-38.6.0/sl.xpi) = 15b3485b4a602b823701c8a11e582a994af54853dbb0663e7ae71aa9455822d595ae6b3a408ec675165e6136a32d15919b15ced47d2d789c55d37b0f80c05fef -Size (thunderbird-l10n-38.6.0/sl.xpi) = 437848 bytes -SHA1 (thunderbird-l10n-38.6.0/sq.xpi) = bf8b0689bf5a5e2b82a75f47537478f0a905f011 -RMD160 (thunderbird-l10n-38.6.0/sq.xpi) = f5e34fe4f9cafe563b0bf4fb22056544d87e633b -SHA512 (thunderbird-l10n-38.6.0/sq.xpi) = 2799cc949148571720b4807621d59d4d913dc69eed9c3148c7e7b174f2f7ca88ae0c1d80788af71020aba5e79a99f4d21aa241f342e929bbc45d4acdc60c1988 -Size (thunderbird-l10n-38.6.0/sq.xpi) = 446897 bytes -SHA1 (thunderbird-l10n-38.6.0/sv-SE.xpi) = 3f286d2a83a90b19d45324c17f939b0629e2ce61 -RMD160 (thunderbird-l10n-38.6.0/sv-SE.xpi) = 9677c616c82b2de3f478ee2f84ba9b66c105169b -SHA512 (thunderbird-l10n-38.6.0/sv-SE.xpi) = 876e4ff1cc4ed5d1c83e5ed3b07fa8a6f437c16a331aac006bb517b9fd76655efb6e29bf726d86f20de5992657adc2126d66636b7986a3d92ada301577dcd86d -Size (thunderbird-l10n-38.6.0/sv-SE.xpi) = 439633 bytes -SHA1 (thunderbird-l10n-38.6.0/ta-LK.xpi) = 5315d288efb4eb81c0ac2fdc2fc5285cdca38432 -RMD160 (thunderbird-l10n-38.6.0/ta-LK.xpi) = ca5bcf85feade9325931b52dfaa251b5623c23ec -SHA512 (thunderbird-l10n-38.6.0/ta-LK.xpi) = 5698bc6e4e1b3c5f0f178dfb5f66e5c9d730763f11cd49905656089edf14bd5a19d0d7f82558f36634faedf8ba9022195eed4406c6e506112d9f6f75c51d671c -Size (thunderbird-l10n-38.6.0/ta-LK.xpi) = 558738 bytes -SHA1 (thunderbird-l10n-38.6.0/tr.xpi) = 3152256b461ea1c4ba51498c5b2feed849ba1727 -RMD160 (thunderbird-l10n-38.6.0/tr.xpi) = f762f60f63508f7bf328b751f245407710a1467e -SHA512 (thunderbird-l10n-38.6.0/tr.xpi) = ac2e1036380db78501178c143bb74acede3b6d3668f8eff4e85cfaaee98eaf5963b5fce6cc5043a857a7f6813e9bbb0d61daf4555855c59568378f3838ff68b9 -Size (thunderbird-l10n-38.6.0/tr.xpi) = 447800 bytes -SHA1 (thunderbird-l10n-38.6.0/uk.xpi) = b9bbb4ddeadcc98bc4d5626d7a639307cffc51e2 -RMD160 (thunderbird-l10n-38.6.0/uk.xpi) = 6097c9dec93c42dd72a22087c5d9775ebf37fdf7 -SHA512 (thunderbird-l10n-38.6.0/uk.xpi) = 9b8871d1bbd745ea9775f2c697be1e56f9ddde9e5a0189c9817f1ab3d9958a1aa121163a9eb9eaee2b11d9ccd3365247ac9137fe782e24d2d5cf2436f0a835f6 -Size (thunderbird-l10n-38.6.0/uk.xpi) = 509600 bytes -SHA1 (thunderbird-l10n-38.6.0/vi.xpi) = a752143c6e591d1bf3d0cad4e285a9bc1e92257b -RMD160 (thunderbird-l10n-38.6.0/vi.xpi) = 342c2194792bac27eb010140e3cc1cb635610972 -SHA512 (thunderbird-l10n-38.6.0/vi.xpi) = 18d4e00c207c33c360511ce55f25e2fe2a6e0bc8cea1ab96ee77cc006d7620edf8a4cd75224936553043323d25142f67810f71b8775d7e2a5fc3a2b4665f92f0 -Size (thunderbird-l10n-38.6.0/vi.xpi) = 519844 bytes -SHA1 (thunderbird-l10n-38.6.0/zh-CN.xpi) = 4115cbef2e96f8eb2bf79ba8eab97207e3633fdd -RMD160 (thunderbird-l10n-38.6.0/zh-CN.xpi) = 9ef6d3b751b8858eaeebf070983b2f24504de3e3 -SHA512 (thunderbird-l10n-38.6.0/zh-CN.xpi) = a0ac8e60a38f3a001e836472febd5d2e5118c5ea1449f8d136696d65df15dfa61c505555416143c9b10358537e10f6a7cc56a2888119480fc88cf4f9874128be -Size (thunderbird-l10n-38.6.0/zh-CN.xpi) = 466412 bytes -SHA1 (thunderbird-l10n-38.6.0/zh-TW.xpi) = 097163fa3ae4b32e0a952a43ac55342db662ef86 -RMD160 (thunderbird-l10n-38.6.0/zh-TW.xpi) = dcbe7e8aaddeaacd712bfe4809ae50f63e16d024 -SHA512 (thunderbird-l10n-38.6.0/zh-TW.xpi) = e948cb17026693b786ba1d0c21fa94d2716b854467f4f96260e2654b232fb2a0169786d6fce0206cea307f65bbca953603cf600cfb46bfc2c64c8dd7316bf877 -Size (thunderbird-l10n-38.6.0/zh-TW.xpi) = 466661 bytes +SHA1 (thunderbird-l10n-38.7.0/ar.xpi) = ed7ee130a3c039e3e9303dd16b72d6c7c57a7cc0 +RMD160 (thunderbird-l10n-38.7.0/ar.xpi) = e039a9a8c1f66ec46f6e602c5c8e894ba0316211 +SHA512 (thunderbird-l10n-38.7.0/ar.xpi) = 0b6af724616356dc92ef3549215c201a6e27faeba53247414c1636598b51789565671ba6063271985c07e1ea28d4b6f0d4b957df08b18b274a848d808d445776 +Size (thunderbird-l10n-38.7.0/ar.xpi) = 475296 bytes +SHA1 (thunderbird-l10n-38.7.0/be.xpi) = f08225c272338fc550d9840b6a9ecaa0a0686d15 +RMD160 (thunderbird-l10n-38.7.0/be.xpi) = 34bcb94fba2e684908ad529b1c68c23c48acdeae +SHA512 (thunderbird-l10n-38.7.0/be.xpi) = 8dca6d1f2219bdea4587cd6d6cdfdadbbf0f1bf449f2d07d4d20cd2c5e34ba639d27f227ba95c4d7f01055307023c070488d89ec022a92493a7580db37f180ac +Size (thunderbird-l10n-38.7.0/be.xpi) = 442452 bytes +SHA1 (thunderbird-l10n-38.7.0/bn-BD.xpi) = 2400851fba39e2acaebc0acd6ff89a590a90c717 +RMD160 (thunderbird-l10n-38.7.0/bn-BD.xpi) = 624b68016d6d3a6a0278542a954ab207e391cc36 +SHA512 (thunderbird-l10n-38.7.0/bn-BD.xpi) = d5ce7cb1350a5216dbbf15160ec3956092df4b65241dbadfcd2211ed60cafa51c7a0d2f7907f7f3d19c304be9ec8ca163c6cc3cd9e02551e8e78cc54d81d06d3 +Size (thunderbird-l10n-38.7.0/bn-BD.xpi) = 560627 bytes +SHA1 (thunderbird-l10n-38.7.0/br.xpi) = 576fadb9b6faf0fb93837f237660803ecb19dc07 +RMD160 (thunderbird-l10n-38.7.0/br.xpi) = fa2ff0240cae57db482cb0f77829cd5f1f37fc40 +SHA512 (thunderbird-l10n-38.7.0/br.xpi) = 80c201e7ad0d06cd8603e004487831093b4459c6c69b3b724505916160aa255169a129ebe8547f9a70ad2b8f225233ef2fbfdb37034903483cdeca74cad4cf83 +Size (thunderbird-l10n-38.7.0/br.xpi) = 449767 bytes +SHA1 (thunderbird-l10n-38.7.0/ca.xpi) = a37bebf13c4c125e66f1cfede02531cac7a31060 +RMD160 (thunderbird-l10n-38.7.0/ca.xpi) = 3e6bb941a3c5ecaa1746c8e8cf73cc33d1c76023 +SHA512 (thunderbird-l10n-38.7.0/ca.xpi) = 9a79649b4f776428cff7c02807b5c76b4d1edf00ea74b7335cbb4d06c20009dc68130810236188d7766c81c795852e90023b5ae4b90f87091947403b76312957 +Size (thunderbird-l10n-38.7.0/ca.xpi) = 450325 bytes +SHA1 (thunderbird-l10n-38.7.0/cs.xpi) = 5dd44d0ed385ce4ed8679f54ec7be6ab84939901 +RMD160 (thunderbird-l10n-38.7.0/cs.xpi) = 46dd69392163a0a6f9ea14da5582acb87748a63e +SHA512 (thunderbird-l10n-38.7.0/cs.xpi) = 4529a6c9960769190f00694514691ee34e40db64442b1aae5eba1322538621cafddd161276ab805375a9044186b55f998979b9fb92b9b0c311f36f7a585baad3 +Size (thunderbird-l10n-38.7.0/cs.xpi) = 448724 bytes +SHA1 (thunderbird-l10n-38.7.0/da.xpi) = 5b4ce402755b8bf191341c31f4af24bd634ce5f7 +RMD160 (thunderbird-l10n-38.7.0/da.xpi) = 25353f1cfa9e4e7be887e54bb6ec9503097ed529 +SHA512 (thunderbird-l10n-38.7.0/da.xpi) = 745ee391716b051552b5a09e6edc312455b0fd5210aa95b90c9b585d8565a6b31649306994ee32cb20ad3eac476ca71057e239c4bfcf5a88d8227c461c31c8d1 +Size (thunderbird-l10n-38.7.0/da.xpi) = 425829 bytes +SHA1 (thunderbird-l10n-38.7.0/de.xpi) = 61a6bbe43d4a09f44a9ef34de19a92a1e86dc568 +RMD160 (thunderbird-l10n-38.7.0/de.xpi) = eeb08e9a7a4e660dfd4db2cb7d2f8721491838f4 +SHA512 (thunderbird-l10n-38.7.0/de.xpi) = 87f7f49561915b097f25d024997faf1ad73420d4124f36ae9895b072929b129b462c4f49585f250ddbe386606315d703ae7ad94ebc0eb14d58e3a58d8accc913 +Size (thunderbird-l10n-38.7.0/de.xpi) = 429877 bytes +SHA1 (thunderbird-l10n-38.7.0/el.xpi) = 110f465f6494af887f27905cb6d9692b0f92dfb3 +RMD160 (thunderbird-l10n-38.7.0/el.xpi) = efff2adabcd3ea634c849664f9501a7bfa2c13f3 +SHA512 (thunderbird-l10n-38.7.0/el.xpi) = b03ce8f7f3d9a766650aaa82c7cd5092fb788fec686bc1f16080b4c610ea585ce9d84ac384a6efca338bfaec840621f08f0d94bdb6c11ed8617d07df3836bfd4 +Size (thunderbird-l10n-38.7.0/el.xpi) = 493491 bytes +SHA1 (thunderbird-l10n-38.7.0/en-GB.xpi) = 863d2725885e36678475a691f659c10c9e1ca3e2 +RMD160 (thunderbird-l10n-38.7.0/en-GB.xpi) = 4464e63cc8f5a165236de324d552047f8a3027b3 +SHA512 (thunderbird-l10n-38.7.0/en-GB.xpi) = 5155c2310dcf01f0e7dfa5a98efce99c1ab18a9d3f11213893b8b419a6ff83d4cc94526b00ec77d58a25945dcacc641b9821a35cca260cb14acd60b701f07c4f +Size (thunderbird-l10n-38.7.0/en-GB.xpi) = 416572 bytes +SHA1 (thunderbird-l10n-38.7.0/en-US.xpi) = 95fd6e1c64d9071273c89b69ccc84dbabc445084 +RMD160 (thunderbird-l10n-38.7.0/en-US.xpi) = 494d9f8636c49f137c7676db0d5f7e1c51e24af4 +SHA512 (thunderbird-l10n-38.7.0/en-US.xpi) = e2e2017fc830ea28b7f2723d4214949d71cc30708f32405694a4bc9f77df1350b98421d2ff44170bb72cdbce42104d36dcfc66f4c187658fc6c109441eed0fb3 +Size (thunderbird-l10n-38.7.0/en-US.xpi) = 416618 bytes +SHA1 (thunderbird-l10n-38.7.0/es-AR.xpi) = 41980d665efc2c35080c2745be2628c781f70357 +RMD160 (thunderbird-l10n-38.7.0/es-AR.xpi) = 032f218419da621baf3345d1d899a2c22cee4b00 +SHA512 (thunderbird-l10n-38.7.0/es-AR.xpi) = bb527e4a6c1765737ed0c5a021579e7b492707457a76c68f3307bb6322b202b6db20d163e8c1e39f763c812faece55aabd9d8d5fa6f75e79585203d0e822279a +Size (thunderbird-l10n-38.7.0/es-AR.xpi) = 442641 bytes +SHA1 (thunderbird-l10n-38.7.0/es-ES.xpi) = 65d5d1e215f2c4c83a75e5da3a57d6cced06a96c +RMD160 (thunderbird-l10n-38.7.0/es-ES.xpi) = 8abc29c718211450a25297d2b676eab43d01a329 +SHA512 (thunderbird-l10n-38.7.0/es-ES.xpi) = 7c888f716f6a1b6d6e0883e276a4911ca9e8ebaaa94c2b7d0db08318d323e62e0de3b8bc2bbf8b7a454c02bd089c927a005810918dd152638dac994c97b21654 +Size (thunderbird-l10n-38.7.0/es-ES.xpi) = 376067 bytes +SHA1 (thunderbird-l10n-38.7.0/et.xpi) = 9a99a5a62ae828202e72261bdb45dfba491df456 +RMD160 (thunderbird-l10n-38.7.0/et.xpi) = 6dc7b6cfbe9847b156ff6c90d3b5144a6c5e805e +SHA512 (thunderbird-l10n-38.7.0/et.xpi) = 13c0ff49e3909e1ada01aaafdbe695642dea084229f468aef5b345962a6aa10c8da4f21c4c63eb3ce8614a694399afa87213578747f0fca2c0f2bfa0e65afc86 +Size (thunderbird-l10n-38.7.0/et.xpi) = 438262 bytes +SHA1 (thunderbird-l10n-38.7.0/eu.xpi) = 7839ccd47e93d0b1e67e0d21911b0ae38ad50def +RMD160 (thunderbird-l10n-38.7.0/eu.xpi) = 6563df3eae72496a0ff8139217a1372161bcdd9b +SHA512 (thunderbird-l10n-38.7.0/eu.xpi) = 63b9ca6c70685a1381f946e60bbbbf7a0335add91af8f918dc3002aa73881ce13c106c2d031dad2132b97b607d32edd8aeabc810c47a1bd4656d3cd1b65f77a4 +Size (thunderbird-l10n-38.7.0/eu.xpi) = 434838 bytes +SHA1 (thunderbird-l10n-38.7.0/fi.xpi) = 2ed48e6180da3758d1afac2dc3ad893f0de93eb0 +RMD160 (thunderbird-l10n-38.7.0/fi.xpi) = 6977669036e137cfa915c8675fcef06863e1564b +SHA512 (thunderbird-l10n-38.7.0/fi.xpi) = 6e275d8dbf48a39c21d70c02d69333b32a8bae356fd63c2ddfa181f4392452a8389b032e6cd62d2faa2bd1485e36b3148947ba556bda649bff9e05820f923423 +Size (thunderbird-l10n-38.7.0/fi.xpi) = 438889 bytes +SHA1 (thunderbird-l10n-38.7.0/fr.xpi) = 0e3d871b5805c3d61ffddfdab4b812e9c260b91b +RMD160 (thunderbird-l10n-38.7.0/fr.xpi) = 124cadab19f271d4ba402618334675832c3769a2 +SHA512 (thunderbird-l10n-38.7.0/fr.xpi) = f2a8fca7cb5f4e7516d5eb32a178e13e42763e282a2525060b88a8b8d2dc574df71995c38c5ec10b305742da42960be69275a48ee36bd73624118f490cfa94a0 +Size (thunderbird-l10n-38.7.0/fr.xpi) = 448228 bytes +SHA1 (thunderbird-l10n-38.7.0/fy-NL.xpi) = 26842c89bbdcd6f602d2149243ebffa2c8c5c0da +RMD160 (thunderbird-l10n-38.7.0/fy-NL.xpi) = b5a71d6035287cee03295f05bdac63f89585cfbf +SHA512 (thunderbird-l10n-38.7.0/fy-NL.xpi) = 87474308ef0d86c140ed1f5d156b51466d8a9995541533821c6752fc0168e65923e92fc138e135b722dfb8233779dca24051fce8c289da321a333879692a9fed +Size (thunderbird-l10n-38.7.0/fy-NL.xpi) = 442161 bytes +SHA1 (thunderbird-l10n-38.7.0/ga-IE.xpi) = 1930f934f928a758484a09d0d9bc0d60993dd4fd +RMD160 (thunderbird-l10n-38.7.0/ga-IE.xpi) = 7f09ffc846a694bd8980af118aa8f923281ada57 +SHA512 (thunderbird-l10n-38.7.0/ga-IE.xpi) = cfd2f216b2a6131d902abfa03d39c36747d61565cc52d8d69d36dab661cdfb85fc13e18013f4c3d8ea34367f8061b5d56ae7bc388972548dc4dd44ff75837d42 +Size (thunderbird-l10n-38.7.0/ga-IE.xpi) = 457413 bytes +SHA1 (thunderbird-l10n-38.7.0/he.xpi) = b2974901ef3009e752489b37dad3dfc3a27c88d5 +RMD160 (thunderbird-l10n-38.7.0/he.xpi) = 5d57e2cb0d2a0dd631581f6651c4a2f677177cb4 +SHA512 (thunderbird-l10n-38.7.0/he.xpi) = cd6356ed13c037d80dfa696b51cdf8d0f7c3576af479f94d2b6d1b33d16023d0a1b61bcc6ad048df15a2695a93dd60b044846063cd006ae6ac15f8c33a3c6fc6 +Size (thunderbird-l10n-38.7.0/he.xpi) = 485868 bytes +SHA1 (thunderbird-l10n-38.7.0/hu.xpi) = 3468e53173eb8dee0d7c37d3cb1a5b3d9d4e3ae5 +RMD160 (thunderbird-l10n-38.7.0/hu.xpi) = d813aae66c11513d0572117414bf88df556904aa +SHA512 (thunderbird-l10n-38.7.0/hu.xpi) = 92a93fe6ad4182386b03dd414adbe25305846a50ef9ae029ae3a878448327adaeaf373f22afe1bdefbbdd1655e00a76878d3aaf8b7cc5ac73a3f86e7bd0bda33 +Size (thunderbird-l10n-38.7.0/hu.xpi) = 457988 bytes +SHA1 (thunderbird-l10n-38.7.0/id.xpi) = 41abc92acdf24ece675629536d99e9df556ccd60 +RMD160 (thunderbird-l10n-38.7.0/id.xpi) = 4a023d386342d9077d3c8583c99a0ab0b2555a6d +SHA512 (thunderbird-l10n-38.7.0/id.xpi) = 831a1af953dc92ca4a6bfad8d398ec9ee55d8ea2e3720e6bd0c7973c267e0fe447663bc188c54c1fb8da2d64298d9bfb600931f3a43cc8645c36bb7ca066e913 +Size (thunderbird-l10n-38.7.0/id.xpi) = 483188 bytes +SHA1 (thunderbird-l10n-38.7.0/is.xpi) = fc585ae65cbda05f1cb95d932b990eddc6ea0e93 +RMD160 (thunderbird-l10n-38.7.0/is.xpi) = a3b47a9050c28f31411b9fba25fb068520f732e5 +SHA512 (thunderbird-l10n-38.7.0/is.xpi) = 738b6741f23bbd19ff3f950142de21bba360535b63d48729b975cb9f0b2c249059cc71a0539c44364b2b876c054e616739014613bb429772d0da4cd00cd4aa95 +Size (thunderbird-l10n-38.7.0/is.xpi) = 443008 bytes +SHA1 (thunderbird-l10n-38.7.0/it.xpi) = 6c47828e86822a55388de34bb925ab169045eed9 +RMD160 (thunderbird-l10n-38.7.0/it.xpi) = b81302f7293223e94734d9cc2a4349a5dcdb3ae0 +SHA512 (thunderbird-l10n-38.7.0/it.xpi) = 7fd70814fa3d800e77b522290cadbc611317bf553b832b973c1af92215dc1c731dcc5feb23af7860296d34a5ef857943333d7b2db97a359c0d04dcda08f6bed9 +Size (thunderbird-l10n-38.7.0/it.xpi) = 369024 bytes +SHA1 (thunderbird-l10n-38.7.0/ja.xpi) = 1148916b6b81f07f3b71282e70f460b875768a03 +RMD160 (thunderbird-l10n-38.7.0/ja.xpi) = c9671774ae06090956190815543db19ae86f496b +SHA512 (thunderbird-l10n-38.7.0/ja.xpi) = 8d3576cd04b35c7f39da49d755721eb230b3e965dafd7886926a9bd599091183515b05a295fe121f3bafe731a41eac0f94dd0fc12f41792597e628e652e0190e +Size (thunderbird-l10n-38.7.0/ja.xpi) = 492861 bytes +SHA1 (thunderbird-l10n-38.7.0/ko.xpi) = c7d372d17089a2bc857c0f94b2f93d3160007463 +RMD160 (thunderbird-l10n-38.7.0/ko.xpi) = 239c3d1b74fddcc4439de8990dc6efca658eb1a3 +SHA512 (thunderbird-l10n-38.7.0/ko.xpi) = 6c075864f49bb64cf200389c26847cb2cc7373ba55141fef62728e4f55371a5ee9075e010c003c958421cb94f46601da758cd8ae01502f5b01f5279d5c1ab2d3 +Size (thunderbird-l10n-38.7.0/ko.xpi) = 454852 bytes +SHA1 (thunderbird-l10n-38.7.0/lt.xpi) = c0286247b4e8cb5ddd77ca7445540211ed6282d5 +RMD160 (thunderbird-l10n-38.7.0/lt.xpi) = 0a40567333c665beb22614badce64c15109ab13e +SHA512 (thunderbird-l10n-38.7.0/lt.xpi) = 2d7a4808f00a1660ec8c3cc1506e62ade166cb313f0be220edf327216788a0adfadf560c7cd74c0adce09ac2127ac54b00179785ce973f69f20eab7abea6202e +Size (thunderbird-l10n-38.7.0/lt.xpi) = 454572 bytes +SHA1 (thunderbird-l10n-38.7.0/nb-NO.xpi) = a9e4dfc01d44b78adc91f74b7a4ec350601b922e +RMD160 (thunderbird-l10n-38.7.0/nb-NO.xpi) = 4a62e273059440400a5a2eaac480dff5a13e95ba +SHA512 (thunderbird-l10n-38.7.0/nb-NO.xpi) = e541e02a878ac5f4e9556a6cf6c4625c03c0bf2d1d34da79e7b6baea0946cb7e18072b93b72081544849e16abe68d858d6ac85375b9ebd3d26b62c7d9db2c7de +Size (thunderbird-l10n-38.7.0/nb-NO.xpi) = 434341 bytes +SHA1 (thunderbird-l10n-38.7.0/nl.xpi) = 125a78ec0f85070f7161241def6d6d8286d36f0f +RMD160 (thunderbird-l10n-38.7.0/nl.xpi) = fe9fa0bddcfc85fc9d93d3087e7be0076e38bf13 +SHA512 (thunderbird-l10n-38.7.0/nl.xpi) = 00ec40dad88fcb0ca84f40c595af5e0de94bcb457fcbc612f56ff8529e9d823c7f929cfbb5f53527d0736284468c3964f2c073b6bcc9fbfebc1964dc93ad93d4 +Size (thunderbird-l10n-38.7.0/nl.xpi) = 435109 bytes +SHA1 (thunderbird-l10n-38.7.0/nn-NO.xpi) = 8d3a5d1268a5505735ab44cccb01cff32dd64372 +RMD160 (thunderbird-l10n-38.7.0/nn-NO.xpi) = 1b96c57aa618769789a9cc1bd2aed7e6254a51d6 +SHA512 (thunderbird-l10n-38.7.0/nn-NO.xpi) = 510a380a220d0c511b5f28cbee6421db580e329d62f2bb7adbf440a381782268f7192d49b102afa3310aaca8a982817c781dd8271cd75b72bfbb538bfb02d5ff +Size (thunderbird-l10n-38.7.0/nn-NO.xpi) = 436623 bytes +SHA1 (thunderbird-l10n-38.7.0/pt-BR.xpi) = 41be5e9b964ddba8ef2e0289eca87be224b5964d +RMD160 (thunderbird-l10n-38.7.0/pt-BR.xpi) = efa58b7cfad9bcd48152e9705094c15b958a956d +SHA512 (thunderbird-l10n-38.7.0/pt-BR.xpi) = fbe2a3f98c71c873664b47448512ebb70d94657e9e17368218dfaf5bca0c6611bf3d37b0e291167852e1ddb63b4b45066da17f9bb9e7ab56689bf322aaf9f279 +Size (thunderbird-l10n-38.7.0/pt-BR.xpi) = 443752 bytes +SHA1 (thunderbird-l10n-38.7.0/pt-PT.xpi) = 18635a7c69b2a98cfe1c8d397af53f73f0a75f9e +RMD160 (thunderbird-l10n-38.7.0/pt-PT.xpi) = 24e55e7bbd9648099d77ea10bae8d03a182bcc88 +SHA512 (thunderbird-l10n-38.7.0/pt-PT.xpi) = 006e4f9e3bae30f8fca3c98169e214bcbc2a87ccf8386ec24505a2430399490baabf80f3a08a5e05d084250ea350fab1643d88785be936f67af0f0aaff0e708e +Size (thunderbird-l10n-38.7.0/pt-PT.xpi) = 442064 bytes +SHA1 (thunderbird-l10n-38.7.0/rm.xpi) = c420fd5b4dc59dd7dc79fb20b785cbd4e5510689 +RMD160 (thunderbird-l10n-38.7.0/rm.xpi) = ef182b12cb5004da0f9b8bad49928a27a7a9f211 +SHA512 (thunderbird-l10n-38.7.0/rm.xpi) = c0509291e38f85dac12eeca834a333c2b35e14344503ffa3a7d19f29eb4be54db6a7f5ebed8911ea7918f6ca9fd9e8d014eef59dd47f683565b3c0e0bb9cb1c3 +Size (thunderbird-l10n-38.7.0/rm.xpi) = 442112 bytes +SHA1 (thunderbird-l10n-38.7.0/ru.xpi) = 17070d6354b3e58ac601e0d00d8cc0589b5fbbde +RMD160 (thunderbird-l10n-38.7.0/ru.xpi) = d1a30477191fbcf49419b08f5b29bbbe2ef884f2 +SHA512 (thunderbird-l10n-38.7.0/ru.xpi) = 19e46d1cfbfc4fd6b41c8bf1be6b71917d5b076e20e4f82db19eadb5810b197406a5fb0a4d13797f11ce8b281713c7fcbf73cb62b21c4fe4a1a80d9adadab69c +Size (thunderbird-l10n-38.7.0/ru.xpi) = 437591 bytes +SHA1 (thunderbird-l10n-38.7.0/si.xpi) = cbdd9b283b95bd42146622d5e23e30125925095c +RMD160 (thunderbird-l10n-38.7.0/si.xpi) = f063bc8ef1d465b49e01d329bcd95d3f396979ee +SHA512 (thunderbird-l10n-38.7.0/si.xpi) = 842acfb754320538fa99ff7b7b97a246691bfe42d478c42f3279746bde507a1ece9f87017a46713c99cca277a6db28d766817279440ab96d8f09490879217e71 +Size (thunderbird-l10n-38.7.0/si.xpi) = 535341 bytes +SHA1 (thunderbird-l10n-38.7.0/sk.xpi) = 38ebf109cce9a30725a583e729e8a82871be7e5a +RMD160 (thunderbird-l10n-38.7.0/sk.xpi) = 22dc3321e1311d599e1c1c38f1221062dfcf119f +SHA512 (thunderbird-l10n-38.7.0/sk.xpi) = 996d793b2468dd02799d6cf8f5246f7b6f2c878c14dca9f07aad39434ca90ccd6d685c2ee1af397354858f2c724d87e83c0ab43d9c1acf39c5c8b3745a83d3ab +Size (thunderbird-l10n-38.7.0/sk.xpi) = 456606 bytes +SHA1 (thunderbird-l10n-38.7.0/sl.xpi) = 6375445d7788a64632a42d5892f1d905e2e7f627 +RMD160 (thunderbird-l10n-38.7.0/sl.xpi) = afd5a1fddee3f1dea140309fea25d52e03844a96 +SHA512 (thunderbird-l10n-38.7.0/sl.xpi) = 68da64495a368b1fbc2bd7f9b68ea27ed4a634000472c595917f7eb95ef636bfa007f9a421ec6c36525937472afd21fb7083ff016357f59aa98f1d1d4ed68d1c +Size (thunderbird-l10n-38.7.0/sl.xpi) = 437848 bytes +SHA1 (thunderbird-l10n-38.7.0/sq.xpi) = bacd28cbbe93d9c16c9a95cede75433e0877cac9 +RMD160 (thunderbird-l10n-38.7.0/sq.xpi) = 345c1dce8c704a1d2530f4c6c2fe0d33b7d09392 +SHA512 (thunderbird-l10n-38.7.0/sq.xpi) = a6f20a38b7b194b401c842ae29a6fb114f12671eca0caa2ba517b66169c11ee501b9551ce6c42f7c919fcda7b5f426d06c42456fe26134d2af57d3c8b4befc33 +Size (thunderbird-l10n-38.7.0/sq.xpi) = 446897 bytes +SHA1 (thunderbird-l10n-38.7.0/sv-SE.xpi) = 779e3643ec809c6829b8f4d0650b7844e6cdf3ae +RMD160 (thunderbird-l10n-38.7.0/sv-SE.xpi) = ddbbb191703a27a63fc0052f62aa7b9a754eafa9 +SHA512 (thunderbird-l10n-38.7.0/sv-SE.xpi) = 8ec095d5514810934ce0a2d476e5f7421964ef6e35f1b46332bac8dd70b4efa9e025e266bff98f201e036aff4593dc59aebf35921b91ff39bb3f0313bdaea0be +Size (thunderbird-l10n-38.7.0/sv-SE.xpi) = 439633 bytes +SHA1 (thunderbird-l10n-38.7.0/ta-LK.xpi) = 87a48402efc8701a0de53b067b1ed9ca64f3e611 +RMD160 (thunderbird-l10n-38.7.0/ta-LK.xpi) = 00b06a13ed0662ed66b97db01fe36bb6792fe012 +SHA512 (thunderbird-l10n-38.7.0/ta-LK.xpi) = 1376b3bf92435175c9bc134f54db353b0ee64efe0db0efed449ffd5ff1ea34c966ce639a7a4b84eb6b7ca016b9496a38a8f706c3f2368d9198e83c4d09d0307a +Size (thunderbird-l10n-38.7.0/ta-LK.xpi) = 558738 bytes +SHA1 (thunderbird-l10n-38.7.0/tr.xpi) = 0aac7dc09e10adae252beeb99c33e8d61fa616dd +RMD160 (thunderbird-l10n-38.7.0/tr.xpi) = c619a6abcb26ab2380a229135a0538910a3d7bd6 +SHA512 (thunderbird-l10n-38.7.0/tr.xpi) = 00cd52c695818002672a00369381b8a44994f7b03844474f3037b3841a99da23d9a8afd58886786da12c83363e6907b1fab2ae8f7557bf51a064eca231ed6c7a +Size (thunderbird-l10n-38.7.0/tr.xpi) = 447800 bytes +SHA1 (thunderbird-l10n-38.7.0/uk.xpi) = a2f37e2461acadd0a382617484dd80182b2a061e +RMD160 (thunderbird-l10n-38.7.0/uk.xpi) = bf9e17b3a6f786c7d78efb62d436ec266bd331d9 +SHA512 (thunderbird-l10n-38.7.0/uk.xpi) = 05686dd5f0f445d97e956eda8d288bc25101c399a1ae4fe8bb0998b1a9c978b9679ece437d0bc70f65cc3924e13a684ebd7439803ade978708d1e9c7539d40a1 +Size (thunderbird-l10n-38.7.0/uk.xpi) = 509600 bytes +SHA1 (thunderbird-l10n-38.7.0/vi.xpi) = a9c61397c252b79af0456720941e7aeb3ee21b2d +RMD160 (thunderbird-l10n-38.7.0/vi.xpi) = 3ed6fd365ef0d1a0cff4276c9be05581577d0e9c +SHA512 (thunderbird-l10n-38.7.0/vi.xpi) = 1bc449cd958f6618254325bb099abe9188ff04404ac0973e8e1e37db52f01de60a26b0e4d11c6c0796632fa078c96f1575bdfc6dcf90a5b6a5e7c2fcc8fd66fe +Size (thunderbird-l10n-38.7.0/vi.xpi) = 519844 bytes +SHA1 (thunderbird-l10n-38.7.0/zh-CN.xpi) = e4b7d53fab909f06b983c7a07a670055cd4c92fe +RMD160 (thunderbird-l10n-38.7.0/zh-CN.xpi) = 60a650253a7b04184282526bdfd29a27fb6e2899 +SHA512 (thunderbird-l10n-38.7.0/zh-CN.xpi) = 3dc4faa6bba2cfc6f74f835cb9e4de706fc2e49ad734a67cca9e2ea7a857fc3e71e8ec206ae681fe3786933074af4baa4c97fbb5b2d47dd8339b00ef1c69ff76 +Size (thunderbird-l10n-38.7.0/zh-CN.xpi) = 466412 bytes +SHA1 (thunderbird-l10n-38.7.0/zh-TW.xpi) = 62082d9b7c8e4712cf44bfc3a5108a9872d695cd +RMD160 (thunderbird-l10n-38.7.0/zh-TW.xpi) = 4f70dfd9411e2572c2045f825f0776a58c567944 +SHA512 (thunderbird-l10n-38.7.0/zh-TW.xpi) = 54962bb8c633b531854b8eeaec1293d8e62f8b9303ecb59a413620c44c11b220e644116aafe7dd0a70e6639225525d814d300f78ddd4b96e085568a86d10a6f2 +Size (thunderbird-l10n-38.7.0/zh-TW.xpi) = 466661 bytes From 3c06f9e2a59915e21723bd9843f12e2d9d947b07 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 00:30:44 +0000 Subject: [PATCH 0333/2457] Updated mail/thunderbird-l10n to 38.7.0 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 08001ea6d091d..8c279b5e5b540 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1263 2016/03/21 00:29:53 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1264 2016/03/21 00:30:44 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1661,3 +1661,4 @@ Changes to the packages collection and infrastructure in 2016: Updated databases/py-postgresql to 5.0 [darcy 2016-03-20] Updated databases/py-pgnotify to 0.1nb3 [wiz 2016-03-20] Updated mail/thunderbird to 38.7.0 [ryoon 2016-03-21] + Updated mail/thunderbird-l10n to 38.7.0 [ryoon 2016-03-21] From 965f1f56fe636b178517298cb2b7e54e3b43707f Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 00:33:16 +0000 Subject: [PATCH 0334/2457] Fix FreeBSD build, apply patch in PR pkg/50776 --- databases/sqlite3/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 67ec58728c8df..e0672ffba2ded 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2016/03/06 12:12:00 adam Exp $ +# $NetBSD: Makefile,v 1.106 2016/03/21 00:33:16 ryoon Exp $ DISTNAME= sqlite-autoconf-${SQLITE3_DISTVERSION} PKGNAME= sqlite3-${SQLITE3_VERSION} @@ -52,9 +52,11 @@ LDFLAGS.SCO_SV+= -lpthread .if ${READLINE_TYPE} == "editline" && ${IS_BUILTIN.editline} == "yes" LDFLAGS.NetBSD+= -ledit LDFLAGS.DragonFly+= -ledit +LDFLAGS.FreeBSD+= -ledit .else LDFLAGS.NetBSD+= -lreadline LDFLAGS.DragonFly+= -lreadline +LDFLAGS.FreeBSD+= -lreadline .endif .include "../../mk/dlopen.buildlink3.mk" From 47ceddc5f0d11ca29180394688f7b69dcdfb017b Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 05:50:37 +0000 Subject: [PATCH 0335/2457] Update to 9.0.0 Changelog: Version 9.0.0 March 8 2016 Major new ownCloud release, more info announcement and upgrading blogs. Summary: New: Comments on files New: Tags for files New: Notifications (separate from Activity feed) New: (Federation) Auto-complete of user names New: (Federation) Trusted Servers New: Code signing, checked when updating or installing core and apps New: Stand-alone updater for more reliable upgrading Improved sharing behavior and performance New External Storage API's for improved scalability Calendar and Contacts Apps were rewritten. The CalDAV and CardDAV backends are now part of core Security hardening ownCloud API work to improve scalability Many small improvements --- www/php-owncloud/Makefile | 4 +- www/php-owncloud/PLIST | 3542 ++++++++++++++++++++++--------------- www/php-owncloud/distinfo | 10 +- 3 files changed, 2141 insertions(+), 1415 deletions(-) diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile index 548a1a654071c..75f30841c8fd4 100644 --- a/www/php-owncloud/Makefile +++ b/www/php-owncloud/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2015/12/25 23:06:41 ryoon Exp $ +# $NetBSD: Makefile,v 1.58 2016/03/21 05:50:37 ryoon Exp $ # -DISTNAME= owncloud-8.2.2 +DISTNAME= owncloud-9.0.0 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME} CATEGORIES= www MASTER_SITES= http://download.owncloud.org/community/ diff --git a/www/php-owncloud/PLIST b/www/php-owncloud/PLIST index ba7f36827684b..13fb5be5b8895 100644 --- a/www/php-owncloud/PLIST +++ b/www/php-owncloud/PLIST @@ -1,16 +1,17 @@ -@comment $NetBSD: PLIST,v 1.36 2015/12/26 19:56:03 joerg Exp $ +@comment $NetBSD: PLIST,v 1.37 2016/03/21 05:50:37 ryoon Exp $ share/owncloud/.htaccess -share/owncloud/.tag share/owncloud/.user.ini +share/owncloud/3rdparty/.gitignore share/owncloud/3rdparty/LICENSE INFO +share/owncloud/3rdparty/README.md share/owncloud/3rdparty/autoload.php +share/owncloud/3rdparty/bantu/ini-get-wrapper/.gitignore +share/owncloud/3rdparty/bantu/ini-get-wrapper/.scrutinizer.yml share/owncloud/3rdparty/bantu/ini-get-wrapper/LICENSE +share/owncloud/3rdparty/bantu/ini-get-wrapper/README.md share/owncloud/3rdparty/bantu/ini-get-wrapper/composer.json share/owncloud/3rdparty/bantu/ini-get-wrapper/phpunit.xml.dist share/owncloud/3rdparty/bantu/ini-get-wrapper/src/IniGetWrapper.php -share/owncloud/3rdparty/bantu/ini-get-wrapper/tests/IniGetWrapperFake.php -share/owncloud/3rdparty/bantu/ini-get-wrapper/tests/IniGetWrapperFakeTest.php -share/owncloud/3rdparty/bantu/ini-get-wrapper/tests/IniGetWrapperTest.php share/owncloud/3rdparty/composer.json share/owncloud/3rdparty/composer.lock share/owncloud/3rdparty/composer/ClassLoader.php @@ -25,6 +26,7 @@ share/owncloud/3rdparty/composer/installed.json share/owncloud/3rdparty/deepdiver1975/tarstreamer/LICENSE share/owncloud/3rdparty/deepdiver1975/tarstreamer/src/TarStreamer.php share/owncloud/3rdparty/doctrine/annotations/LICENSE +share/owncloud/3rdparty/doctrine/annotations/README.md share/owncloud/3rdparty/doctrine/annotations/composer.json share/owncloud/3rdparty/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php share/owncloud/3rdparty/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php @@ -46,10 +48,10 @@ share/owncloud/3rdparty/doctrine/annotations/lib/Doctrine/Common/Annotations/Rea share/owncloud/3rdparty/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php share/owncloud/3rdparty/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php share/owncloud/3rdparty/doctrine/cache/.coveralls.yml +share/owncloud/3rdparty/doctrine/cache/.gitignore share/owncloud/3rdparty/doctrine/cache/LICENSE +share/owncloud/3rdparty/doctrine/cache/README.md share/owncloud/3rdparty/doctrine/cache/UPGRADE.md -share/owncloud/3rdparty/doctrine/cache/build.properties -share/owncloud/3rdparty/doctrine/cache/composer.json share/owncloud/3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php share/owncloud/3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php share/owncloud/3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/Cache.php @@ -74,9 +76,8 @@ share/owncloud/3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/VoidCache.php share/owncloud/3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php share/owncloud/3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php share/owncloud/3rdparty/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php -share/owncloud/3rdparty/doctrine/cache/phpunit.xml.dist +share/owncloud/3rdparty/doctrine/collections/.gitignore share/owncloud/3rdparty/doctrine/collections/LICENSE -share/owncloud/3rdparty/doctrine/collections/composer.json share/owncloud/3rdparty/doctrine/collections/lib/Doctrine/Common/Collections/AbstractLazyCollection.php share/owncloud/3rdparty/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php share/owncloud/3rdparty/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php @@ -90,12 +91,14 @@ share/owncloud/3rdparty/doctrine/collections/lib/Doctrine/Common/Collections/Exp share/owncloud/3rdparty/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php share/owncloud/3rdparty/doctrine/collections/lib/Doctrine/Common/Collections/Selectable.php share/owncloud/3rdparty/doctrine/collections/phpunit.xml.dist +share/owncloud/3rdparty/doctrine/common/.gitignore share/owncloud/3rdparty/doctrine/common/.gitmodules share/owncloud/3rdparty/doctrine/common/LICENSE +share/owncloud/3rdparty/doctrine/common/README.md share/owncloud/3rdparty/doctrine/common/UPGRADE_TO_2_1 share/owncloud/3rdparty/doctrine/common/UPGRADE_TO_2_2 share/owncloud/3rdparty/doctrine/common/build.properties -share/owncloud/3rdparty/doctrine/common/composer.json +share/owncloud/3rdparty/doctrine/common/build.xml share/owncloud/3rdparty/doctrine/common/lib/Doctrine/Common/ClassLoader.php share/owncloud/3rdparty/doctrine/common/lib/Doctrine/Common/CommonException.php share/owncloud/3rdparty/doctrine/common/lib/Doctrine/Common/Comparable.php @@ -158,6 +161,7 @@ share/owncloud/3rdparty/doctrine/common/lib/Doctrine/Common/Util/Inflector.php share/owncloud/3rdparty/doctrine/common/lib/Doctrine/Common/Version.php share/owncloud/3rdparty/doctrine/common/phpunit.xml.dist share/owncloud/3rdparty/doctrine/dbal/LICENSE +share/owncloud/3rdparty/doctrine/dbal/README.md share/owncloud/3rdparty/doctrine/dbal/SECURITY.md share/owncloud/3rdparty/doctrine/dbal/UPGRADE.md share/owncloud/3rdparty/doctrine/dbal/bin/doctrine-dbal @@ -306,7 +310,6 @@ share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/Composi share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/Expression/ExpressionBuilder.php share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryBuilder.php share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Query/QueryException.php -share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/README.markdown share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtils.php share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/SQLParserUtilsException.php share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Schema/AbstractAsset.php @@ -384,11 +387,10 @@ share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Types/Type.php share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Types/VarDateTimeType.php share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/Version.php share/owncloud/3rdparty/doctrine/dbal/lib/Doctrine/DBAL/VersionAwarePlatformDriver.php +share/owncloud/3rdparty/doctrine/inflector/.gitignore share/owncloud/3rdparty/doctrine/inflector/LICENSE -share/owncloud/3rdparty/doctrine/inflector/composer.json share/owncloud/3rdparty/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php -share/owncloud/3rdparty/doctrine/inflector/phpunit.xml.dist -share/owncloud/3rdparty/doctrine/lexer/composer.json +share/owncloud/3rdparty/doctrine/lexer/README.md share/owncloud/3rdparty/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php share/owncloud/3rdparty/guzzle/common/Guzzle/Common/AbstractHasDispatcher.php share/owncloud/3rdparty/guzzle/common/Guzzle/Common/Collection.php @@ -589,12 +591,15 @@ share/owncloud/3rdparty/guzzlehttp/streams/src/Stream.php share/owncloud/3rdparty/guzzlehttp/streams/src/StreamDecoratorTrait.php share/owncloud/3rdparty/guzzlehttp/streams/src/StreamInterface.php share/owncloud/3rdparty/guzzlehttp/streams/src/Utils.php -share/owncloud/3rdparty/icewind/streams/composer.json +share/owncloud/3rdparty/icewind/streams/.gitignore share/owncloud/3rdparty/icewind/streams/src/CallbackWrapper.php share/owncloud/3rdparty/icewind/streams/src/Directory.php share/owncloud/3rdparty/icewind/streams/src/File.php share/owncloud/3rdparty/icewind/streams/src/IteratorDirectory.php share/owncloud/3rdparty/icewind/streams/src/NullWrapper.php +share/owncloud/3rdparty/icewind/streams/src/Path.php +share/owncloud/3rdparty/icewind/streams/src/Url.php +share/owncloud/3rdparty/icewind/streams/src/UrlCallBack.php share/owncloud/3rdparty/icewind/streams/src/Wrapper.php share/owncloud/3rdparty/interfasys/lognormalizer/AUTHORS.md share/owncloud/3rdparty/interfasys/lognormalizer/COPYING @@ -616,6 +621,8 @@ share/owncloud/3rdparty/ircmaxell/random-lib/lib/RandomLib/Source/Rand.php share/owncloud/3rdparty/ircmaxell/random-lib/lib/RandomLib/Source/Random.php share/owncloud/3rdparty/ircmaxell/random-lib/lib/RandomLib/Source/URandom.php share/owncloud/3rdparty/ircmaxell/random-lib/lib/RandomLib/Source/UniqID.php +share/owncloud/3rdparty/ircmaxell/security-lib/.gitignore +share/owncloud/3rdparty/ircmaxell/security-lib/README.md share/owncloud/3rdparty/ircmaxell/security-lib/composer.json share/owncloud/3rdparty/ircmaxell/security-lib/composer.lock share/owncloud/3rdparty/ircmaxell/security-lib/lib/SecurityLib/AbstractFactory.php @@ -629,20 +636,9 @@ share/owncloud/3rdparty/ircmaxell/security-lib/lib/SecurityLib/Hash.php share/owncloud/3rdparty/ircmaxell/security-lib/lib/SecurityLib/Strength.php share/owncloud/3rdparty/ircmaxell/security-lib/lib/SecurityLib/composer.json share/owncloud/3rdparty/ircmaxell/security-lib/phpunit.xml.dist -share/owncloud/3rdparty/ircmaxell/security-lib/test/Mocks/AbstractMock.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Mocks/Enum.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Mocks/Factory.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Mocks/Strength.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Unit/Core/AbstractFactoryTest.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Unit/Core/BaseConverterTest.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Unit/Core/BigMath/BCMathTest.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Unit/Core/BigMath/GMPTest.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Unit/Core/BigMath/PHPMathTest.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Unit/Core/BigMathTest.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Unit/Core/EnumTest.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/Unit/Core/StrengthTest.php -share/owncloud/3rdparty/ircmaxell/security-lib/test/bootstrap.php share/owncloud/3rdparty/james-heinrich/getid3/.gitattributes +share/owncloud/3rdparty/james-heinrich/getid3/.gitignore +share/owncloud/3rdparty/james-heinrich/getid3/README.md share/owncloud/3rdparty/james-heinrich/getid3/changelog.txt share/owncloud/3rdparty/james-heinrich/getid3/composer.json share/owncloud/3rdparty/james-heinrich/getid3/dependencies.txt @@ -729,8 +725,6 @@ share/owncloud/3rdparty/james-heinrich/getid3/licenses/license.commercial.txt share/owncloud/3rdparty/james-heinrich/getid3/readme.txt share/owncloud/3rdparty/james-heinrich/getid3/structure.txt share/owncloud/3rdparty/jeremeamia/SuperClosure/LICENSE.md -share/owncloud/3rdparty/jeremeamia/SuperClosure/composer.json -share/owncloud/3rdparty/jeremeamia/SuperClosure/phpunit.xml share/owncloud/3rdparty/jeremeamia/SuperClosure/src/Analyzer/AstAnalyzer.php share/owncloud/3rdparty/jeremeamia/SuperClosure/src/Analyzer/ClosureAnalyzer.php share/owncloud/3rdparty/jeremeamia/SuperClosure/src/Analyzer/Token.php @@ -744,13 +738,8 @@ share/owncloud/3rdparty/jeremeamia/SuperClosure/src/Exception/SuperClosureExcept share/owncloud/3rdparty/jeremeamia/SuperClosure/src/SerializableClosure.php share/owncloud/3rdparty/jeremeamia/SuperClosure/src/Serializer.php share/owncloud/3rdparty/jeremeamia/SuperClosure/src/SerializerInterface.php -share/owncloud/3rdparty/kriswallsmith/assetic/CHANGELOG-1.0.md -share/owncloud/3rdparty/kriswallsmith/assetic/CHANGELOG-1.1.md -share/owncloud/3rdparty/kriswallsmith/assetic/CHANGELOG-1.2.md -share/owncloud/3rdparty/kriswallsmith/assetic/Gemfile +share/owncloud/3rdparty/jeremeamia/SuperClosure/src/hash_equals.php share/owncloud/3rdparty/kriswallsmith/assetic/LICENSE -share/owncloud/3rdparty/kriswallsmith/assetic/composer.json -share/owncloud/3rdparty/kriswallsmith/assetic/package.json share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Asset/AssetCache.php share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Asset/AssetCollectionInterface.php @@ -801,6 +790,7 @@ share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Filter/BaseCssFilter.p share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Filter/BaseNodeFilter.php share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Filter/BaseProcessFilter.php share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Filter/CallablesFilter.php +share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Filter/CleanCssFilter.php share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Filter/CoffeeScriptFilter.php share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Filter/CompassFilter.php share/owncloud/3rdparty/kriswallsmith/assetic/src/Assetic/Filter/CssCacheBustingFilter.php @@ -872,6 +862,7 @@ share/owncloud/3rdparty/league/flysystem/src/Adapter/Polyfill/StreamedWritingTra share/owncloud/3rdparty/league/flysystem/src/Adapter/SynologyFtp.php share/owncloud/3rdparty/league/flysystem/src/AdapterInterface.php share/owncloud/3rdparty/league/flysystem/src/Config.php +share/owncloud/3rdparty/league/flysystem/src/ConfigAwareTrait.php share/owncloud/3rdparty/league/flysystem/src/Directory.php share/owncloud/3rdparty/league/flysystem/src/Exception.php share/owncloud/3rdparty/league/flysystem/src/File.php @@ -893,28 +884,22 @@ share/owncloud/3rdparty/league/flysystem/src/Plugin/PluginNotFoundException.php share/owncloud/3rdparty/league/flysystem/src/PluginInterface.php share/owncloud/3rdparty/league/flysystem/src/ReadInterface.php share/owncloud/3rdparty/league/flysystem/src/RootViolationException.php +share/owncloud/3rdparty/league/flysystem/src/UnreadableFileException.php share/owncloud/3rdparty/league/flysystem/src/Util.php +share/owncloud/3rdparty/league/flysystem/src/Util/ContentListingFormatter.php share/owncloud/3rdparty/league/flysystem/src/Util/MimeType.php share/owncloud/3rdparty/mcnetic/zipstreamer/COPYING share/owncloud/3rdparty/mcnetic/zipstreamer/MANUAL.md +share/owncloud/3rdparty/mcnetic/zipstreamer/README.md share/owncloud/3rdparty/mcnetic/zipstreamer/composer.json share/owncloud/3rdparty/mcnetic/zipstreamer/src/ZipStreamer.php share/owncloud/3rdparty/mcnetic/zipstreamer/src/lib/Count64.php -share/owncloud/3rdparty/mcnetic/zipstreamer/test/ZipComponents.php -share/owncloud/3rdparty/mcnetic/zipstreamer/test/ZipStreamerTest.php -share/owncloud/3rdparty/mcnetic/zipstreamer/test/lib/Count64Test.php -share/owncloud/3rdparty/mcnetic/zipstreamer/test/phpunit.xml -share/owncloud/3rdparty/mcnetic/zipstreamer/test/travis/php-modules-install.sh share/owncloud/3rdparty/natxet/CssMin/README share/owncloud/3rdparty/natxet/CssMin/composer.json share/owncloud/3rdparty/natxet/CssMin/src/CssMin.php -share/owncloud/3rdparty/nikic/php-parser/CHANGELOG.md share/owncloud/3rdparty/nikic/php-parser/LICENSE -share/owncloud/3rdparty/nikic/php-parser/UPGRADE-1.0.md -share/owncloud/3rdparty/nikic/php-parser/composer.json -share/owncloud/3rdparty/nikic/php-parser/grammar/analyze.php +share/owncloud/3rdparty/nikic/php-parser/grammar/README.md share/owncloud/3rdparty/nikic/php-parser/grammar/kmyacc.php.parser -share/owncloud/3rdparty/nikic/php-parser/grammar/rebuildParser.php share/owncloud/3rdparty/nikic/php-parser/grammar/zend_language_parser.phpy share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Autoloader.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Builder.php @@ -1027,6 +1012,7 @@ share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php +share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Node/Name.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php @@ -1105,136 +1091,169 @@ share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Serializer/XML.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Unserializer.php share/owncloud/3rdparty/nikic/php-parser/lib/PhpParser/Unserializer/XML.php share/owncloud/3rdparty/nikic/php-parser/lib/bootstrap.php -share/owncloud/3rdparty/nikic/php-parser/phpunit.xml.dist +share/owncloud/3rdparty/paragonie/random_compat/.gitignore +share/owncloud/3rdparty/paragonie/random_compat/LICENSE +share/owncloud/3rdparty/paragonie/random_compat/composer.json +share/owncloud/3rdparty/paragonie/random_compat/lib/byte_safe_strings.php +share/owncloud/3rdparty/paragonie/random_compat/lib/cast_to_int.php +share/owncloud/3rdparty/paragonie/random_compat/lib/error_polyfill.php +share/owncloud/3rdparty/paragonie/random_compat/lib/random.php +share/owncloud/3rdparty/paragonie/random_compat/lib/random_bytes_com_dotnet.php +share/owncloud/3rdparty/paragonie/random_compat/lib/random_bytes_dev_urandom.php +share/owncloud/3rdparty/paragonie/random_compat/lib/random_bytes_libsodium.php +share/owncloud/3rdparty/paragonie/random_compat/lib/random_bytes_mcrypt.php +share/owncloud/3rdparty/paragonie/random_compat/lib/random_bytes_openssl.php +share/owncloud/3rdparty/paragonie/random_compat/lib/random_int.php +share/owncloud/3rdparty/paragonie/random_compat/phpunit.xml.dist share/owncloud/3rdparty/patches.txt share/owncloud/3rdparty/patchwork/jsqueeze/LICENSE.ASL20 share/owncloud/3rdparty/patchwork/jsqueeze/LICENSE.GPLv2 +share/owncloud/3rdparty/patchwork/jsqueeze/README.md share/owncloud/3rdparty/patchwork/jsqueeze/composer.json share/owncloud/3rdparty/patchwork/jsqueeze/src/JSqueeze.php share/owncloud/3rdparty/patchwork/utf8/CHANGELOG.md -share/owncloud/3rdparty/patchwork/utf8/class/Normalizer.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/Iconv.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/Intl.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/Mbstring.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/Normalizer.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/Xml.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.big5.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp037.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp1006.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp1026.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp424.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp437.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp500.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp737.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp775.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp850.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp852.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp855.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp856.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp857.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp860.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp861.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp862.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp863.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp864.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp865.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp866.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp869.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp874.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp875.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp932.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp936.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp949.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.cp950.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.gsm0338.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-1.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-10.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-11.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-13.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-14.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-15.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-16.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-2.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-3.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-4.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-5.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-6.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-7.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-8.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.iso-8859-9.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.koi8-r.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.koi8-u.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.mazovia.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.nextstep.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.stdenc.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.symbol.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.turkish.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.us-ascii-quotes.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.us-ascii.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1250.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1251.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1252.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1253.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1254.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1255.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1256.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1257.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.windows-1258.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.x-mac-ce.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.x-mac-cyrillic.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.x-mac-greek.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.x-mac-icelandic.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.x-mac-roman.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/from.zdingbat.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/to.gsm0338.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/to.mazovia.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/to.stdenc.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/to.symbol.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/to.zdingbat.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/charset/translit.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/unidata/canonicalComposition.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/unidata/canonicalDecomposition.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/unidata/combiningClass.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/unidata/compatibilityDecomposition.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/unidata/lowerCase.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/PHP/Shim/unidata/upperCase.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/TurkishUtf8.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/Utf8.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/Utf8/Bootup.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/Utf8/Bootup/iconv.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/Utf8/Bootup/intl.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/Utf8/Bootup/mbstring.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/Utf8/Bootup/utf8_encode.php -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/Utf8/data/caseFolding_full.ser -share/owncloud/3rdparty/patchwork/utf8/class/Patchwork/Utf8/data/translit_extra.ser +share/owncloud/3rdparty/patchwork/utf8/LICENSE-APACHE +share/owncloud/3rdparty/patchwork/utf8/LICENSE-GPL +share/owncloud/3rdparty/patchwork/utf8/README.md share/owncloud/3rdparty/patchwork/utf8/composer.json share/owncloud/3rdparty/patchwork/utf8/phpunit.xml.dist +share/owncloud/3rdparty/patchwork/utf8/src/Normalizer.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/Iconv.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/Intl.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/Mbstring.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/Normalizer.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/Xml.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.big5.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp037.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp1006.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp1026.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp424.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp437.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp500.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp737.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp775.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp850.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp852.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp855.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp856.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp857.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp860.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp861.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp862.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp863.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp864.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp865.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp866.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp869.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp874.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp875.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp932.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp936.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp949.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.cp950.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.gsm0338.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-1.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-10.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-11.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-13.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-14.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-15.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-16.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-2.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-3.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-4.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-5.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-6.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-7.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-8.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.iso-8859-9.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.koi8-r.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.koi8-u.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.mazovia.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.nextstep.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.stdenc.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.symbol.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.turkish.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.us-ascii-quotes.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.us-ascii.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1250.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1251.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1252.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1253.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1254.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1255.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1256.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1257.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.windows-1258.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.x-mac-ce.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.x-mac-cyrillic.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.x-mac-greek.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.x-mac-icelandic.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.x-mac-roman.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/from.zdingbat.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/to.gsm0338.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/to.mazovia.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/to.stdenc.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/to.symbol.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/to.zdingbat.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/charset/translit.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/unidata/canonicalComposition.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/unidata/canonicalDecomposition.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/unidata/combiningClass.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/unidata/compatibilityDecomposition.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/unidata/lowerCase.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/PHP/Shim/unidata/upperCase.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/TurkishUtf8.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/BestFit.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/iconv.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/intl.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/mbstring.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/utf8_encode.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/WindowsStreamWrapper.php +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/caseFolding_full.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1250.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1251.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1252.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1253.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1254.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1255.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1256.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1257.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit1258.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit874.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit932.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit936.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit949.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/to.bestfit950.ser +share/owncloud/3rdparty/patchwork/utf8/src/Patchwork/Utf8/data/translit_extra.ser +share/owncloud/3rdparty/pear/archive_tar/.gitignore share/owncloud/3rdparty/pear/archive_tar/Archive/Tar.php +share/owncloud/3rdparty/pear/archive_tar/README.md share/owncloud/3rdparty/pear/archive_tar/composer.json share/owncloud/3rdparty/pear/archive_tar/package.xml +share/owncloud/3rdparty/pear/console_getopt/.gitignore share/owncloud/3rdparty/pear/console_getopt/Console/Getopt.php share/owncloud/3rdparty/pear/console_getopt/LICENSE share/owncloud/3rdparty/pear/console_getopt/README.rst share/owncloud/3rdparty/pear/console_getopt/composer.json share/owncloud/3rdparty/pear/console_getopt/package.xml +share/owncloud/3rdparty/pear/pear-core-minimal/.gitignore share/owncloud/3rdparty/pear/pear-core-minimal/README.rst share/owncloud/3rdparty/pear/pear-core-minimal/composer.json share/owncloud/3rdparty/pear/pear-core-minimal/src/OS/Guess.php share/owncloud/3rdparty/pear/pear-core-minimal/src/PEAR.php share/owncloud/3rdparty/pear/pear-core-minimal/src/PEAR/Error.php share/owncloud/3rdparty/pear/pear-core-minimal/src/PEAR/ErrorStack.php -share/owncloud/3rdparty/pear/pear-core-minimal/src/PEAR/ErrorStack5.php -share/owncloud/3rdparty/pear/pear-core-minimal/src/PEAR5.php share/owncloud/3rdparty/pear/pear-core-minimal/src/System.php +share/owncloud/3rdparty/pear/pear_exception/.gitignore share/owncloud/3rdparty/pear/pear_exception/LICENSE share/owncloud/3rdparty/pear/pear_exception/PEAR/Exception.php share/owncloud/3rdparty/pear/pear_exception/composer.json share/owncloud/3rdparty/pear/pear_exception/package.xml share/owncloud/3rdparty/phpseclib/phpseclib/AUTHORS -share/owncloud/3rdparty/phpseclib/phpseclib/CHANGELOG.md share/owncloud/3rdparty/phpseclib/phpseclib/LICENSE -share/owncloud/3rdparty/phpseclib/phpseclib/composer.json -share/owncloud/3rdparty/phpseclib/phpseclib/composer.lock share/owncloud/3rdparty/phpseclib/phpseclib/phpseclib/Crypt/AES.php share/owncloud/3rdparty/phpseclib/phpseclib/phpseclib/Crypt/Base.php share/owncloud/3rdparty/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php @@ -1265,6 +1284,8 @@ share/owncloud/3rdparty/pimple/pimple/src/Pimple/ServiceProviderInterface.php share/owncloud/3rdparty/punic/punic/LICENSE.txt share/owncloud/3rdparty/punic/punic/UNICODE-LICENSE.txt share/owncloud/3rdparty/punic/punic/code/Calendar.php +share/owncloud/3rdparty/punic/punic/code/Comparer.php +share/owncloud/3rdparty/punic/punic/code/Currency.php share/owncloud/3rdparty/punic/punic/code/Data.php share/owncloud/3rdparty/punic/punic/code/Exception.php share/owncloud/3rdparty/punic/punic/code/Exception/BadArgumentType.php @@ -1279,389 +1300,505 @@ share/owncloud/3rdparty/punic/punic/code/Exception/ValueNotInList.php share/owncloud/3rdparty/punic/punic/code/Language.php share/owncloud/3rdparty/punic/punic/code/Misc.php share/owncloud/3rdparty/punic/punic/code/Number.php +share/owncloud/3rdparty/punic/punic/code/Phone.php share/owncloud/3rdparty/punic/punic/code/Plural.php share/owncloud/3rdparty/punic/punic/code/Territory.php share/owncloud/3rdparty/punic/punic/code/Unit.php share/owncloud/3rdparty/punic/punic/code/data/ar/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/ar/currencies.json share/owncloud/3rdparty/punic/punic/code/data/ar/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/ar/languages.json +share/owncloud/3rdparty/punic/punic/code/data/ar/layout.json share/owncloud/3rdparty/punic/punic/code/data/ar/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/ar/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/ar/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/ar/numbers.json share/owncloud/3rdparty/punic/punic/code/data/ar/territories.json share/owncloud/3rdparty/punic/punic/code/data/ar/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/ar/units.json share/owncloud/3rdparty/punic/punic/code/data/ca/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/ca/currencies.json share/owncloud/3rdparty/punic/punic/code/data/ca/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/ca/languages.json +share/owncloud/3rdparty/punic/punic/code/data/ca/layout.json share/owncloud/3rdparty/punic/punic/code/data/ca/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/ca/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/ca/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/ca/numbers.json share/owncloud/3rdparty/punic/punic/code/data/ca/territories.json share/owncloud/3rdparty/punic/punic/code/data/ca/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/ca/units.json share/owncloud/3rdparty/punic/punic/code/data/cs/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/cs/currencies.json share/owncloud/3rdparty/punic/punic/code/data/cs/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/cs/languages.json +share/owncloud/3rdparty/punic/punic/code/data/cs/layout.json share/owncloud/3rdparty/punic/punic/code/data/cs/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/cs/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/cs/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/cs/numbers.json share/owncloud/3rdparty/punic/punic/code/data/cs/territories.json share/owncloud/3rdparty/punic/punic/code/data/cs/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/cs/units.json +share/owncloud/3rdparty/punic/punic/code/data/currencyData.json share/owncloud/3rdparty/punic/punic/code/data/da/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/da/currencies.json share/owncloud/3rdparty/punic/punic/code/data/da/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/da/languages.json +share/owncloud/3rdparty/punic/punic/code/data/da/layout.json share/owncloud/3rdparty/punic/punic/code/data/da/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/da/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/da/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/da/numbers.json share/owncloud/3rdparty/punic/punic/code/data/da/territories.json share/owncloud/3rdparty/punic/punic/code/data/da/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/da/units.json share/owncloud/3rdparty/punic/punic/code/data/de/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/de/currencies.json share/owncloud/3rdparty/punic/punic/code/data/de/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/de/languages.json +share/owncloud/3rdparty/punic/punic/code/data/de/layout.json share/owncloud/3rdparty/punic/punic/code/data/de/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/de/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/de/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/de/numbers.json share/owncloud/3rdparty/punic/punic/code/data/de/territories.json share/owncloud/3rdparty/punic/punic/code/data/de/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/de/units.json share/owncloud/3rdparty/punic/punic/code/data/el/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/el/currencies.json share/owncloud/3rdparty/punic/punic/code/data/el/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/el/languages.json +share/owncloud/3rdparty/punic/punic/code/data/el/layout.json share/owncloud/3rdparty/punic/punic/code/data/el/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/el/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/el/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/el/numbers.json share/owncloud/3rdparty/punic/punic/code/data/el/territories.json share/owncloud/3rdparty/punic/punic/code/data/el/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/el/units.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/calendar.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/dateFields.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/languages.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/listPatterns.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/localeDisplayNames.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/numbers.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/territories.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/timeZoneNames.json -share/owncloud/3rdparty/punic/punic/code/data/en-001/units.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/en-AU/currencies.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/languages.json +share/owncloud/3rdparty/punic/punic/code/data/en-AU/layout.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/en-AU/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/numbers.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/territories.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/en-AU/units.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/en-CA/currencies.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/languages.json +share/owncloud/3rdparty/punic/punic/code/data/en-CA/layout.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/en-CA/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/numbers.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/territories.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/en-CA/units.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/en-GB/currencies.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/languages.json +share/owncloud/3rdparty/punic/punic/code/data/en-GB/layout.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/en-GB/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/numbers.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/territories.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/en-GB/units.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/en-HK/currencies.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/languages.json +share/owncloud/3rdparty/punic/punic/code/data/en-HK/layout.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/en-HK/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/numbers.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/territories.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/en-HK/units.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/en-IN/currencies.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/languages.json +share/owncloud/3rdparty/punic/punic/code/data/en-IN/layout.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/en-IN/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/numbers.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/territories.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/en-IN/units.json share/owncloud/3rdparty/punic/punic/code/data/en/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/en/currencies.json share/owncloud/3rdparty/punic/punic/code/data/en/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/en/languages.json +share/owncloud/3rdparty/punic/punic/code/data/en/layout.json share/owncloud/3rdparty/punic/punic/code/data/en/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/en/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/en/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/en/numbers.json share/owncloud/3rdparty/punic/punic/code/data/en/territories.json share/owncloud/3rdparty/punic/punic/code/data/en/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/en/units.json share/owncloud/3rdparty/punic/punic/code/data/es/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/es/currencies.json share/owncloud/3rdparty/punic/punic/code/data/es/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/es/languages.json +share/owncloud/3rdparty/punic/punic/code/data/es/layout.json share/owncloud/3rdparty/punic/punic/code/data/es/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/es/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/es/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/es/numbers.json share/owncloud/3rdparty/punic/punic/code/data/es/territories.json share/owncloud/3rdparty/punic/punic/code/data/es/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/es/units.json share/owncloud/3rdparty/punic/punic/code/data/fi/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/fi/currencies.json share/owncloud/3rdparty/punic/punic/code/data/fi/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/fi/languages.json +share/owncloud/3rdparty/punic/punic/code/data/fi/layout.json share/owncloud/3rdparty/punic/punic/code/data/fi/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/fi/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/fi/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/fi/numbers.json share/owncloud/3rdparty/punic/punic/code/data/fi/territories.json share/owncloud/3rdparty/punic/punic/code/data/fi/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/fi/units.json share/owncloud/3rdparty/punic/punic/code/data/fr/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/fr/currencies.json share/owncloud/3rdparty/punic/punic/code/data/fr/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/fr/languages.json +share/owncloud/3rdparty/punic/punic/code/data/fr/layout.json share/owncloud/3rdparty/punic/punic/code/data/fr/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/fr/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/fr/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/fr/numbers.json share/owncloud/3rdparty/punic/punic/code/data/fr/territories.json share/owncloud/3rdparty/punic/punic/code/data/fr/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/fr/units.json share/owncloud/3rdparty/punic/punic/code/data/he/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/he/currencies.json share/owncloud/3rdparty/punic/punic/code/data/he/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/he/languages.json +share/owncloud/3rdparty/punic/punic/code/data/he/layout.json share/owncloud/3rdparty/punic/punic/code/data/he/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/he/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/he/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/he/numbers.json share/owncloud/3rdparty/punic/punic/code/data/he/territories.json share/owncloud/3rdparty/punic/punic/code/data/he/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/he/units.json share/owncloud/3rdparty/punic/punic/code/data/hi/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/hi/currencies.json share/owncloud/3rdparty/punic/punic/code/data/hi/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/hi/languages.json +share/owncloud/3rdparty/punic/punic/code/data/hi/layout.json share/owncloud/3rdparty/punic/punic/code/data/hi/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/hi/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/hi/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/hi/numbers.json share/owncloud/3rdparty/punic/punic/code/data/hi/territories.json share/owncloud/3rdparty/punic/punic/code/data/hi/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/hi/units.json share/owncloud/3rdparty/punic/punic/code/data/hr/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/hr/currencies.json share/owncloud/3rdparty/punic/punic/code/data/hr/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/hr/languages.json +share/owncloud/3rdparty/punic/punic/code/data/hr/layout.json share/owncloud/3rdparty/punic/punic/code/data/hr/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/hr/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/hr/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/hr/numbers.json share/owncloud/3rdparty/punic/punic/code/data/hr/territories.json share/owncloud/3rdparty/punic/punic/code/data/hr/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/hr/units.json share/owncloud/3rdparty/punic/punic/code/data/hu/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/hu/currencies.json share/owncloud/3rdparty/punic/punic/code/data/hu/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/hu/languages.json +share/owncloud/3rdparty/punic/punic/code/data/hu/layout.json share/owncloud/3rdparty/punic/punic/code/data/hu/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/hu/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/hu/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/hu/numbers.json share/owncloud/3rdparty/punic/punic/code/data/hu/territories.json share/owncloud/3rdparty/punic/punic/code/data/hu/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/hu/units.json share/owncloud/3rdparty/punic/punic/code/data/it/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/it/currencies.json share/owncloud/3rdparty/punic/punic/code/data/it/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/it/languages.json +share/owncloud/3rdparty/punic/punic/code/data/it/layout.json share/owncloud/3rdparty/punic/punic/code/data/it/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/it/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/it/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/it/numbers.json share/owncloud/3rdparty/punic/punic/code/data/it/territories.json share/owncloud/3rdparty/punic/punic/code/data/it/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/it/units.json share/owncloud/3rdparty/punic/punic/code/data/ja/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/ja/currencies.json share/owncloud/3rdparty/punic/punic/code/data/ja/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/ja/languages.json +share/owncloud/3rdparty/punic/punic/code/data/ja/layout.json share/owncloud/3rdparty/punic/punic/code/data/ja/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/ja/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/ja/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/ja/numbers.json share/owncloud/3rdparty/punic/punic/code/data/ja/territories.json share/owncloud/3rdparty/punic/punic/code/data/ja/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/ja/units.json share/owncloud/3rdparty/punic/punic/code/data/ko/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/ko/currencies.json share/owncloud/3rdparty/punic/punic/code/data/ko/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/ko/languages.json +share/owncloud/3rdparty/punic/punic/code/data/ko/layout.json share/owncloud/3rdparty/punic/punic/code/data/ko/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/ko/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/ko/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/ko/numbers.json share/owncloud/3rdparty/punic/punic/code/data/ko/territories.json share/owncloud/3rdparty/punic/punic/code/data/ko/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/ko/units.json share/owncloud/3rdparty/punic/punic/code/data/likelySubtags.json +share/owncloud/3rdparty/punic/punic/code/data/measurementData.json share/owncloud/3rdparty/punic/punic/code/data/metaZones.json share/owncloud/3rdparty/punic/punic/code/data/nb/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/nb/currencies.json share/owncloud/3rdparty/punic/punic/code/data/nb/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/nb/languages.json +share/owncloud/3rdparty/punic/punic/code/data/nb/layout.json share/owncloud/3rdparty/punic/punic/code/data/nb/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/nb/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/nb/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/nb/numbers.json share/owncloud/3rdparty/punic/punic/code/data/nb/territories.json share/owncloud/3rdparty/punic/punic/code/data/nb/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/nb/units.json share/owncloud/3rdparty/punic/punic/code/data/nl/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/nl/currencies.json share/owncloud/3rdparty/punic/punic/code/data/nl/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/nl/languages.json +share/owncloud/3rdparty/punic/punic/code/data/nl/layout.json share/owncloud/3rdparty/punic/punic/code/data/nl/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/nl/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/nl/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/nl/numbers.json share/owncloud/3rdparty/punic/punic/code/data/nl/territories.json share/owncloud/3rdparty/punic/punic/code/data/nl/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/nl/units.json share/owncloud/3rdparty/punic/punic/code/data/parentLocales.json share/owncloud/3rdparty/punic/punic/code/data/pl/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/pl/currencies.json share/owncloud/3rdparty/punic/punic/code/data/pl/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/pl/languages.json +share/owncloud/3rdparty/punic/punic/code/data/pl/layout.json share/owncloud/3rdparty/punic/punic/code/data/pl/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/pl/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/pl/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/pl/numbers.json share/owncloud/3rdparty/punic/punic/code/data/pl/territories.json share/owncloud/3rdparty/punic/punic/code/data/pl/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/pl/units.json share/owncloud/3rdparty/punic/punic/code/data/plurals.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/pt-PT/currencies.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/languages.json +share/owncloud/3rdparty/punic/punic/code/data/pt-PT/layout.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/pt-PT/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/numbers.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/territories.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/pt-PT/units.json share/owncloud/3rdparty/punic/punic/code/data/pt/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/pt/currencies.json share/owncloud/3rdparty/punic/punic/code/data/pt/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/pt/languages.json +share/owncloud/3rdparty/punic/punic/code/data/pt/layout.json share/owncloud/3rdparty/punic/punic/code/data/pt/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/pt/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/pt/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/pt/numbers.json share/owncloud/3rdparty/punic/punic/code/data/pt/territories.json share/owncloud/3rdparty/punic/punic/code/data/pt/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/pt/units.json share/owncloud/3rdparty/punic/punic/code/data/ro/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/ro/currencies.json share/owncloud/3rdparty/punic/punic/code/data/ro/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/ro/languages.json +share/owncloud/3rdparty/punic/punic/code/data/ro/layout.json share/owncloud/3rdparty/punic/punic/code/data/ro/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/ro/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/ro/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/ro/numbers.json share/owncloud/3rdparty/punic/punic/code/data/ro/territories.json share/owncloud/3rdparty/punic/punic/code/data/ro/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/ro/units.json share/owncloud/3rdparty/punic/punic/code/data/root/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/root/currencies.json share/owncloud/3rdparty/punic/punic/code/data/root/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/root/languages.json +share/owncloud/3rdparty/punic/punic/code/data/root/layout.json share/owncloud/3rdparty/punic/punic/code/data/root/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/root/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/root/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/root/numbers.json share/owncloud/3rdparty/punic/punic/code/data/root/territories.json share/owncloud/3rdparty/punic/punic/code/data/root/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/root/units.json share/owncloud/3rdparty/punic/punic/code/data/ru/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/ru/currencies.json share/owncloud/3rdparty/punic/punic/code/data/ru/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/ru/languages.json +share/owncloud/3rdparty/punic/punic/code/data/ru/layout.json share/owncloud/3rdparty/punic/punic/code/data/ru/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/ru/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/ru/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/ru/numbers.json share/owncloud/3rdparty/punic/punic/code/data/ru/territories.json share/owncloud/3rdparty/punic/punic/code/data/ru/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/ru/units.json share/owncloud/3rdparty/punic/punic/code/data/sk/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/sk/currencies.json share/owncloud/3rdparty/punic/punic/code/data/sk/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/sk/languages.json +share/owncloud/3rdparty/punic/punic/code/data/sk/layout.json share/owncloud/3rdparty/punic/punic/code/data/sk/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/sk/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/sk/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/sk/numbers.json share/owncloud/3rdparty/punic/punic/code/data/sk/territories.json share/owncloud/3rdparty/punic/punic/code/data/sk/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/sk/units.json share/owncloud/3rdparty/punic/punic/code/data/sl/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/sl/currencies.json share/owncloud/3rdparty/punic/punic/code/data/sl/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/sl/languages.json +share/owncloud/3rdparty/punic/punic/code/data/sl/layout.json share/owncloud/3rdparty/punic/punic/code/data/sl/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/sl/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/sl/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/sl/numbers.json share/owncloud/3rdparty/punic/punic/code/data/sl/territories.json share/owncloud/3rdparty/punic/punic/code/data/sl/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/sl/units.json share/owncloud/3rdparty/punic/punic/code/data/sr/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/sr/currencies.json share/owncloud/3rdparty/punic/punic/code/data/sr/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/sr/languages.json +share/owncloud/3rdparty/punic/punic/code/data/sr/layout.json share/owncloud/3rdparty/punic/punic/code/data/sr/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/sr/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/sr/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/sr/numbers.json share/owncloud/3rdparty/punic/punic/code/data/sr/territories.json share/owncloud/3rdparty/punic/punic/code/data/sr/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/sr/units.json share/owncloud/3rdparty/punic/punic/code/data/sv/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/sv/currencies.json share/owncloud/3rdparty/punic/punic/code/data/sv/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/sv/languages.json +share/owncloud/3rdparty/punic/punic/code/data/sv/layout.json share/owncloud/3rdparty/punic/punic/code/data/sv/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/sv/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/sv/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/sv/numbers.json share/owncloud/3rdparty/punic/punic/code/data/sv/territories.json share/owncloud/3rdparty/punic/punic/code/data/sv/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/sv/units.json +share/owncloud/3rdparty/punic/punic/code/data/telephoneCodeData.json share/owncloud/3rdparty/punic/punic/code/data/territoryContainment.json +share/owncloud/3rdparty/punic/punic/code/data/territoryInfo.json share/owncloud/3rdparty/punic/punic/code/data/th/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/th/currencies.json share/owncloud/3rdparty/punic/punic/code/data/th/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/th/languages.json +share/owncloud/3rdparty/punic/punic/code/data/th/layout.json share/owncloud/3rdparty/punic/punic/code/data/th/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/th/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/th/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/th/numbers.json share/owncloud/3rdparty/punic/punic/code/data/th/territories.json share/owncloud/3rdparty/punic/punic/code/data/th/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/th/units.json share/owncloud/3rdparty/punic/punic/code/data/tr/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/tr/currencies.json share/owncloud/3rdparty/punic/punic/code/data/tr/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/tr/languages.json +share/owncloud/3rdparty/punic/punic/code/data/tr/layout.json share/owncloud/3rdparty/punic/punic/code/data/tr/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/tr/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/tr/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/tr/numbers.json share/owncloud/3rdparty/punic/punic/code/data/tr/territories.json share/owncloud/3rdparty/punic/punic/code/data/tr/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/tr/units.json share/owncloud/3rdparty/punic/punic/code/data/uk/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/uk/currencies.json share/owncloud/3rdparty/punic/punic/code/data/uk/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/uk/languages.json +share/owncloud/3rdparty/punic/punic/code/data/uk/layout.json share/owncloud/3rdparty/punic/punic/code/data/uk/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/uk/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/uk/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/uk/numbers.json share/owncloud/3rdparty/punic/punic/code/data/uk/territories.json share/owncloud/3rdparty/punic/punic/code/data/uk/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/uk/units.json share/owncloud/3rdparty/punic/punic/code/data/vi/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/vi/currencies.json share/owncloud/3rdparty/punic/punic/code/data/vi/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/vi/languages.json +share/owncloud/3rdparty/punic/punic/code/data/vi/layout.json share/owncloud/3rdparty/punic/punic/code/data/vi/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/vi/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/vi/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/vi/numbers.json share/owncloud/3rdparty/punic/punic/code/data/vi/territories.json share/owncloud/3rdparty/punic/punic/code/data/vi/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/vi/units.json share/owncloud/3rdparty/punic/punic/code/data/weekData.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/currencies.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/languages.json +share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/layout.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/numbers.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/territories.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/zh-Hant/units.json share/owncloud/3rdparty/punic/punic/code/data/zh/calendar.json +share/owncloud/3rdparty/punic/punic/code/data/zh/currencies.json share/owncloud/3rdparty/punic/punic/code/data/zh/dateFields.json share/owncloud/3rdparty/punic/punic/code/data/zh/languages.json +share/owncloud/3rdparty/punic/punic/code/data/zh/layout.json share/owncloud/3rdparty/punic/punic/code/data/zh/listPatterns.json share/owncloud/3rdparty/punic/punic/code/data/zh/localeDisplayNames.json +share/owncloud/3rdparty/punic/punic/code/data/zh/measurementSystemNames.json share/owncloud/3rdparty/punic/punic/code/data/zh/numbers.json share/owncloud/3rdparty/punic/punic/code/data/zh/territories.json share/owncloud/3rdparty/punic/punic/code/data/zh/timeZoneNames.json share/owncloud/3rdparty/punic/punic/code/data/zh/units.json -share/owncloud/3rdparty/punic/punic/composer.json -share/owncloud/3rdparty/punic/punic/punic.php share/owncloud/3rdparty/rackspace/php-opencloud/.coveralls.yml +share/owncloud/3rdparty/rackspace/php-opencloud/.gitignore share/owncloud/3rdparty/rackspace/php-opencloud/CONTRIBUTING.md share/owncloud/3rdparty/rackspace/php-opencloud/LICENSE +share/owncloud/3rdparty/rackspace/php-opencloud/README.md share/owncloud/3rdparty/rackspace/php-opencloud/composer.json share/owncloud/3rdparty/rackspace/php-opencloud/docs/changelog/1.7.0.md share/owncloud/3rdparty/rackspace/php-opencloud/docs/changelog/1.9.0.md @@ -1694,6 +1831,7 @@ share/owncloud/3rdparty/rackspace/php-opencloud/docs/userguide/Identity/Tenants. share/owncloud/3rdparty/rackspace/php-opencloud/docs/userguide/Identity/Tokens.md share/owncloud/3rdparty/rackspace/php-opencloud/docs/userguide/Identity/Users.md share/owncloud/3rdparty/rackspace/php-opencloud/docs/userguide/Iterators.md +share/owncloud/3rdparty/rackspace/php-opencloud/docs/userguide/LoadBalancer/README.md share/owncloud/3rdparty/rackspace/php-opencloud/docs/userguide/LoadBalancer/USERGUIDE.md share/owncloud/3rdparty/rackspace/php-opencloud/docs/userguide/ObjectStore/Access.md share/owncloud/3rdparty/rackspace/php-opencloud/docs/userguide/ObjectStore/Account.md @@ -1981,170 +2119,8 @@ share/owncloud/3rdparty/rackspace/php-opencloud/lib/OpenCloud/Volume/Resource/Vo share/owncloud/3rdparty/rackspace/php-opencloud/lib/OpenCloud/Volume/Service.php share/owncloud/3rdparty/rackspace/php-opencloud/lib/php-opencloud.php share/owncloud/3rdparty/rackspace/php-opencloud/phpunit.xml.dist -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Enum.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Logger.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Runner.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/SmokeException.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Step.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/AbstractUnit.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/Autoscale.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/CloudMonitoring.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/Compute.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/DNS.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/Database.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/Identity.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/LoadBalancer.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/ObjectStore.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/Orchestration.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/Queues.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/UnitInterface.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Unit/Volume.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Smoke/Utils.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/AutoscaleTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/Resource/GroupConfigurationTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/Resource/GroupTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/Resource/ScalingPolicyTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Group.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Group_Config.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Group_Create.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Group_Launch_Config.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Group_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Group_State.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Policy.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Policy_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Autoscale/_response/Webhook.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/CloudMonitoringTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/AgentHostTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/AgentTargetTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/AgentTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/AgentTokenTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/AlarmTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/ChangelogTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/CheckTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/CheckTypeTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/EntityTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/MetricTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/NotificationHistoryTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/NotificationPlanTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/NotificationTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/NotificationTypeTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/ViewTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/ZoneTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/Resource/test_existing.json -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Connection.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Connection_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Host_CPU.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Host_Disks.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Host_Filesystems.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Host_Memory.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Host_NetworkInterfaces.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Host_Processes.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Host_System.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Host_Who.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Agent_Target_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Alarm.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Alarm_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Changelogs.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Check.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/CheckType.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/CheckType_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Check_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Entity.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Entity_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Entity_Test.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Metrics.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Metrics_DataPoints.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/NH_Item.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/NH_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/NotificationType_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/View.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/CloudMonitoring/_response/Zone_Traceroute.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/BaseTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/Collection/ArrayCollectionTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/Collection/PaginatedIteratorTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/Log/LoggerTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/Log/testLogFile -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/MetadataTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/NovaTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/PersistentObjectTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Common/cacert.pem -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/ComputeTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/Resource/FlavorTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/Resource/ImageTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/Resource/KeyPairTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/Resource/NetworkTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/Resource/ServerMetadataTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/Resource/ServerTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/Resource/VolumeAttachmentTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/Resource/test.key -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/_response/Extensions.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/_response/Flavor.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/_response/Flavor_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/_response/Image.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/_response/Image_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/_response/Server.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Compute/_response/Server_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/DNS/DnsTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/DNS/Resource/DomainTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/DNS/Resource/PtrRecordTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/DNS/Resource/RecordTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/DNS/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/DNS/_response/Domain.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/DNS/_response/Domain_Changes.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/DNS/_response/Domain_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Database/DatabaseTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Database/Resource/DatabaseTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Database/Resource/InstanceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Database/Resource/UserTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Database/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Database/_response/Instance.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Identity/IdentityTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Identity/Resource/RoleTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Identity/Resource/TenantTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Identity/Resource/TokenTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Identity/Resource/UserTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Identity/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/LoadBalancer/LoadBalancerTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/LoadBalancer/Resource/LoadBalancerTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/LoadBalancer/Resource/SubResourceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/LoadBalancer/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/LoadBalancer/_response/LoadBalancer.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/MockSubscriber.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/ObjectStore/ObjectStoreTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/ObjectStore/Resource/ContainerTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/ObjectStore/Resource/DataObjectTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/ObjectStore/Resource/TransferTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/ObjectStore/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/ObjectStore/Upload/ContainerMigrationTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/ObjectStore/_response/Object.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/ObjectStore/_response/Object_Metadata.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/OpenCloudTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/OpenStackTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Queues/QueuesTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Queues/Resource/ClaimTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Queues/Resource/MessageTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Queues/Resource/QueueTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Queues/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Queues/_response/Claim.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Queues/_response/Message.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Queues/_response/Queue_List.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/RackspaceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/VersionTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Volume/Resource/SnapshotTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Volume/Resource/VolumeTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Volume/Resource/VolumeTypeTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Volume/ServiceTest.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Volume/VolumeTestCase.php -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/Volume/_response/Volume.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/_response/Auth.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/_response/Auth_No_Default_Region.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/OpenCloud/Tests/_response/Auth_OpenStack.resp -share/owncloud/3rdparty/rackspace/php-opencloud/tests/bootstrap.php +share/owncloud/3rdparty/react/promise/.gitignore +share/owncloud/3rdparty/react/promise/CHANGELOG.md share/owncloud/3rdparty/react/promise/LICENSE share/owncloud/3rdparty/react/promise/src/CancellablePromiseInterface.php share/owncloud/3rdparty/react/promise/src/Deferred.php @@ -2158,9 +2134,11 @@ share/owncloud/3rdparty/react/promise/src/RejectedPromise.php share/owncloud/3rdparty/react/promise/src/UnhandledRejectionException.php share/owncloud/3rdparty/react/promise/src/functions.php share/owncloud/3rdparty/react/promise/src/functions_include.php +share/owncloud/3rdparty/sabre/dav/.gitignore +share/owncloud/3rdparty/sabre/dav/CHANGELOG.md share/owncloud/3rdparty/sabre/dav/CONTRIBUTING.md -share/owncloud/3rdparty/sabre/dav/ChangeLog.md share/owncloud/3rdparty/sabre/dav/LICENSE +share/owncloud/3rdparty/sabre/dav/README.md share/owncloud/3rdparty/sabre/dav/composer.json share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Backend/AbstractBackend.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Backend/BackendInterface.php @@ -2173,10 +2151,8 @@ share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Backend/SyncSupport.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Calendar.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/CalendarHome.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/CalendarObject.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/CalendarQueryParser.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/CalendarQueryValidator.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/CalendarRoot.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/CalendarRootNode.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Exception/InvalidComponentType.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/ICSExportPlugin.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/ICalendar.php @@ -2187,11 +2163,7 @@ share/owncloud/3rdparty/sabre/dav/lib/CalDAV/ISharedCalendar.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/Collection.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/ICollection.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/INode.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/INotificationType.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/Node.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/Notification/Invite.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/Notification/InviteReply.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/Notification/SystemStatus.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Notifications/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Principal/Collection.php @@ -2200,13 +2172,6 @@ share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Principal/IProxyWrite.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Principal/ProxyRead.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Principal/ProxyWrite.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Principal/User.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Property/AllowedSharingModes.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Property/EmailAddressSet.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Property/Invite.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Property/ScheduleCalendarTransp.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Property/SupportedCalendarComponentSet.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Property/SupportedCalendarData.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Property/SupportedCollationSet.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Schedule/IInbox.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Schedule/IOutbox.php @@ -2221,9 +2186,29 @@ share/owncloud/3rdparty/sabre/dav/lib/CalDAV/SharingPlugin.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Subscriptions/ISubscription.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Subscriptions/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php -share/owncloud/3rdparty/sabre/dav/lib/CalDAV/UserCalendars.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Filter/CalendarData.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Filter/CompFilter.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Filter/ParamFilter.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Notification/NotificationInterface.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Notification/SystemStatus.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Property/AllowedSharingModes.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Property/EmailAddressSet.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Property/Invite.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarComponentSet.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Property/SupportedCalendarData.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Property/SupportedCollationSet.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Request/CalendarMultiGetReport.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Request/CalendarQueryReport.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Request/FreeBusyQueryReport.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Request/MkCalendar.php +share/owncloud/3rdparty/sabre/dav/lib/CalDAV/Xml/Request/Share.php share/owncloud/3rdparty/sabre/dav/lib/CardDAV/AddressBook.php -share/owncloud/3rdparty/sabre/dav/lib/CardDAV/AddressBookQueryParser.php +share/owncloud/3rdparty/sabre/dav/lib/CardDAV/AddressBookHome.php share/owncloud/3rdparty/sabre/dav/lib/CardDAV/AddressBookRoot.php share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Backend/AbstractBackend.php share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Backend/BackendInterface.php @@ -2234,10 +2219,14 @@ share/owncloud/3rdparty/sabre/dav/lib/CardDAV/IAddressBook.php share/owncloud/3rdparty/sabre/dav/lib/CardDAV/ICard.php share/owncloud/3rdparty/sabre/dav/lib/CardDAV/IDirectory.php share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Plugin.php -share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Property/SupportedAddressData.php -share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Property/SupportedCollationSet.php -share/owncloud/3rdparty/sabre/dav/lib/CardDAV/UserAddressBooks.php share/owncloud/3rdparty/sabre/dav/lib/CardDAV/VCFExportPlugin.php +share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php +share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php +share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php +share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php +share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php +share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php +share/owncloud/3rdparty/sabre/dav/lib/CardDAV/Xml/Request/AddressBookQueryReport.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/AbstractBasic.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/Apache.php @@ -2247,6 +2236,8 @@ share/owncloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/File.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Auth/Backend/PDO.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Auth/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Browser/GuessContentType.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Browser/HtmlOutput.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Browser/HtmlOutputHelper.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Browser/MapGetToPropFind.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Browser/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Browser/PropFindAll.php @@ -2267,7 +2258,6 @@ share/owncloud/3rdparty/sabre/dav/lib/DAV/Exception.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Exception/BadRequest.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Exception/Conflict.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Exception/ConflictingLock.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Exception/FileNotFound.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Exception/Forbidden.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Exception/InsufficientStorage.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Exception/InvalidResourceType.php @@ -2291,7 +2281,6 @@ share/owncloud/3rdparty/sabre/dav/lib/DAV/FS/File.php share/owncloud/3rdparty/sabre/dav/lib/DAV/FS/Node.php share/owncloud/3rdparty/sabre/dav/lib/DAV/FSExt/Directory.php share/owncloud/3rdparty/sabre/dav/lib/DAV/FSExt/File.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/FSExt/Node.php share/owncloud/3rdparty/sabre/dav/lib/DAV/File.php share/owncloud/3rdparty/sabre/dav/lib/DAV/ICollection.php share/owncloud/3rdparty/sabre/dav/lib/DAV/IExtendedCollection.php @@ -2303,31 +2292,17 @@ share/owncloud/3rdparty/sabre/dav/lib/DAV/IProperties.php share/owncloud/3rdparty/sabre/dav/lib/DAV/IQuota.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Locks/Backend/AbstractBackend.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Locks/Backend/BackendInterface.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Locks/Backend/FS.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Locks/Backend/File.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Locks/Backend/PDO.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Locks/LockInfo.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Locks/Plugin.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/MkCol.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Mount/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Node.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/PartialUpdate/IFile.php share/owncloud/3rdparty/sabre/dav/lib/DAV/PartialUpdate/IPatchSupport.php share/owncloud/3rdparty/sabre/dav/lib/DAV/PartialUpdate/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/DAV/PropFind.php share/owncloud/3rdparty/sabre/dav/lib/DAV/PropPatch.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/GetLastModified.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/Href.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/HrefList.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/IHref.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/LockDiscovery.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/ResourceType.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/Response.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/ResponseList.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/SupportedLock.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/SupportedMethodSet.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/Property/SupportedReportSet.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/PropertyInterface.php share/owncloud/3rdparty/sabre/dav/lib/DAV/PropertyStorage/Backend/BackendInterface.php share/owncloud/3rdparty/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php share/owncloud/3rdparty/sabre/dav/lib/DAV/PropertyStorage/Plugin.php @@ -2340,16 +2315,34 @@ share/owncloud/3rdparty/sabre/dav/lib/DAV/Sync/ISyncCollection.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Sync/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/DAV/TemporaryFileFilterPlugin.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Tree.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/URLUtil.php share/owncloud/3rdparty/sabre/dav/lib/DAV/UUIDUtil.php share/owncloud/3rdparty/sabre/dav/lib/DAV/Version.php -share/owncloud/3rdparty/sabre/dav/lib/DAV/XMLUtil.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Element/Prop.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Element/Response.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Property/Complex.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Property/GetLastModified.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Property/Href.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Property/LockDiscovery.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Property/ResourceType.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Property/SupportedLock.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Property/SupportedReportSet.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Request/Lock.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Request/MkCol.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Request/PropFind.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Request/PropPatch.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Request/SyncCollectionReport.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Response/MultiStatus.php +share/owncloud/3rdparty/sabre/dav/lib/DAV/Xml/Service.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/AbstractPrincipalCollection.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Exception/AceConflict.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Exception/NeedPrivileges.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Exception/NoAbstract.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Exception/NotRecognizedPrincipal.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Exception/NotSupportedPrivilege.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/FS/Collection.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/FS/File.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/FS/HomeCollection.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/IACL.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/IPrincipal.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/IPrincipalCollection.php @@ -2357,15 +2350,21 @@ share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Plugin.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Principal.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/PrincipalBackend/AbstractBackend.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/PrincipalBackend/CreatePrincipalSupport.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php share/owncloud/3rdparty/sabre/dav/lib/DAVACL/PrincipalCollection.php -share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Property/Acl.php -share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Property/AclRestrictions.php -share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Property/CurrentUserPrivilegeSet.php -share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Property/Principal.php -share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Property/SupportedPrivilegeSet.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Xml/Property/Acl.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Xml/Property/AclRestrictions.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Xml/Property/CurrentUserPrivilegeSet.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Xml/Property/Principal.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Xml/Request/ExpandPropertyReport.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Xml/Request/PrincipalPropertySearchReport.php +share/owncloud/3rdparty/sabre/dav/lib/DAVACL/Xml/Request/PrincipalSearchPropertySetReport.php +share/owncloud/3rdparty/sabre/event/.gitignore share/owncloud/3rdparty/sabre/event/CHANGELOG.md share/owncloud/3rdparty/sabre/event/LICENSE +share/owncloud/3rdparty/sabre/event/README.md share/owncloud/3rdparty/sabre/event/composer.json share/owncloud/3rdparty/sabre/event/lib/EventEmitter.php share/owncloud/3rdparty/sabre/event/lib/EventEmitterInterface.php @@ -2374,12 +2373,15 @@ share/owncloud/3rdparty/sabre/event/lib/Promise.php share/owncloud/3rdparty/sabre/event/lib/PromiseAlreadyResolvedException.php share/owncloud/3rdparty/sabre/event/lib/Version.php share/owncloud/3rdparty/sabre/event/phpunit.xml.dist -share/owncloud/3rdparty/sabre/http/ChangeLog.md +share/owncloud/3rdparty/sabre/http/.gitignore +share/owncloud/3rdparty/sabre/http/CHANGELOG.md share/owncloud/3rdparty/sabre/http/LICENSE +share/owncloud/3rdparty/sabre/http/README.md share/owncloud/3rdparty/sabre/http/composer.json share/owncloud/3rdparty/sabre/http/lib/Auth/AWS.php share/owncloud/3rdparty/sabre/http/lib/Auth/AbstractAuth.php share/owncloud/3rdparty/sabre/http/lib/Auth/Basic.php +share/owncloud/3rdparty/sabre/http/lib/Auth/Bearer.php share/owncloud/3rdparty/sabre/http/lib/Auth/Digest.php share/owncloud/3rdparty/sabre/http/lib/Client.php share/owncloud/3rdparty/sabre/http/lib/ClientException.php @@ -2398,8 +2400,24 @@ share/owncloud/3rdparty/sabre/http/lib/Sapi.php share/owncloud/3rdparty/sabre/http/lib/URLUtil.php share/owncloud/3rdparty/sabre/http/lib/Util.php share/owncloud/3rdparty/sabre/http/lib/Version.php +share/owncloud/3rdparty/sabre/http/lib/functions.php +share/owncloud/3rdparty/sabre/uri/.gitignore +share/owncloud/3rdparty/sabre/uri/CHANGELOG.md +share/owncloud/3rdparty/sabre/uri/LICENSE +share/owncloud/3rdparty/sabre/uri/README.md +share/owncloud/3rdparty/sabre/uri/composer.json +share/owncloud/3rdparty/sabre/uri/lib/Version.php +share/owncloud/3rdparty/sabre/uri/lib/functions.php +share/owncloud/3rdparty/sabre/uri/tests/BuildTest.php +share/owncloud/3rdparty/sabre/uri/tests/NormalizeTest.php +share/owncloud/3rdparty/sabre/uri/tests/ResolveTest.php +share/owncloud/3rdparty/sabre/uri/tests/SplitTest.php +share/owncloud/3rdparty/sabre/uri/tests/phpcs/ruleset.xml +share/owncloud/3rdparty/sabre/uri/tests/phpunit.xml.dist +share/owncloud/3rdparty/sabre/vobject/.gitignore share/owncloud/3rdparty/sabre/vobject/ChangeLog.md share/owncloud/3rdparty/sabre/vobject/LICENSE +share/owncloud/3rdparty/sabre/vobject/README.md share/owncloud/3rdparty/sabre/vobject/composer.json share/owncloud/3rdparty/sabre/vobject/lib/Cli.php share/owncloud/3rdparty/sabre/vobject/lib/Component.php @@ -2432,14 +2450,14 @@ share/owncloud/3rdparty/sabre/vobject/lib/Property.php share/owncloud/3rdparty/sabre/vobject/lib/Property/Binary.php share/owncloud/3rdparty/sabre/vobject/lib/Property/Boolean.php share/owncloud/3rdparty/sabre/vobject/lib/Property/FlatText.php -share/owncloud/3rdparty/sabre/vobject/lib/Property/Float.php +share/owncloud/3rdparty/sabre/vobject/lib/Property/FloatValue.php share/owncloud/3rdparty/sabre/vobject/lib/Property/ICalendar/CalAddress.php share/owncloud/3rdparty/sabre/vobject/lib/Property/ICalendar/Date.php share/owncloud/3rdparty/sabre/vobject/lib/Property/ICalendar/DateTime.php share/owncloud/3rdparty/sabre/vobject/lib/Property/ICalendar/Duration.php share/owncloud/3rdparty/sabre/vobject/lib/Property/ICalendar/Period.php share/owncloud/3rdparty/sabre/vobject/lib/Property/ICalendar/Recur.php -share/owncloud/3rdparty/sabre/vobject/lib/Property/Integer.php +share/owncloud/3rdparty/sabre/vobject/lib/Property/IntegerValue.php share/owncloud/3rdparty/sabre/vobject/lib/Property/Text.php share/owncloud/3rdparty/sabre/vobject/lib/Property/Time.php share/owncloud/3rdparty/sabre/vobject/lib/Property/Unknown.php @@ -2469,6 +2487,29 @@ share/owncloud/3rdparty/sabre/vobject/lib/timezonedata/lotuszones.php share/owncloud/3rdparty/sabre/vobject/lib/timezonedata/php-bc.php share/owncloud/3rdparty/sabre/vobject/lib/timezonedata/php-workaround.php share/owncloud/3rdparty/sabre/vobject/lib/timezonedata/windowszones.php +share/owncloud/3rdparty/sabre/xml/.gitignore +share/owncloud/3rdparty/sabre/xml/CHANGELOG.md +share/owncloud/3rdparty/sabre/xml/LICENSE +share/owncloud/3rdparty/sabre/xml/README.md +share/owncloud/3rdparty/sabre/xml/composer.json +share/owncloud/3rdparty/sabre/xml/lib/ContextStackTrait.php +share/owncloud/3rdparty/sabre/xml/lib/Deserializer/functions.php +share/owncloud/3rdparty/sabre/xml/lib/Element.php +share/owncloud/3rdparty/sabre/xml/lib/Element/Base.php +share/owncloud/3rdparty/sabre/xml/lib/Element/Cdata.php +share/owncloud/3rdparty/sabre/xml/lib/Element/Elements.php +share/owncloud/3rdparty/sabre/xml/lib/Element/KeyValue.php +share/owncloud/3rdparty/sabre/xml/lib/Element/Uri.php +share/owncloud/3rdparty/sabre/xml/lib/Element/XmlFragment.php +share/owncloud/3rdparty/sabre/xml/lib/LibXMLException.php +share/owncloud/3rdparty/sabre/xml/lib/ParseException.php +share/owncloud/3rdparty/sabre/xml/lib/Reader.php +share/owncloud/3rdparty/sabre/xml/lib/Serializer/functions.php +share/owncloud/3rdparty/sabre/xml/lib/Service.php +share/owncloud/3rdparty/sabre/xml/lib/Version.php +share/owncloud/3rdparty/sabre/xml/lib/Writer.php +share/owncloud/3rdparty/sabre/xml/lib/XmlDeserializable.php +share/owncloud/3rdparty/sabre/xml/lib/XmlSerializable.php share/owncloud/3rdparty/swiftmailer/swiftmailer/lib/classes/Swift.php share/owncloud/3rdparty/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php share/owncloud/3rdparty/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php @@ -2640,167 +2681,209 @@ share/owncloud/3rdparty/swiftmailer/swiftmailer/lib/swift_init.php share/owncloud/3rdparty/swiftmailer/swiftmailer/lib/swift_required.php share/owncloud/3rdparty/swiftmailer/swiftmailer/lib/swift_required_pear.php share/owncloud/3rdparty/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Application.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/CHANGELOG.md -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Command/Command.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Command/HelpCommand.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Command/ListCommand.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/ConsoleEvents.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Descriptor/ApplicationDescription.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Descriptor/Descriptor.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Descriptor/DescriptorInterface.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Descriptor/JsonDescriptor.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Descriptor/TextDescriptor.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Descriptor/XmlDescriptor.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Event/ConsoleCommandEvent.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Event/ConsoleEvent.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Event/ConsoleExceptionEvent.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Event/ConsoleTerminateEvent.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Formatter/OutputFormatter.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterInterface.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterStyle.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/DebugFormatterHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/DescriptorHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/DialogHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/FormatterHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/Helper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/HelperInterface.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/HelperSet.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/InputAwareHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/ProcessHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/ProgressBar.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/ProgressHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/QuestionHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/Table.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/TableHelper.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/TableSeparator.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Helper/TableStyle.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/ArgvInput.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/ArrayInput.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/Input.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/InputArgument.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/InputAwareInterface.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/InputDefinition.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/InputInterface.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/InputOption.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Input/StringInput.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/LICENSE -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Logger/ConsoleLogger.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Output/BufferedOutput.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Output/ConsoleOutput.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Output/ConsoleOutputInterface.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Output/NullOutput.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Output/Output.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Output/OutputInterface.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Output/StreamOutput.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Question/ChoiceQuestion.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Question/ConfirmationQuestion.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Question/Question.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Shell.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Tester/ApplicationTester.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/Tester/CommandTester.php -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/composer.json -share/owncloud/3rdparty/symfony/console/Symfony/Component/Console/phpunit.xml.dist -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/CHANGELOG.md -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Debug/WrappedListener.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/Event.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcher.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventDispatcherInterface.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/EventSubscriberInterface.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/GenericEvent.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/LICENSE -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/composer.json -share/owncloud/3rdparty/symfony/event-dispatcher/Symfony/Component/EventDispatcher/phpunit.xml.dist -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/CHANGELOG.md -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Exception/ExceptionInterface.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Exception/InvalidArgumentException.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Exception/LogicException.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Exception/ProcessFailedException.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Exception/ProcessTimedOutException.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Exception/RuntimeException.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/ExecutableFinder.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/LICENSE -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/PhpExecutableFinder.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/PhpProcess.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Pipes/AbstractPipes.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Pipes/PipesInterface.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Pipes/UnixPipes.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Pipes/WindowsPipes.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/Process.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/ProcessBuilder.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/ProcessUtils.php -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/composer.json -share/owncloud/3rdparty/symfony/process/Symfony/Component/Process/phpunit.xml.dist -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Annotation/Route.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/CHANGELOG.md -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/CompiledRoute.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Exception/ExceptionInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Exception/InvalidParameterException.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Exception/MethodNotAllowedException.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Exception/MissingMandatoryParametersException.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Exception/ResourceNotFoundException.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Exception/RouteNotFoundException.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Generator/ConfigurableRequirementsInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Generator/Dumper/GeneratorDumperInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Generator/UrlGenerator.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Generator/UrlGeneratorInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/LICENSE -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Loader/AnnotationClassLoader.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Loader/AnnotationDirectoryLoader.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Loader/AnnotationFileLoader.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Loader/ClosureLoader.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Loader/PhpFileLoader.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Loader/XmlFileLoader.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Loader/YamlFileLoader.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperCollection.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperPrefixCollection.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/DumperRoute.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/MatcherDumperInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/RedirectableUrlMatcherInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/RequestMatcherInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/TraceableUrlMatcher.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcher.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Matcher/UrlMatcherInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/RequestContext.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/RequestContextAwareInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Route.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/RouteCollection.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/RouteCompiler.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/RouteCompilerInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/Router.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/RouterInterface.php -share/owncloud/3rdparty/symfony/routing/Symfony/Component/Routing/composer.json +share/owncloud/3rdparty/symfony/console/Application.php +share/owncloud/3rdparty/symfony/console/Command/Command.php +share/owncloud/3rdparty/symfony/console/Command/HelpCommand.php +share/owncloud/3rdparty/symfony/console/Command/ListCommand.php +share/owncloud/3rdparty/symfony/console/ConsoleEvents.php +share/owncloud/3rdparty/symfony/console/Descriptor/ApplicationDescription.php +share/owncloud/3rdparty/symfony/console/Descriptor/Descriptor.php +share/owncloud/3rdparty/symfony/console/Descriptor/DescriptorInterface.php +share/owncloud/3rdparty/symfony/console/Descriptor/JsonDescriptor.php +share/owncloud/3rdparty/symfony/console/Descriptor/MarkdownDescriptor.php +share/owncloud/3rdparty/symfony/console/Descriptor/TextDescriptor.php +share/owncloud/3rdparty/symfony/console/Descriptor/XmlDescriptor.php +share/owncloud/3rdparty/symfony/console/Event/ConsoleCommandEvent.php +share/owncloud/3rdparty/symfony/console/Event/ConsoleEvent.php +share/owncloud/3rdparty/symfony/console/Event/ConsoleExceptionEvent.php +share/owncloud/3rdparty/symfony/console/Event/ConsoleTerminateEvent.php +share/owncloud/3rdparty/symfony/console/Exception/CommandNotFoundException.php +share/owncloud/3rdparty/symfony/console/Exception/ExceptionInterface.php +share/owncloud/3rdparty/symfony/console/Exception/InvalidArgumentException.php +share/owncloud/3rdparty/symfony/console/Exception/InvalidOptionException.php +share/owncloud/3rdparty/symfony/console/Exception/LogicException.php +share/owncloud/3rdparty/symfony/console/Exception/RuntimeException.php +share/owncloud/3rdparty/symfony/console/Formatter/OutputFormatter.php +share/owncloud/3rdparty/symfony/console/Formatter/OutputFormatterInterface.php +share/owncloud/3rdparty/symfony/console/Formatter/OutputFormatterStyle.php +share/owncloud/3rdparty/symfony/console/Formatter/OutputFormatterStyleInterface.php +share/owncloud/3rdparty/symfony/console/Formatter/OutputFormatterStyleStack.php +share/owncloud/3rdparty/symfony/console/Helper/DebugFormatterHelper.php +share/owncloud/3rdparty/symfony/console/Helper/DescriptorHelper.php +share/owncloud/3rdparty/symfony/console/Helper/DialogHelper.php +share/owncloud/3rdparty/symfony/console/Helper/FormatterHelper.php +share/owncloud/3rdparty/symfony/console/Helper/Helper.php +share/owncloud/3rdparty/symfony/console/Helper/HelperInterface.php +share/owncloud/3rdparty/symfony/console/Helper/HelperSet.php +share/owncloud/3rdparty/symfony/console/Helper/InputAwareHelper.php +share/owncloud/3rdparty/symfony/console/Helper/ProcessHelper.php +share/owncloud/3rdparty/symfony/console/Helper/ProgressBar.php +share/owncloud/3rdparty/symfony/console/Helper/ProgressHelper.php +share/owncloud/3rdparty/symfony/console/Helper/ProgressIndicator.php +share/owncloud/3rdparty/symfony/console/Helper/QuestionHelper.php +share/owncloud/3rdparty/symfony/console/Helper/SymfonyQuestionHelper.php +share/owncloud/3rdparty/symfony/console/Helper/Table.php +share/owncloud/3rdparty/symfony/console/Helper/TableCell.php +share/owncloud/3rdparty/symfony/console/Helper/TableHelper.php +share/owncloud/3rdparty/symfony/console/Helper/TableSeparator.php +share/owncloud/3rdparty/symfony/console/Helper/TableStyle.php +share/owncloud/3rdparty/symfony/console/Input/ArgvInput.php +share/owncloud/3rdparty/symfony/console/Input/ArrayInput.php +share/owncloud/3rdparty/symfony/console/Input/Input.php +share/owncloud/3rdparty/symfony/console/Input/InputArgument.php +share/owncloud/3rdparty/symfony/console/Input/InputAwareInterface.php +share/owncloud/3rdparty/symfony/console/Input/InputDefinition.php +share/owncloud/3rdparty/symfony/console/Input/InputInterface.php +share/owncloud/3rdparty/symfony/console/Input/InputOption.php +share/owncloud/3rdparty/symfony/console/Input/StringInput.php +share/owncloud/3rdparty/symfony/console/Logger/ConsoleLogger.php +share/owncloud/3rdparty/symfony/console/Output/BufferedOutput.php +share/owncloud/3rdparty/symfony/console/Output/ConsoleOutput.php +share/owncloud/3rdparty/symfony/console/Output/ConsoleOutputInterface.php +share/owncloud/3rdparty/symfony/console/Output/NullOutput.php +share/owncloud/3rdparty/symfony/console/Output/Output.php +share/owncloud/3rdparty/symfony/console/Output/OutputInterface.php +share/owncloud/3rdparty/symfony/console/Output/StreamOutput.php +share/owncloud/3rdparty/symfony/console/Question/ChoiceQuestion.php +share/owncloud/3rdparty/symfony/console/Question/ConfirmationQuestion.php +share/owncloud/3rdparty/symfony/console/Question/Question.php +share/owncloud/3rdparty/symfony/console/Shell.php +share/owncloud/3rdparty/symfony/console/Style/OutputStyle.php +share/owncloud/3rdparty/symfony/console/Style/StyleInterface.php +share/owncloud/3rdparty/symfony/console/Style/SymfonyStyle.php +share/owncloud/3rdparty/symfony/console/Tester/ApplicationTester.php +share/owncloud/3rdparty/symfony/console/Tester/CommandTester.php +share/owncloud/3rdparty/symfony/event-dispatcher/ContainerAwareEventDispatcher.php +share/owncloud/3rdparty/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php +share/owncloud/3rdparty/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php +share/owncloud/3rdparty/symfony/event-dispatcher/Debug/WrappedListener.php +share/owncloud/3rdparty/symfony/event-dispatcher/DependencyInjection/RegisterListenersPass.php +share/owncloud/3rdparty/symfony/event-dispatcher/Event.php +share/owncloud/3rdparty/symfony/event-dispatcher/EventDispatcher.php +share/owncloud/3rdparty/symfony/event-dispatcher/EventDispatcherInterface.php +share/owncloud/3rdparty/symfony/event-dispatcher/EventSubscriberInterface.php +share/owncloud/3rdparty/symfony/event-dispatcher/GenericEvent.php +share/owncloud/3rdparty/symfony/event-dispatcher/ImmutableEventDispatcher.php +share/owncloud/3rdparty/symfony/event-dispatcher/LICENSE +share/owncloud/3rdparty/symfony/polyfill-mbstring/Mbstring.php +share/owncloud/3rdparty/symfony/polyfill-mbstring/Resources/unidata/lowerCase.ser +share/owncloud/3rdparty/symfony/polyfill-mbstring/Resources/unidata/upperCase.ser +share/owncloud/3rdparty/symfony/polyfill-mbstring/bootstrap.php +share/owncloud/3rdparty/symfony/polyfill-php55/LICENSE +share/owncloud/3rdparty/symfony/polyfill-php55/Php55.php +share/owncloud/3rdparty/symfony/polyfill-php55/Php55ArrayColumn.php +share/owncloud/3rdparty/symfony/polyfill-php55/README.md +share/owncloud/3rdparty/symfony/polyfill-php55/bootstrap.php +share/owncloud/3rdparty/symfony/polyfill-php55/composer.json +share/owncloud/3rdparty/symfony/polyfill-php56/LICENSE +share/owncloud/3rdparty/symfony/polyfill-php56/Php56.php +share/owncloud/3rdparty/symfony/polyfill-php56/README.md +share/owncloud/3rdparty/symfony/polyfill-php56/bootstrap.php +share/owncloud/3rdparty/symfony/polyfill-php56/composer.json +share/owncloud/3rdparty/symfony/polyfill-php70/LICENSE +share/owncloud/3rdparty/symfony/polyfill-php70/Php70.php +share/owncloud/3rdparty/symfony/polyfill-php70/README.md +share/owncloud/3rdparty/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php +share/owncloud/3rdparty/symfony/polyfill-php70/Resources/stubs/AssertionError.php +share/owncloud/3rdparty/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php +share/owncloud/3rdparty/symfony/polyfill-php70/Resources/stubs/Error.php +share/owncloud/3rdparty/symfony/polyfill-php70/Resources/stubs/ParseError.php +share/owncloud/3rdparty/symfony/polyfill-php70/Resources/stubs/TypeError.php +share/owncloud/3rdparty/symfony/polyfill-php70/bootstrap.php +share/owncloud/3rdparty/symfony/polyfill-php70/composer.json +share/owncloud/3rdparty/symfony/polyfill-util/Binary.php +share/owncloud/3rdparty/symfony/polyfill-util/BinaryNoFuncOverload.php +share/owncloud/3rdparty/symfony/polyfill-util/BinaryOnFuncOverload.php +share/owncloud/3rdparty/symfony/polyfill-util/LICENSE +share/owncloud/3rdparty/symfony/polyfill-util/README.md +share/owncloud/3rdparty/symfony/polyfill-util/TestListener.php +share/owncloud/3rdparty/symfony/polyfill-util/composer.json +share/owncloud/3rdparty/symfony/process/Exception/ExceptionInterface.php +share/owncloud/3rdparty/symfony/process/Exception/InvalidArgumentException.php +share/owncloud/3rdparty/symfony/process/Exception/LogicException.php +share/owncloud/3rdparty/symfony/process/Exception/ProcessFailedException.php +share/owncloud/3rdparty/symfony/process/Exception/ProcessTimedOutException.php +share/owncloud/3rdparty/symfony/process/Exception/RuntimeException.php +share/owncloud/3rdparty/symfony/process/ExecutableFinder.php +share/owncloud/3rdparty/symfony/process/LICENSE +share/owncloud/3rdparty/symfony/process/PhpExecutableFinder.php +share/owncloud/3rdparty/symfony/process/PhpProcess.php +share/owncloud/3rdparty/symfony/process/Pipes/AbstractPipes.php +share/owncloud/3rdparty/symfony/process/Pipes/PipesInterface.php +share/owncloud/3rdparty/symfony/process/Pipes/UnixPipes.php +share/owncloud/3rdparty/symfony/process/Pipes/WindowsPipes.php +share/owncloud/3rdparty/symfony/process/Process.php +share/owncloud/3rdparty/symfony/process/ProcessBuilder.php +share/owncloud/3rdparty/symfony/process/ProcessUtils.php +share/owncloud/3rdparty/symfony/routing/Annotation/Route.php +share/owncloud/3rdparty/symfony/routing/CHANGELOG.md +share/owncloud/3rdparty/symfony/routing/CompiledRoute.php +share/owncloud/3rdparty/symfony/routing/Exception/ExceptionInterface.php +share/owncloud/3rdparty/symfony/routing/Exception/InvalidParameterException.php +share/owncloud/3rdparty/symfony/routing/Exception/MethodNotAllowedException.php +share/owncloud/3rdparty/symfony/routing/Exception/MissingMandatoryParametersException.php +share/owncloud/3rdparty/symfony/routing/Exception/ResourceNotFoundException.php +share/owncloud/3rdparty/symfony/routing/Exception/RouteNotFoundException.php +share/owncloud/3rdparty/symfony/routing/Generator/ConfigurableRequirementsInterface.php +share/owncloud/3rdparty/symfony/routing/Generator/Dumper/GeneratorDumper.php +share/owncloud/3rdparty/symfony/routing/Generator/Dumper/GeneratorDumperInterface.php +share/owncloud/3rdparty/symfony/routing/Generator/Dumper/PhpGeneratorDumper.php +share/owncloud/3rdparty/symfony/routing/Generator/UrlGenerator.php +share/owncloud/3rdparty/symfony/routing/Generator/UrlGeneratorInterface.php +share/owncloud/3rdparty/symfony/routing/LICENSE +share/owncloud/3rdparty/symfony/routing/Loader/AnnotationClassLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/AnnotationDirectoryLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/AnnotationFileLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/ClosureLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/DependencyInjection/ServiceRouterLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/DirectoryLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/ObjectRouteLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/PhpFileLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/XmlFileLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/YamlFileLoader.php +share/owncloud/3rdparty/symfony/routing/Loader/schema/routing/routing-1.0.xsd +share/owncloud/3rdparty/symfony/routing/Matcher/ApacheUrlMatcher.php +share/owncloud/3rdparty/symfony/routing/Matcher/Dumper/ApacheMatcherDumper.php +share/owncloud/3rdparty/symfony/routing/Matcher/Dumper/DumperCollection.php +share/owncloud/3rdparty/symfony/routing/Matcher/Dumper/DumperPrefixCollection.php +share/owncloud/3rdparty/symfony/routing/Matcher/Dumper/DumperRoute.php +share/owncloud/3rdparty/symfony/routing/Matcher/Dumper/MatcherDumper.php +share/owncloud/3rdparty/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php +share/owncloud/3rdparty/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php +share/owncloud/3rdparty/symfony/routing/Matcher/RedirectableUrlMatcher.php +share/owncloud/3rdparty/symfony/routing/Matcher/RedirectableUrlMatcherInterface.php +share/owncloud/3rdparty/symfony/routing/Matcher/RequestMatcherInterface.php +share/owncloud/3rdparty/symfony/routing/Matcher/TraceableUrlMatcher.php +share/owncloud/3rdparty/symfony/routing/Matcher/UrlMatcher.php +share/owncloud/3rdparty/symfony/routing/Matcher/UrlMatcherInterface.php +share/owncloud/3rdparty/symfony/routing/README.md +share/owncloud/3rdparty/symfony/routing/RequestContext.php +share/owncloud/3rdparty/symfony/routing/RequestContextAwareInterface.php +share/owncloud/3rdparty/symfony/routing/Route.php +share/owncloud/3rdparty/symfony/routing/RouteCollection.php +share/owncloud/3rdparty/symfony/routing/RouteCollectionBuilder.php +share/owncloud/3rdparty/symfony/routing/RouteCompiler.php +share/owncloud/3rdparty/symfony/routing/RouteCompilerInterface.php +share/owncloud/3rdparty/symfony/routing/Router.php +share/owncloud/3rdparty/symfony/routing/RouterInterface.php share/owncloud/AUTHORS share/owncloud/COPYING-AGPL -share/owncloud/apps/activity/CONTRIBUTING.md share/owncloud/apps/activity/appinfo/app.php share/owncloud/apps/activity/appinfo/application.php share/owncloud/apps/activity/appinfo/database.xml share/owncloud/apps/activity/appinfo/info.xml share/owncloud/apps/activity/appinfo/install.php share/owncloud/apps/activity/appinfo/routes.php +share/owncloud/apps/activity/appinfo/signature.json share/owncloud/apps/activity/appinfo/update.php share/owncloud/apps/activity/controller/activities.php +share/owncloud/apps/activity/controller/endpoint.php share/owncloud/apps/activity/controller/feed.php +share/owncloud/apps/activity/controller/ocsendpoint.php share/owncloud/apps/activity/controller/settings.php share/owncloud/apps/activity/css/settings.css share/owncloud/apps/activity/css/style.css +share/owncloud/apps/activity/docs/endpoint-v2.md share/owncloud/apps/activity/extension/files.php share/owncloud/apps/activity/extension/files_sharing.php share/owncloud/apps/activity/img/activity-dark.png @@ -2817,8 +2900,10 @@ share/owncloud/apps/activity/js/activitycollection.js share/owncloud/apps/activity/js/activitymodel.js share/owncloud/apps/activity/js/activitytabview.js share/owncloud/apps/activity/js/filesplugin.js +share/owncloud/apps/activity/js/formatter.js share/owncloud/apps/activity/js/script.js share/owncloud/apps/activity/js/settings.js +share/owncloud/apps/activity/l10n/.tx/config share/owncloud/apps/activity/l10n/ar.js share/owncloud/apps/activity/l10n/ar.json share/owncloud/apps/activity/l10n/ast.js @@ -2877,6 +2962,8 @@ share/owncloud/apps/activity/l10n/ia.js share/owncloud/apps/activity/l10n/ia.json share/owncloud/apps/activity/l10n/id.js share/owncloud/apps/activity/l10n/id.json +share/owncloud/apps/activity/l10n/is.js +share/owncloud/apps/activity/l10n/is.json share/owncloud/apps/activity/l10n/it.js share/owncloud/apps/activity/l10n/it.json share/owncloud/apps/activity/l10n/ja.js @@ -2905,7 +2992,6 @@ share/owncloud/apps/activity/l10n/nl.js share/owncloud/apps/activity/l10n/nl.json share/owncloud/apps/activity/l10n/nn_NO.js share/owncloud/apps/activity/l10n/nn_NO.json -share/owncloud/apps/activity/l10n/no-php share/owncloud/apps/activity/l10n/oc.js share/owncloud/apps/activity/l10n/oc.json share/owncloud/apps/activity/l10n/pl.js @@ -2948,52 +3034,31 @@ share/owncloud/apps/activity/lib/backgroundjob/expireactivities.php share/owncloud/apps/activity/lib/consumer.php share/owncloud/apps/activity/lib/data.php share/owncloud/apps/activity/lib/datahelper.php +share/owncloud/apps/activity/lib/exception/invalidfilterexception.php share/owncloud/apps/activity/lib/fileshooks.php share/owncloud/apps/activity/lib/fileshooksstatic.php +share/owncloud/apps/activity/lib/formatter/baseformatter.php +share/owncloud/apps/activity/lib/formatter/cloudidformatter.php +share/owncloud/apps/activity/lib/formatter/fileformatter.php +share/owncloud/apps/activity/lib/formatter/iformatter.php +share/owncloud/apps/activity/lib/formatter/userformatter.php share/owncloud/apps/activity/lib/grouphelper.php share/owncloud/apps/activity/lib/hooks.php share/owncloud/apps/activity/lib/mailqueuehandler.php share/owncloud/apps/activity/lib/navigation.php -share/owncloud/apps/activity/lib/parameterhelper.php +share/owncloud/apps/activity/lib/parameter/collection.php +share/owncloud/apps/activity/lib/parameter/factory.php +share/owncloud/apps/activity/lib/parameter/iparameter.php +share/owncloud/apps/activity/lib/parameter/parameter.php +share/owncloud/apps/activity/lib/plaintextparser.php share/owncloud/apps/activity/lib/usersettings.php +share/owncloud/apps/activity/lib/viewinfocache.php share/owncloud/apps/activity/personal.php share/owncloud/apps/activity/templates/email.notification.php share/owncloud/apps/activity/templates/personal.php share/owncloud/apps/activity/templates/rss.php share/owncloud/apps/activity/templates/stream.app.navigation.php share/owncloud/apps/activity/templates/stream.body.php -share/owncloud/apps/activity/tests/apitest.php -share/owncloud/apps/activity/tests/appinfo/applicationtest.php -share/owncloud/apps/activity/tests/appinfo/apptest.php -share/owncloud/apps/activity/tests/appinfo/installtest.php -share/owncloud/apps/activity/tests/appinfo/updatetest.php -share/owncloud/apps/activity/tests/backgroundjob/emailnotificationtest.php -share/owncloud/apps/activity/tests/backgroundjob/expireactivitiestest.php -share/owncloud/apps/activity/tests/bootstrap.php -share/owncloud/apps/activity/tests/consumertest.php -share/owncloud/apps/activity/tests/controller/activitiestest.php -share/owncloud/apps/activity/tests/controller/feedtest.php -share/owncloud/apps/activity/tests/controller/settingstest.php -share/owncloud/apps/activity/tests/datadeleteactivitestest.php -share/owncloud/apps/activity/tests/datahelpertest.php -share/owncloud/apps/activity/tests/datatest.php -share/owncloud/apps/activity/tests/fileshookstest.php -share/owncloud/apps/activity/tests/grouphelpertest.php -share/owncloud/apps/activity/tests/hooksdeleteusertest.php -share/owncloud/apps/activity/tests/js/activitycollectionSpec.js -share/owncloud/apps/activity/tests/js/activitytabviewSpec.js -share/owncloud/apps/activity/tests/js/karma.config.js -share/owncloud/apps/activity/tests/js/package.json -share/owncloud/apps/activity/tests/js/scriptSpec.js -share/owncloud/apps/activity/tests/mailqueuehandlertest.php -share/owncloud/apps/activity/tests/mock/extension.php -share/owncloud/apps/activity/tests/navigationtest.php -share/owncloud/apps/activity/tests/parameterhelpertest.php -share/owncloud/apps/activity/tests/personaltest.php -share/owncloud/apps/activity/tests/phpunit.xml -share/owncloud/apps/activity/tests/template/rsstest.php -share/owncloud/apps/activity/tests/testcase.php -share/owncloud/apps/activity/tests/usersettingstest.php share/owncloud/apps/calendar/3rdparty/chosen/LICENSE.md share/owncloud/apps/calendar/3rdparty/chosen/css/chosen-sprite.png share/owncloud/apps/calendar/3rdparty/chosen/css/chosen.css @@ -3334,6 +3399,176 @@ share/owncloud/apps/calendar/templates/part.import.php share/owncloud/apps/calendar/templates/part.newevent.php share/owncloud/apps/calendar/templates/part.share.php share/owncloud/apps/calendar/templates/part.showevent.php +share/owncloud/apps/comments/activity/extension.php +share/owncloud/apps/comments/activity/listener.php +share/owncloud/apps/comments/appinfo/app.php +share/owncloud/apps/comments/appinfo/info.xml +share/owncloud/apps/comments/appinfo/signature.json +share/owncloud/apps/comments/css/comments.css +share/owncloud/apps/comments/js/app.js +share/owncloud/apps/comments/js/commentcollection.js +share/owncloud/apps/comments/js/commentmodel.js +share/owncloud/apps/comments/js/commentstabview.js +share/owncloud/apps/comments/js/commentsummarymodel.js +share/owncloud/apps/comments/js/filesplugin.js +share/owncloud/apps/comments/l10n/af_ZA.js +share/owncloud/apps/comments/l10n/af_ZA.json +share/owncloud/apps/comments/l10n/ar.js +share/owncloud/apps/comments/l10n/ar.json +share/owncloud/apps/comments/l10n/ast.js +share/owncloud/apps/comments/l10n/ast.json +share/owncloud/apps/comments/l10n/az.js +share/owncloud/apps/comments/l10n/az.json +share/owncloud/apps/comments/l10n/bg_BG.js +share/owncloud/apps/comments/l10n/bg_BG.json +share/owncloud/apps/comments/l10n/bn_BD.js +share/owncloud/apps/comments/l10n/bn_BD.json +share/owncloud/apps/comments/l10n/bn_IN.js +share/owncloud/apps/comments/l10n/bn_IN.json +share/owncloud/apps/comments/l10n/bs.js +share/owncloud/apps/comments/l10n/bs.json +share/owncloud/apps/comments/l10n/ca.js +share/owncloud/apps/comments/l10n/ca.json +share/owncloud/apps/comments/l10n/cs_CZ.js +share/owncloud/apps/comments/l10n/cs_CZ.json +share/owncloud/apps/comments/l10n/cy_GB.js +share/owncloud/apps/comments/l10n/cy_GB.json +share/owncloud/apps/comments/l10n/da.js +share/owncloud/apps/comments/l10n/da.json +share/owncloud/apps/comments/l10n/de.js +share/owncloud/apps/comments/l10n/de.json +share/owncloud/apps/comments/l10n/de_AT.js +share/owncloud/apps/comments/l10n/de_AT.json +share/owncloud/apps/comments/l10n/de_DE.js +share/owncloud/apps/comments/l10n/de_DE.json +share/owncloud/apps/comments/l10n/el.js +share/owncloud/apps/comments/l10n/el.json +share/owncloud/apps/comments/l10n/en_GB.js +share/owncloud/apps/comments/l10n/en_GB.json +share/owncloud/apps/comments/l10n/eo.js +share/owncloud/apps/comments/l10n/eo.json +share/owncloud/apps/comments/l10n/es.js +share/owncloud/apps/comments/l10n/es.json +share/owncloud/apps/comments/l10n/es_AR.js +share/owncloud/apps/comments/l10n/es_AR.json +share/owncloud/apps/comments/l10n/es_CL.js +share/owncloud/apps/comments/l10n/es_CL.json +share/owncloud/apps/comments/l10n/es_MX.js +share/owncloud/apps/comments/l10n/es_MX.json +share/owncloud/apps/comments/l10n/et_EE.js +share/owncloud/apps/comments/l10n/et_EE.json +share/owncloud/apps/comments/l10n/eu.js +share/owncloud/apps/comments/l10n/eu.json +share/owncloud/apps/comments/l10n/fa.js +share/owncloud/apps/comments/l10n/fa.json +share/owncloud/apps/comments/l10n/fi_FI.js +share/owncloud/apps/comments/l10n/fi_FI.json +share/owncloud/apps/comments/l10n/fr.js +share/owncloud/apps/comments/l10n/fr.json +share/owncloud/apps/comments/l10n/gl.js +share/owncloud/apps/comments/l10n/gl.json +share/owncloud/apps/comments/l10n/he.js +share/owncloud/apps/comments/l10n/he.json +share/owncloud/apps/comments/l10n/hi.js +share/owncloud/apps/comments/l10n/hi.json +share/owncloud/apps/comments/l10n/hr.js +share/owncloud/apps/comments/l10n/hr.json +share/owncloud/apps/comments/l10n/hu_HU.js +share/owncloud/apps/comments/l10n/hu_HU.json +share/owncloud/apps/comments/l10n/hy.js +share/owncloud/apps/comments/l10n/hy.json +share/owncloud/apps/comments/l10n/ia.js +share/owncloud/apps/comments/l10n/ia.json +share/owncloud/apps/comments/l10n/id.js +share/owncloud/apps/comments/l10n/id.json +share/owncloud/apps/comments/l10n/is.js +share/owncloud/apps/comments/l10n/is.json +share/owncloud/apps/comments/l10n/it.js +share/owncloud/apps/comments/l10n/it.json +share/owncloud/apps/comments/l10n/ja.js +share/owncloud/apps/comments/l10n/ja.json +share/owncloud/apps/comments/l10n/ka_GE.js +share/owncloud/apps/comments/l10n/ka_GE.json +share/owncloud/apps/comments/l10n/km.js +share/owncloud/apps/comments/l10n/km.json +share/owncloud/apps/comments/l10n/kn.js +share/owncloud/apps/comments/l10n/kn.json +share/owncloud/apps/comments/l10n/ko.js +share/owncloud/apps/comments/l10n/ko.json +share/owncloud/apps/comments/l10n/ku_IQ.js +share/owncloud/apps/comments/l10n/ku_IQ.json +share/owncloud/apps/comments/l10n/lb.js +share/owncloud/apps/comments/l10n/lb.json +share/owncloud/apps/comments/l10n/lt_LT.js +share/owncloud/apps/comments/l10n/lt_LT.json +share/owncloud/apps/comments/l10n/lv.js +share/owncloud/apps/comments/l10n/lv.json +share/owncloud/apps/comments/l10n/mk.js +share/owncloud/apps/comments/l10n/mk.json +share/owncloud/apps/comments/l10n/mn.js +share/owncloud/apps/comments/l10n/mn.json +share/owncloud/apps/comments/l10n/ms_MY.js +share/owncloud/apps/comments/l10n/ms_MY.json +share/owncloud/apps/comments/l10n/my_MM.js +share/owncloud/apps/comments/l10n/my_MM.json +share/owncloud/apps/comments/l10n/nb_NO.js +share/owncloud/apps/comments/l10n/nb_NO.json +share/owncloud/apps/comments/l10n/nds.js +share/owncloud/apps/comments/l10n/nds.json +share/owncloud/apps/comments/l10n/nl.js +share/owncloud/apps/comments/l10n/nl.json +share/owncloud/apps/comments/l10n/nn_NO.js +share/owncloud/apps/comments/l10n/nn_NO.json +share/owncloud/apps/comments/l10n/oc.js +share/owncloud/apps/comments/l10n/oc.json +share/owncloud/apps/comments/l10n/pa.js +share/owncloud/apps/comments/l10n/pa.json +share/owncloud/apps/comments/l10n/pl.js +share/owncloud/apps/comments/l10n/pl.json +share/owncloud/apps/comments/l10n/pt_BR.js +share/owncloud/apps/comments/l10n/pt_BR.json +share/owncloud/apps/comments/l10n/pt_PT.js +share/owncloud/apps/comments/l10n/pt_PT.json +share/owncloud/apps/comments/l10n/ro.js +share/owncloud/apps/comments/l10n/ro.json +share/owncloud/apps/comments/l10n/ru.js +share/owncloud/apps/comments/l10n/ru.json +share/owncloud/apps/comments/l10n/si_LK.js +share/owncloud/apps/comments/l10n/si_LK.json +share/owncloud/apps/comments/l10n/sk_SK.js +share/owncloud/apps/comments/l10n/sk_SK.json +share/owncloud/apps/comments/l10n/sl.js +share/owncloud/apps/comments/l10n/sl.json +share/owncloud/apps/comments/l10n/sq.js +share/owncloud/apps/comments/l10n/sq.json +share/owncloud/apps/comments/l10n/sr.js +share/owncloud/apps/comments/l10n/sr.json +share/owncloud/apps/comments/l10n/sr@latin.js +share/owncloud/apps/comments/l10n/sr@latin.json +share/owncloud/apps/comments/l10n/sv.js +share/owncloud/apps/comments/l10n/sv.json +share/owncloud/apps/comments/l10n/ta_LK.js +share/owncloud/apps/comments/l10n/ta_LK.json +share/owncloud/apps/comments/l10n/te.js +share/owncloud/apps/comments/l10n/te.json +share/owncloud/apps/comments/l10n/th_TH.js +share/owncloud/apps/comments/l10n/th_TH.json +share/owncloud/apps/comments/l10n/tr.js +share/owncloud/apps/comments/l10n/tr.json +share/owncloud/apps/comments/l10n/ug.js +share/owncloud/apps/comments/l10n/ug.json +share/owncloud/apps/comments/l10n/uk.js +share/owncloud/apps/comments/l10n/uk.json +share/owncloud/apps/comments/l10n/ur_PK.js +share/owncloud/apps/comments/l10n/ur_PK.json +share/owncloud/apps/comments/l10n/vi.js +share/owncloud/apps/comments/l10n/vi.json +share/owncloud/apps/comments/l10n/zh_CN.js +share/owncloud/apps/comments/l10n/zh_CN.json +share/owncloud/apps/comments/l10n/zh_HK.js +share/owncloud/apps/comments/l10n/zh_HK.json +share/owncloud/apps/comments/l10n/zh_TW.js +share/owncloud/apps/comments/l10n/zh_TW.json share/owncloud/apps/contacts/Changelog share/owncloud/apps/contacts/admin.php share/owncloud/apps/contacts/appinfo/app.php @@ -3786,11 +4021,111 @@ share/owncloud/apps/contacts/vendor/ui-multiselect/src/jquery.multiselect.filter share/owncloud/apps/contacts/vendor/ui-multiselect/src/jquery.multiselect.filter.min.js share/owncloud/apps/contacts/vendor/ui-multiselect/src/jquery.multiselect.js share/owncloud/apps/contacts/vendor/ui-multiselect/src/jquery.multiselect.min.js +share/owncloud/apps/dav/appinfo/app.php +share/owncloud/apps/dav/appinfo/application.php +share/owncloud/apps/dav/appinfo/database.xml +share/owncloud/apps/dav/appinfo/info.xml +share/owncloud/apps/dav/appinfo/install.php +share/owncloud/apps/dav/appinfo/register_command.php +share/owncloud/apps/dav/appinfo/signature.json +share/owncloud/apps/dav/appinfo/update.php +share/owncloud/apps/dav/appinfo/v1/caldav.php +share/owncloud/apps/dav/appinfo/v1/carddav.php +share/owncloud/apps/dav/appinfo/v1/publicwebdav.php +share/owncloud/apps/dav/appinfo/v1/webdav.php +share/owncloud/apps/dav/appinfo/v2/remote.php +share/owncloud/apps/dav/command/createaddressbook.php +share/owncloud/apps/dav/command/createcalendar.php +share/owncloud/apps/dav/command/migrateaddressbooks.php +share/owncloud/apps/dav/command/migratecalendars.php +share/owncloud/apps/dav/command/syncbirthdaycalendar.php +share/owncloud/apps/dav/command/syncsystemaddressbook.php +share/owncloud/apps/dav/lib/caldav/birthdayservice.php +share/owncloud/apps/dav/lib/caldav/caldavbackend.php +share/owncloud/apps/dav/lib/caldav/calendar.php +share/owncloud/apps/dav/lib/caldav/calendarhome.php +share/owncloud/apps/dav/lib/caldav/calendarroot.php +share/owncloud/apps/dav/lib/caldav/schedule/imipplugin.php +share/owncloud/apps/dav/lib/carddav/addressbook.php +share/owncloud/apps/dav/lib/carddav/addressbookimpl.php +share/owncloud/apps/dav/lib/carddav/addressbookroot.php +share/owncloud/apps/dav/lib/carddav/card.php +share/owncloud/apps/dav/lib/carddav/carddavbackend.php +share/owncloud/apps/dav/lib/carddav/contactsmanager.php +share/owncloud/apps/dav/lib/carddav/converter.php +share/owncloud/apps/dav/lib/carddav/plugin.php +share/owncloud/apps/dav/lib/carddav/syncjob.php +share/owncloud/apps/dav/lib/carddav/syncservice.php +share/owncloud/apps/dav/lib/carddav/useraddressbooks.php +share/owncloud/apps/dav/lib/carddav/xml/groups.php +share/owncloud/apps/dav/lib/comments/commentnode.php +share/owncloud/apps/dav/lib/comments/commentsplugin.php +share/owncloud/apps/dav/lib/comments/entitycollection.php +share/owncloud/apps/dav/lib/comments/entitytypecollection.php +share/owncloud/apps/dav/lib/comments/rootcollection.php +share/owncloud/apps/dav/lib/connector/legacydavacl.php +share/owncloud/apps/dav/lib/connector/publicauth.php +share/owncloud/apps/dav/lib/connector/sabre/appenabledplugin.php +share/owncloud/apps/dav/lib/connector/sabre/auth.php +share/owncloud/apps/dav/lib/connector/sabre/blocklegacyclientplugin.php +share/owncloud/apps/dav/lib/connector/sabre/checksumlist.php +share/owncloud/apps/dav/lib/connector/sabre/commentpropertiesplugin.php +share/owncloud/apps/dav/lib/connector/sabre/copyetagheaderplugin.php +share/owncloud/apps/dav/lib/connector/sabre/custompropertiesbackend.php +share/owncloud/apps/dav/lib/connector/sabre/davaclplugin.php +share/owncloud/apps/dav/lib/connector/sabre/directory.php +share/owncloud/apps/dav/lib/connector/sabre/dummygetresponseplugin.php +share/owncloud/apps/dav/lib/connector/sabre/exception/entitytoolarge.php +share/owncloud/apps/dav/lib/connector/sabre/exception/filelocked.php +share/owncloud/apps/dav/lib/connector/sabre/exception/forbidden.php +share/owncloud/apps/dav/lib/connector/sabre/exception/invalidpath.php +share/owncloud/apps/dav/lib/connector/sabre/exception/unsupportedmediatype.php +share/owncloud/apps/dav/lib/connector/sabre/exceptionloggerplugin.php +share/owncloud/apps/dav/lib/connector/sabre/fakelockerplugin.php +share/owncloud/apps/dav/lib/connector/sabre/file.php +share/owncloud/apps/dav/lib/connector/sabre/filesplugin.php +share/owncloud/apps/dav/lib/connector/sabre/filesreportplugin.php +share/owncloud/apps/dav/lib/connector/sabre/lockplugin.php +share/owncloud/apps/dav/lib/connector/sabre/maintenanceplugin.php +share/owncloud/apps/dav/lib/connector/sabre/node.php +share/owncloud/apps/dav/lib/connector/sabre/objecttree.php +share/owncloud/apps/dav/lib/connector/sabre/principal.php +share/owncloud/apps/dav/lib/connector/sabre/quotaplugin.php +share/owncloud/apps/dav/lib/connector/sabre/server.php +share/owncloud/apps/dav/lib/connector/sabre/serverfactory.php +share/owncloud/apps/dav/lib/connector/sabre/taglist.php +share/owncloud/apps/dav/lib/connector/sabre/tagsplugin.php +share/owncloud/apps/dav/lib/dav/groupprincipalbackend.php +share/owncloud/apps/dav/lib/dav/sharing/backend.php +share/owncloud/apps/dav/lib/dav/sharing/ishareable.php +share/owncloud/apps/dav/lib/dav/sharing/plugin.php +share/owncloud/apps/dav/lib/dav/sharing/xml/invite.php +share/owncloud/apps/dav/lib/dav/sharing/xml/sharerequest.php +share/owncloud/apps/dav/lib/dav/systemprincipalbackend.php +share/owncloud/apps/dav/lib/files/custompropertiesbackend.php +share/owncloud/apps/dav/lib/files/fileshome.php +share/owncloud/apps/dav/lib/files/rootcollection.php +share/owncloud/apps/dav/lib/files/sharing/publiclinkcheckplugin.php +share/owncloud/apps/dav/lib/hookmanager.php +share/owncloud/apps/dav/lib/migration/addressbookadapter.php +share/owncloud/apps/dav/lib/migration/calendaradapter.php +share/owncloud/apps/dav/lib/migration/migrateaddressbooks.php +share/owncloud/apps/dav/lib/migration/migratecalendars.php +share/owncloud/apps/dav/lib/rootcollection.php +share/owncloud/apps/dav/lib/server.php +share/owncloud/apps/dav/lib/systemtag/systemtagmappingnode.php +share/owncloud/apps/dav/lib/systemtag/systemtagnode.php +share/owncloud/apps/dav/lib/systemtag/systemtagplugin.php +share/owncloud/apps/dav/lib/systemtag/systemtagsbyidcollection.php +share/owncloud/apps/dav/lib/systemtag/systemtagsobjectmappingcollection.php +share/owncloud/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php +share/owncloud/apps/dav/lib/systemtag/systemtagsrelationscollection.php share/owncloud/apps/encryption/appinfo/app.php share/owncloud/apps/encryption/appinfo/application.php share/owncloud/apps/encryption/appinfo/info.xml share/owncloud/apps/encryption/appinfo/register_command.php share/owncloud/apps/encryption/appinfo/routes.php +share/owncloud/apps/encryption/appinfo/signature.json share/owncloud/apps/encryption/command/enablemasterkey.php share/owncloud/apps/encryption/command/migratekeys.php share/owncloud/apps/encryption/controller/recoverycontroller.php @@ -3850,6 +4185,8 @@ share/owncloud/apps/encryption/l10n/fr.js share/owncloud/apps/encryption/l10n/fr.json share/owncloud/apps/encryption/l10n/gl.js share/owncloud/apps/encryption/l10n/gl.json +share/owncloud/apps/encryption/l10n/he.js +share/owncloud/apps/encryption/l10n/he.json share/owncloud/apps/encryption/l10n/hr.js share/owncloud/apps/encryption/l10n/hr.json share/owncloud/apps/encryption/l10n/hu_HU.js @@ -3943,27 +4280,11 @@ share/owncloud/apps/encryption/templates/altmail.php share/owncloud/apps/encryption/templates/mail.php share/owncloud/apps/encryption/templates/settings-admin.php share/owncloud/apps/encryption/templates/settings-personal.php -share/owncloud/apps/encryption/tests/command/testenablemasterkey.php -share/owncloud/apps/encryption/tests/controller/RecoveryControllerTest.php -share/owncloud/apps/encryption/tests/controller/SettingsControllerTest.php -share/owncloud/apps/encryption/tests/controller/StatusControllerTest.php -share/owncloud/apps/encryption/tests/hooks/UserHooksTest.php -share/owncloud/apps/encryption/tests/lib/HookManagerTest.php -share/owncloud/apps/encryption/tests/lib/KeyManagerTest.php -share/owncloud/apps/encryption/tests/lib/MigrationTest.php -share/owncloud/apps/encryption/tests/lib/RecoveryTest.php -share/owncloud/apps/encryption/tests/lib/SessionTest.php -share/owncloud/apps/encryption/tests/lib/UtilTest.php -share/owncloud/apps/encryption/tests/lib/crypto/cryptTest.php -share/owncloud/apps/encryption/tests/lib/crypto/decryptalltest.php -share/owncloud/apps/encryption/tests/lib/crypto/encryptalltest.php -share/owncloud/apps/encryption/tests/lib/crypto/encryptionTest.php -share/owncloud/apps/encryption/tests/lib/users/SetupTest.php -share/owncloud/apps/encryption/vendor/pbkdf2fallback.php share/owncloud/apps/external/ajax/setsites.php share/owncloud/apps/external/appinfo/app.php share/owncloud/apps/external/appinfo/info.xml share/owncloud/apps/external/appinfo/routes.php +share/owncloud/apps/external/appinfo/signature.json share/owncloud/apps/external/appinfo/version share/owncloud/apps/external/css/style.css share/owncloud/apps/external/img/external.png @@ -4129,27 +4450,186 @@ share/owncloud/apps/external/lib/external.php share/owncloud/apps/external/settings.php share/owncloud/apps/external/templates/frame.php share/owncloud/apps/external/templates/settings.php +share/owncloud/apps/federatedfilesharing/appinfo/app.php +share/owncloud/apps/federatedfilesharing/appinfo/info.xml +share/owncloud/apps/federatedfilesharing/appinfo/signature.json +share/owncloud/apps/federatedfilesharing/l10n/ast.js +share/owncloud/apps/federatedfilesharing/l10n/ast.json +share/owncloud/apps/federatedfilesharing/l10n/bg_BG.js +share/owncloud/apps/federatedfilesharing/l10n/bg_BG.json +share/owncloud/apps/federatedfilesharing/l10n/ca.js +share/owncloud/apps/federatedfilesharing/l10n/ca.json +share/owncloud/apps/federatedfilesharing/l10n/cs_CZ.js +share/owncloud/apps/federatedfilesharing/l10n/cs_CZ.json +share/owncloud/apps/federatedfilesharing/l10n/da.js +share/owncloud/apps/federatedfilesharing/l10n/da.json +share/owncloud/apps/federatedfilesharing/l10n/de.js +share/owncloud/apps/federatedfilesharing/l10n/de.json +share/owncloud/apps/federatedfilesharing/l10n/de_DE.js +share/owncloud/apps/federatedfilesharing/l10n/de_DE.json +share/owncloud/apps/federatedfilesharing/l10n/el.js +share/owncloud/apps/federatedfilesharing/l10n/el.json +share/owncloud/apps/federatedfilesharing/l10n/en_GB.js +share/owncloud/apps/federatedfilesharing/l10n/en_GB.json +share/owncloud/apps/federatedfilesharing/l10n/eo.js +share/owncloud/apps/federatedfilesharing/l10n/eo.json +share/owncloud/apps/federatedfilesharing/l10n/es.js +share/owncloud/apps/federatedfilesharing/l10n/es.json +share/owncloud/apps/federatedfilesharing/l10n/et_EE.js +share/owncloud/apps/federatedfilesharing/l10n/et_EE.json +share/owncloud/apps/federatedfilesharing/l10n/eu.js +share/owncloud/apps/federatedfilesharing/l10n/eu.json +share/owncloud/apps/federatedfilesharing/l10n/fi_FI.js +share/owncloud/apps/federatedfilesharing/l10n/fi_FI.json +share/owncloud/apps/federatedfilesharing/l10n/fr.js +share/owncloud/apps/federatedfilesharing/l10n/fr.json +share/owncloud/apps/federatedfilesharing/l10n/gl.js +share/owncloud/apps/federatedfilesharing/l10n/gl.json +share/owncloud/apps/federatedfilesharing/l10n/he.js +share/owncloud/apps/federatedfilesharing/l10n/he.json +share/owncloud/apps/federatedfilesharing/l10n/hr.js +share/owncloud/apps/federatedfilesharing/l10n/hr.json +share/owncloud/apps/federatedfilesharing/l10n/hu_HU.js +share/owncloud/apps/federatedfilesharing/l10n/hu_HU.json +share/owncloud/apps/federatedfilesharing/l10n/id.js +share/owncloud/apps/federatedfilesharing/l10n/id.json +share/owncloud/apps/federatedfilesharing/l10n/it.js +share/owncloud/apps/federatedfilesharing/l10n/it.json +share/owncloud/apps/federatedfilesharing/l10n/ja.js +share/owncloud/apps/federatedfilesharing/l10n/ja.json +share/owncloud/apps/federatedfilesharing/l10n/ko.js +share/owncloud/apps/federatedfilesharing/l10n/ko.json +share/owncloud/apps/federatedfilesharing/l10n/nb_NO.js +share/owncloud/apps/federatedfilesharing/l10n/nb_NO.json +share/owncloud/apps/federatedfilesharing/l10n/nl.js +share/owncloud/apps/federatedfilesharing/l10n/nl.json +share/owncloud/apps/federatedfilesharing/l10n/oc.js +share/owncloud/apps/federatedfilesharing/l10n/oc.json +share/owncloud/apps/federatedfilesharing/l10n/pl.js +share/owncloud/apps/federatedfilesharing/l10n/pl.json +share/owncloud/apps/federatedfilesharing/l10n/pt_BR.js +share/owncloud/apps/federatedfilesharing/l10n/pt_BR.json +share/owncloud/apps/federatedfilesharing/l10n/pt_PT.js +share/owncloud/apps/federatedfilesharing/l10n/pt_PT.json +share/owncloud/apps/federatedfilesharing/l10n/ru.js +share/owncloud/apps/federatedfilesharing/l10n/ru.json +share/owncloud/apps/federatedfilesharing/l10n/sk_SK.js +share/owncloud/apps/federatedfilesharing/l10n/sk_SK.json +share/owncloud/apps/federatedfilesharing/l10n/sl.js +share/owncloud/apps/federatedfilesharing/l10n/sl.json +share/owncloud/apps/federatedfilesharing/l10n/sq.js +share/owncloud/apps/federatedfilesharing/l10n/sq.json +share/owncloud/apps/federatedfilesharing/l10n/sr.js +share/owncloud/apps/federatedfilesharing/l10n/sr.json +share/owncloud/apps/federatedfilesharing/l10n/sv.js +share/owncloud/apps/federatedfilesharing/l10n/sv.json +share/owncloud/apps/federatedfilesharing/l10n/th_TH.js +share/owncloud/apps/federatedfilesharing/l10n/th_TH.json +share/owncloud/apps/federatedfilesharing/l10n/tr.js +share/owncloud/apps/federatedfilesharing/l10n/tr.json +share/owncloud/apps/federatedfilesharing/l10n/uk.js +share/owncloud/apps/federatedfilesharing/l10n/uk.json +share/owncloud/apps/federatedfilesharing/l10n/zh_CN.js +share/owncloud/apps/federatedfilesharing/l10n/zh_CN.json +share/owncloud/apps/federatedfilesharing/l10n/zh_TW.js +share/owncloud/apps/federatedfilesharing/l10n/zh_TW.json +share/owncloud/apps/federatedfilesharing/lib/addresshandler.php +share/owncloud/apps/federatedfilesharing/lib/discoverymanager.php +share/owncloud/apps/federatedfilesharing/lib/federatedshareprovider.php +share/owncloud/apps/federatedfilesharing/lib/notifications.php +share/owncloud/apps/federatedfilesharing/lib/tokenhandler.php +share/owncloud/apps/federation/api/ocsauthapi.php +share/owncloud/apps/federation/appinfo/app.php +share/owncloud/apps/federation/appinfo/application.php +share/owncloud/apps/federation/appinfo/database.xml +share/owncloud/apps/federation/appinfo/info.xml +share/owncloud/apps/federation/appinfo/install.php +share/owncloud/apps/federation/appinfo/register_command.php +share/owncloud/apps/federation/appinfo/routes.php +share/owncloud/apps/federation/appinfo/signature.json +share/owncloud/apps/federation/appinfo/update.php +share/owncloud/apps/federation/backgroundjob/getsharedsecret.php +share/owncloud/apps/federation/backgroundjob/requestsharedsecret.php +share/owncloud/apps/federation/command/syncfederationaddressbooks.php +share/owncloud/apps/federation/controller/settingscontroller.php +share/owncloud/apps/federation/css/settings-admin.css +share/owncloud/apps/federation/dav/fedauth.php +share/owncloud/apps/federation/img/app.svg +share/owncloud/apps/federation/js/settings-admin.js +share/owncloud/apps/federation/l10n/cs_CZ.js +share/owncloud/apps/federation/l10n/cs_CZ.json +share/owncloud/apps/federation/l10n/de.js +share/owncloud/apps/federation/l10n/de.json +share/owncloud/apps/federation/l10n/de_DE.js +share/owncloud/apps/federation/l10n/de_DE.json +share/owncloud/apps/federation/l10n/el.js +share/owncloud/apps/federation/l10n/el.json +share/owncloud/apps/federation/l10n/en_GB.js +share/owncloud/apps/federation/l10n/en_GB.json +share/owncloud/apps/federation/l10n/eo.js +share/owncloud/apps/federation/l10n/eo.json +share/owncloud/apps/federation/l10n/es.js +share/owncloud/apps/federation/l10n/es.json +share/owncloud/apps/federation/l10n/et_EE.js +share/owncloud/apps/federation/l10n/et_EE.json +share/owncloud/apps/federation/l10n/fi_FI.js +share/owncloud/apps/federation/l10n/fi_FI.json +share/owncloud/apps/federation/l10n/fr.js +share/owncloud/apps/federation/l10n/fr.json +share/owncloud/apps/federation/l10n/he.js +share/owncloud/apps/federation/l10n/he.json +share/owncloud/apps/federation/l10n/it.js +share/owncloud/apps/federation/l10n/it.json +share/owncloud/apps/federation/l10n/ja.js +share/owncloud/apps/federation/l10n/ja.json +share/owncloud/apps/federation/l10n/nb_NO.js +share/owncloud/apps/federation/l10n/nb_NO.json +share/owncloud/apps/federation/l10n/nl.js +share/owncloud/apps/federation/l10n/nl.json +share/owncloud/apps/federation/l10n/pt_BR.js +share/owncloud/apps/federation/l10n/pt_BR.json +share/owncloud/apps/federation/l10n/pt_PT.js +share/owncloud/apps/federation/l10n/pt_PT.json +share/owncloud/apps/federation/l10n/ru.js +share/owncloud/apps/federation/l10n/ru.json +share/owncloud/apps/federation/l10n/sl.js +share/owncloud/apps/federation/l10n/sl.json +share/owncloud/apps/federation/l10n/sq.js +share/owncloud/apps/federation/l10n/sq.json +share/owncloud/apps/federation/l10n/sv.js +share/owncloud/apps/federation/l10n/sv.json +share/owncloud/apps/federation/l10n/th_TH.js +share/owncloud/apps/federation/l10n/th_TH.json +share/owncloud/apps/federation/l10n/uk.js +share/owncloud/apps/federation/l10n/uk.json +share/owncloud/apps/federation/l10n/zh_CN.js +share/owncloud/apps/federation/l10n/zh_CN.json +share/owncloud/apps/federation/lib/dbhandler.php +share/owncloud/apps/federation/lib/hooks.php +share/owncloud/apps/federation/lib/syncfederationaddressbooks.php +share/owncloud/apps/federation/lib/syncjob.php +share/owncloud/apps/federation/lib/trustedservers.php +share/owncloud/apps/federation/middleware/addservermiddleware.php +share/owncloud/apps/federation/settings/settings-admin.php +share/owncloud/apps/federation/templates/settings-admin.php share/owncloud/apps/files/admin.php -share/owncloud/apps/files/ajax/delete.php share/owncloud/apps/files/ajax/download.php share/owncloud/apps/files/ajax/getstoragestats.php share/owncloud/apps/files/ajax/list.php -share/owncloud/apps/files/ajax/move.php -share/owncloud/apps/files/ajax/newfile.php -share/owncloud/apps/files/ajax/newfolder.php -share/owncloud/apps/files/ajax/rename.php -share/owncloud/apps/files/ajax/scan.php share/owncloud/apps/files/ajax/upload.php share/owncloud/apps/files/appinfo/app.php share/owncloud/apps/files/appinfo/application.php share/owncloud/apps/files/appinfo/info.xml +share/owncloud/apps/files/appinfo/install.php share/owncloud/apps/files/appinfo/register_command.php -share/owncloud/apps/files/appinfo/remote.php share/owncloud/apps/files/appinfo/routes.php +share/owncloud/apps/files/appinfo/signature.json share/owncloud/apps/files/appinfo/update.php share/owncloud/apps/files/command/deleteorphanedfiles.php share/owncloud/apps/files/command/scan.php +share/owncloud/apps/files/command/transferownership.php share/owncloud/apps/files/controller/apicontroller.php +share/owncloud/apps/files/controller/viewcontroller.php share/owncloud/apps/files/css/detailsView.css share/owncloud/apps/files/css/files.css share/owncloud/apps/files/css/mobile.css @@ -4167,7 +4647,6 @@ share/owncloud/apps/files/img/share.png share/owncloud/apps/files/img/share.svg share/owncloud/apps/files/img/star.png share/owncloud/apps/files/img/star.svg -share/owncloud/apps/files/index.php share/owncloud/apps/files/js/admin.js share/owncloud/apps/files/js/app.js share/owncloud/apps/files/js/breadcrumb.js @@ -4411,6 +4890,9 @@ share/owncloud/apps/files/l10n/zh_TW.json share/owncloud/apps/files/lib/activity.php share/owncloud/apps/files/lib/activityhelper.php share/owncloud/apps/files/lib/app.php +share/owncloud/apps/files/lib/backgroundjob/cleanupfilelocks.php +share/owncloud/apps/files/lib/backgroundjob/deleteorphaneditems.php +share/owncloud/apps/files/lib/backgroundjob/scanfiles.php share/owncloud/apps/files/lib/capabilities.php share/owncloud/apps/files/lib/helper.php share/owncloud/apps/files/list.php @@ -4423,26 +4905,7 @@ share/owncloud/apps/files/templates/index.php share/owncloud/apps/files/templates/list.php share/owncloud/apps/files/templates/simplelist.php share/owncloud/apps/files/templates/test.png -share/owncloud/apps/files/tests/activitytest.php -share/owncloud/apps/files/tests/ajax_rename.php -share/owncloud/apps/files/tests/command/deleteorphanedfilestest.php -share/owncloud/apps/files/tests/controller/apicontrollertest.php -share/owncloud/apps/files/tests/helper.php -share/owncloud/apps/files/tests/js/appSpec.js -share/owncloud/apps/files/tests/js/breadcrumbSpec.js -share/owncloud/apps/files/tests/js/detailsviewSpec.js -share/owncloud/apps/files/tests/js/favoritesfilelistspec.js -share/owncloud/apps/files/tests/js/favoritespluginspec.js -share/owncloud/apps/files/tests/js/fileUploadSpec.js -share/owncloud/apps/files/tests/js/fileactionsSpec.js -share/owncloud/apps/files/tests/js/fileactionsmenuSpec.js -share/owncloud/apps/files/tests/js/filelistSpec.js -share/owncloud/apps/files/tests/js/filesSpec.js -share/owncloud/apps/files/tests/js/filesummarySpec.js -share/owncloud/apps/files/tests/js/mainfileinfodetailviewSpec.js -share/owncloud/apps/files/tests/js/newfilemenuSpec.js -share/owncloud/apps/files/tests/js/tagspluginspec.js -share/owncloud/apps/files/tests/service/tagservice.php +share/owncloud/apps/files_external/3rdparty/.gitignore share/owncloud/apps/files_external/3rdparty/Dropbox/API.php share/owncloud/apps/files_external/3rdparty/Dropbox/Exception.php share/owncloud/apps/files_external/3rdparty/Dropbox/Exception/Forbidden.php @@ -4794,6 +5257,7 @@ share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/ChunkedI share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/FilterIterator.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/MapIterator.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/MethodProxyIterator.php +share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/README.md share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Iterator/composer.json share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/AbstractLogAdapter.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Log/ArrayLogAdapter.php @@ -4948,6 +5412,7 @@ share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/Stream.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/StreamInterface.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/StreamRequestFactoryInterface.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Guzzle/Stream/composer.json +share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/.gitignore share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ApcClassLoader.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/CHANGELOG.md @@ -4959,6 +5424,7 @@ share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassL share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/LICENSE share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/MapClassLoader.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Psr4ClassLoader.php +share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/README.md share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php @@ -5044,6 +5510,7 @@ share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassL share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/XcacheClassLoader.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/composer.json share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/ClassLoader/phpunit.xml.dist +share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/.gitignore share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/CHANGELOG.md share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php @@ -5057,6 +5524,7 @@ share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventD share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/GenericEvent.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/LICENSE +share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/README.md share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/ContainerAwareEventDispatcherTest.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php share/owncloud/apps/files_external/3rdparty/aws-sdk-php/Symfony/Component/EventDispatcher/Tests/DependencyInjection/RegisterListenersPassTest.php @@ -5070,12 +5538,14 @@ share/owncloud/apps/files_external/3rdparty/aws-sdk-php/aws-autoloader.php share/owncloud/apps/files_external/3rdparty/composer.json share/owncloud/apps/files_external/3rdparty/composer.lock share/owncloud/apps/files_external/3rdparty/composer/ClassLoader.php +share/owncloud/apps/files_external/3rdparty/composer/LICENSE share/owncloud/apps/files_external/3rdparty/composer/autoload_classmap.php share/owncloud/apps/files_external/3rdparty/composer/autoload_namespaces.php share/owncloud/apps/files_external/3rdparty/composer/autoload_psr4.php share/owncloud/apps/files_external/3rdparty/composer/autoload_real.php share/owncloud/apps/files_external/3rdparty/composer/installed.json share/owncloud/apps/files_external/3rdparty/google-api-php-client/LICENSE +share/owncloud/apps/files_external/3rdparty/google-api-php-client/README.md share/owncloud/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Abstract.php share/owncloud/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/AssertionCredentials.php share/owncloud/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Exception.php @@ -5112,7 +5582,9 @@ share/owncloud/apps/files_external/3rdparty/google-api-php-client/src/Google/Uti share/owncloud/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php share/owncloud/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Abstract.php share/owncloud/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Pem.php +share/owncloud/apps/files_external/3rdparty/icewind/smb/.gitignore share/owncloud/apps/files_external/3rdparty/icewind/smb/LICENSE.txt +share/owncloud/apps/files_external/3rdparty/icewind/smb/README.md share/owncloud/apps/files_external/3rdparty/icewind/smb/composer.json share/owncloud/apps/files_external/3rdparty/icewind/smb/src/AbstractShare.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Connection.php @@ -5130,6 +5602,7 @@ share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Exception/HostDownEx share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidHostException.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidPathException.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidRequestException.php +share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidResourceException.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Exception/InvalidTypeException.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Exception/NoLoginServerException.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Exception/NoRouteToHostException.php @@ -5148,7 +5621,11 @@ share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Parser.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/RawConnection.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Server.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/Share.php +share/owncloud/apps/files_external/3rdparty/icewind/smb/src/System.php share/owncloud/apps/files_external/3rdparty/icewind/smb/src/TimeZoneProvider.php +share/owncloud/apps/files_external/3rdparty/icewind/streams/.gitignore +share/owncloud/apps/files_external/3rdparty/icewind/streams/.travis.yml +share/owncloud/apps/files_external/3rdparty/icewind/streams/README.md share/owncloud/apps/files_external/3rdparty/icewind/streams/composer.json share/owncloud/apps/files_external/3rdparty/icewind/streams/src/CallbackWrapper.php share/owncloud/apps/files_external/3rdparty/icewind/streams/src/Directory.php @@ -5167,12 +5644,28 @@ share/owncloud/apps/files_external/ajax/oauth1.php share/owncloud/apps/files_external/ajax/oauth2.php share/owncloud/apps/files_external/appinfo/app.php share/owncloud/apps/files_external/appinfo/application.php +share/owncloud/apps/files_external/appinfo/database.xml share/owncloud/apps/files_external/appinfo/info.xml +share/owncloud/apps/files_external/appinfo/register_command.php share/owncloud/apps/files_external/appinfo/routes.php +share/owncloud/apps/files_external/appinfo/signature.json +share/owncloud/apps/files_external/appinfo/update.php +share/owncloud/apps/files_external/command/applicable.php +share/owncloud/apps/files_external/command/backends.php +share/owncloud/apps/files_external/command/config.php +share/owncloud/apps/files_external/command/create.php +share/owncloud/apps/files_external/command/delete.php +share/owncloud/apps/files_external/command/export.php +share/owncloud/apps/files_external/command/import.php +share/owncloud/apps/files_external/command/listcommand.php +share/owncloud/apps/files_external/command/option.php +share/owncloud/apps/files_external/command/verify.php share/owncloud/apps/files_external/controller/ajaxcontroller.php share/owncloud/apps/files_external/controller/globalstoragescontroller.php share/owncloud/apps/files_external/controller/storagescontroller.php +share/owncloud/apps/files_external/controller/userglobalstoragescontroller.php share/owncloud/apps/files_external/controller/userstoragescontroller.php +share/owncloud/apps/files_external/css/external.css share/owncloud/apps/files_external/css/settings.css share/owncloud/apps/files_external/img/app.svg share/owncloud/apps/files_external/js/app.js @@ -5180,7 +5673,9 @@ share/owncloud/apps/files_external/js/mountsfilelist.js share/owncloud/apps/files_external/js/oauth1.js share/owncloud/apps/files_external/js/oauth2.js share/owncloud/apps/files_external/js/public_key.js +share/owncloud/apps/files_external/js/rollingqueue.js share/owncloud/apps/files_external/js/settings.js +share/owncloud/apps/files_external/js/statusmanager.js share/owncloud/apps/files_external/l10n/af_ZA.js share/owncloud/apps/files_external/l10n/af_ZA.json share/owncloud/apps/files_external/l10n/ar.js @@ -5348,6 +5843,7 @@ share/owncloud/apps/files_external/lib/api.php share/owncloud/apps/files_external/lib/auth/amazons3/accesskey.php share/owncloud/apps/files_external/lib/auth/authmechanism.php share/owncloud/apps/files_external/lib/auth/builtin.php +share/owncloud/apps/files_external/lib/auth/iuserprovided.php share/owncloud/apps/files_external/lib/auth/nullmechanism.php share/owncloud/apps/files_external/lib/auth/oauth1/oauth1.php share/owncloud/apps/files_external/lib/auth/oauth2/oauth2.php @@ -5375,7 +5871,7 @@ share/owncloud/apps/files_external/lib/config/configadapter.php share/owncloud/apps/files_external/lib/definitionparameter.php share/owncloud/apps/files_external/lib/dependencytrait.php share/owncloud/apps/files_external/lib/dropbox.php -share/owncloud/apps/files_external/lib/etagpropagator.php +share/owncloud/apps/files_external/lib/failedcache.php share/owncloud/apps/files_external/lib/failedstorage.php share/owncloud/apps/files_external/lib/frontenddefinitiontrait.php share/owncloud/apps/files_external/lib/ftp.php @@ -5397,65 +5893,27 @@ share/owncloud/apps/files_external/lib/streamwrapper.php share/owncloud/apps/files_external/lib/swift.php share/owncloud/apps/files_external/lib/visibilitytrait.php share/owncloud/apps/files_external/list.php +share/owncloud/apps/files_external/migration/dummyusersession.php +share/owncloud/apps/files_external/migration/storagemigrator.php share/owncloud/apps/files_external/personal.php share/owncloud/apps/files_external/service/backendservice.php +share/owncloud/apps/files_external/service/dbconfigservice.php +share/owncloud/apps/files_external/service/globallegacystoragesservice.php share/owncloud/apps/files_external/service/globalstoragesservice.php +share/owncloud/apps/files_external/service/importlegacystoragesservice.php +share/owncloud/apps/files_external/service/legacystoragesservice.php share/owncloud/apps/files_external/service/storagesservice.php share/owncloud/apps/files_external/service/userglobalstoragesservice.php +share/owncloud/apps/files_external/service/userlegacystoragesservice.php share/owncloud/apps/files_external/service/userstoragesservice.php share/owncloud/apps/files_external/service/usertrait.php share/owncloud/apps/files_external/settings.php share/owncloud/apps/files_external/templates/list.php share/owncloud/apps/files_external/templates/settings.php -share/owncloud/apps/files_external/tests/amazons3migration.php -share/owncloud/apps/files_external/tests/appSpec.js -share/owncloud/apps/files_external/tests/auth/authmechanismtest.php -share/owncloud/apps/files_external/tests/backend/backendtest.php -share/owncloud/apps/files_external/tests/backend/legacybackendtest.php -share/owncloud/apps/files_external/tests/backends/amazons3.php -share/owncloud/apps/files_external/tests/backends/dropbox.php -share/owncloud/apps/files_external/tests/backends/ftp.php -share/owncloud/apps/files_external/tests/backends/google.php -share/owncloud/apps/files_external/tests/backends/owncloud.php -share/owncloud/apps/files_external/tests/backends/sftp.php -share/owncloud/apps/files_external/tests/backends/sftp_key.php -share/owncloud/apps/files_external/tests/backends/smb.php -share/owncloud/apps/files_external/tests/backends/swift.php -share/owncloud/apps/files_external/tests/backends/webdav.php -share/owncloud/apps/files_external/tests/config.php -share/owncloud/apps/files_external/tests/controller/globalstoragescontrollertest.php -share/owncloud/apps/files_external/tests/controller/storagescontrollertest.php -share/owncloud/apps/files_external/tests/controller/userstoragescontrollertest.php -share/owncloud/apps/files_external/tests/definitionparameterttest.php -share/owncloud/apps/files_external/tests/env/start-amazons3-ceph.sh -share/owncloud/apps/files_external/tests/env/start-ftp-morrisjobke.sh -share/owncloud/apps/files_external/tests/env/start-sftp-atmoz.sh -share/owncloud/apps/files_external/tests/env/start-smb-silvershell.sh -share/owncloud/apps/files_external/tests/env/start-smb-windows.sh -share/owncloud/apps/files_external/tests/env/start-webdav-ownCloud.sh -share/owncloud/apps/files_external/tests/env/stop-amazons3-ceph.sh -share/owncloud/apps/files_external/tests/env/stop-ftp-morrisjobke.sh -share/owncloud/apps/files_external/tests/env/stop-sftp-atmoz.sh -share/owncloud/apps/files_external/tests/env/stop-smb-silvershell.sh -share/owncloud/apps/files_external/tests/env/stop-smb-windows.sh -share/owncloud/apps/files_external/tests/env/stop-webdav-ownCloud.sh -share/owncloud/apps/files_external/tests/etagpropagator.php -share/owncloud/apps/files_external/tests/frontenddefinitiontraittest.php -share/owncloud/apps/files_external/tests/js/mountsfilelistSpec.js -share/owncloud/apps/files_external/tests/js/settingsSpec.js -share/owncloud/apps/files_external/tests/legacydependencycheckpolyfilltest.php -share/owncloud/apps/files_external/tests/owncloudfunctions.php -share/owncloud/apps/files_external/tests/personalmounttest.php -share/owncloud/apps/files_external/tests/service/backendservicetest.php -share/owncloud/apps/files_external/tests/service/globalstoragesservicetest.php -share/owncloud/apps/files_external/tests/service/storagesservicetest.php -share/owncloud/apps/files_external/tests/service/userglobalstoragesservicetest.php -share/owncloud/apps/files_external/tests/service/userstoragesservicetest.php -share/owncloud/apps/files_external/tests/storageconfigtest.php -share/owncloud/apps/files_pdfviewer/CONTRIBUTING.md share/owncloud/apps/files_pdfviewer/appinfo/app.php share/owncloud/apps/files_pdfviewer/appinfo/info.xml share/owncloud/apps/files_pdfviewer/appinfo/routes.php +share/owncloud/apps/files_pdfviewer/appinfo/signature.json share/owncloud/apps/files_pdfviewer/appinfo/version share/owncloud/apps/files_pdfviewer/controller/displaycontroller.php share/owncloud/apps/files_pdfviewer/css/style.css @@ -5466,9 +5924,6 @@ share/owncloud/apps/files_pdfviewer/img/toolbarButton-secondaryToolbarClose.svg share/owncloud/apps/files_pdfviewer/js/previewplugin.js share/owncloud/apps/files_pdfviewer/js/workersrc.js share/owncloud/apps/files_pdfviewer/templates/viewer.php -share/owncloud/apps/files_pdfviewer/tests/bootstrap.php -share/owncloud/apps/files_pdfviewer/tests/phpunit.xml -share/owncloud/apps/files_pdfviewer/tests/unit/controller/displaycontrollertest.php share/owncloud/apps/files_pdfviewer/vendor/pdfjs/LICENSE share/owncloud/apps/files_pdfviewer/vendor/pdfjs/build/pdf.js share/owncloud/apps/files_pdfviewer/vendor/pdfjs/build/pdf.worker.js @@ -5642,7 +6097,6 @@ share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/UniKS-UTF8-V.bcmap share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/V.bcmap share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/cmaps/WP-Symbol.bcmap share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/compatibility.js -share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/compressed.tracemonkey-pldi-09.pdf share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/debugger.js share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/annotation-check.svg share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/annotation-comment.svg @@ -5665,6 +6119,7 @@ share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/grab.cur share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/grabbing.cur share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/loading-icon.gif share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/loading-small.png +share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/loading-small@2x.png share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/secondaryToolbarButton-documentProperties.png share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/secondaryToolbarButton-documentProperties@2x.png share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/secondaryToolbarButton-firstPage.png @@ -5721,6 +6176,12 @@ share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/toolbarButton-zoomIn share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/toolbarButton-zoomIn@2x.png share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/toolbarButton-zoomOut.png share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/toolbarButton-zoomOut@2x.png +share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/treeitem-collapsed-rtl.png +share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/treeitem-collapsed-rtl@2x.png +share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/treeitem-collapsed.png +share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/treeitem-collapsed@2x.png +share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/treeitem-expanded.png +share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/images/treeitem-expanded@2x.png share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/l10n.js share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/locale/ach/viewer.properties share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/locale/af/viewer.properties @@ -5830,12 +6291,13 @@ share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/locale/zu/viewer.properties share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/viewer.css share/owncloud/apps/files_pdfviewer/vendor/pdfjs/web/viewer.js share/owncloud/apps/files_sharing/ajax/external.php -share/owncloud/apps/files_sharing/ajax/list.php share/owncloud/apps/files_sharing/ajax/publicpreview.php share/owncloud/apps/files_sharing/ajax/shareinfo.php share/owncloud/apps/files_sharing/api/local.php +share/owncloud/apps/files_sharing/api/ocssharewrapper.php share/owncloud/apps/files_sharing/api/remote.php share/owncloud/apps/files_sharing/api/server2server.php +share/owncloud/apps/files_sharing/api/share20ocs.php share/owncloud/apps/files_sharing/api/sharees.php share/owncloud/apps/files_sharing/appinfo/app.php share/owncloud/apps/files_sharing/appinfo/application.php @@ -5843,6 +6305,7 @@ share/owncloud/apps/files_sharing/appinfo/database.xml share/owncloud/apps/files_sharing/appinfo/info.xml share/owncloud/apps/files_sharing/appinfo/install.php share/owncloud/apps/files_sharing/appinfo/routes.php +share/owncloud/apps/files_sharing/appinfo/signature.json share/owncloud/apps/files_sharing/appinfo/update.php share/owncloud/apps/files_sharing/css/3rdparty/gs-share/style.css share/owncloud/apps/files_sharing/css/404.css @@ -6038,12 +6501,12 @@ share/owncloud/apps/files_sharing/l10n/zh_TW.json share/owncloud/apps/files_sharing/lib/activity.php share/owncloud/apps/files_sharing/lib/cache.php share/owncloud/apps/files_sharing/lib/capabilities.php -share/owncloud/apps/files_sharing/lib/connector/publicauth.php share/owncloud/apps/files_sharing/lib/controllers/externalsharescontroller.php share/owncloud/apps/files_sharing/lib/controllers/sharecontroller.php share/owncloud/apps/files_sharing/lib/deleteorphanedsharesjob.php share/owncloud/apps/files_sharing/lib/exceptions/brokenpath.php share/owncloud/apps/files_sharing/lib/exceptions/s2sexception.php +share/owncloud/apps/files_sharing/lib/expiresharesjob.php share/owncloud/apps/files_sharing/lib/external/cache.php share/owncloud/apps/files_sharing/lib/external/manager.php share/owncloud/apps/files_sharing/lib/external/mount.php @@ -6058,20 +6521,15 @@ share/owncloud/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php share/owncloud/apps/files_sharing/lib/migration.php share/owncloud/apps/files_sharing/lib/mountprovider.php share/owncloud/apps/files_sharing/lib/notifier.php -share/owncloud/apps/files_sharing/lib/propagation/changewatcher.php -share/owncloud/apps/files_sharing/lib/propagation/grouppropagationmanager.php -share/owncloud/apps/files_sharing/lib/propagation/propagationmanager.php -share/owncloud/apps/files_sharing/lib/propagation/recipientpropagator.php share/owncloud/apps/files_sharing/lib/scanner.php share/owncloud/apps/files_sharing/lib/share/file.php share/owncloud/apps/files_sharing/lib/share/folder.php share/owncloud/apps/files_sharing/lib/sharedmount.php +share/owncloud/apps/files_sharing/lib/sharedpropagator.php share/owncloud/apps/files_sharing/lib/sharedstorage.php share/owncloud/apps/files_sharing/lib/updater.php -share/owncloud/apps/files_sharing/lib/watcher.php share/owncloud/apps/files_sharing/list.php share/owncloud/apps/files_sharing/public.php -share/owncloud/apps/files_sharing/publicwebdav.php share/owncloud/apps/files_sharing/settings-admin.php share/owncloud/apps/files_sharing/settings-personal.php share/owncloud/apps/files_sharing/templates/authenticate.php @@ -6080,48 +6538,11 @@ share/owncloud/apps/files_sharing/templates/part.404.php share/owncloud/apps/files_sharing/templates/public.php share/owncloud/apps/files_sharing/templates/settings-admin.php share/owncloud/apps/files_sharing/templates/settings-personal.php -share/owncloud/apps/files_sharing/tests/activity.php -share/owncloud/apps/files_sharing/tests/api.php -share/owncloud/apps/files_sharing/tests/api/shareestest.php -share/owncloud/apps/files_sharing/tests/backend.php -share/owncloud/apps/files_sharing/tests/cache.php -share/owncloud/apps/files_sharing/tests/capabilities.php -share/owncloud/apps/files_sharing/tests/controller/externalsharecontroller.php -share/owncloud/apps/files_sharing/tests/controller/sharecontroller.php -share/owncloud/apps/files_sharing/tests/deleteorphanedsharesjobtest.php -share/owncloud/apps/files_sharing/tests/etagpropagation.php -share/owncloud/apps/files_sharing/tests/external/cache.php -share/owncloud/apps/files_sharing/tests/external/managertest.php -share/owncloud/apps/files_sharing/tests/external/scannertest.php -share/owncloud/apps/files_sharing/tests/externalstorage.php -share/owncloud/apps/files_sharing/tests/groupetagpropagation.php -share/owncloud/apps/files_sharing/tests/grouppropagationmanager.php -share/owncloud/apps/files_sharing/tests/helper.php -share/owncloud/apps/files_sharing/tests/js/appSpec.js -share/owncloud/apps/files_sharing/tests/js/externalSpec.js -share/owncloud/apps/files_sharing/tests/js/publicAppSpec.js -share/owncloud/apps/files_sharing/tests/js/shareSpec.js -share/owncloud/apps/files_sharing/tests/js/sharedfilelistSpec.js -share/owncloud/apps/files_sharing/tests/locking.php -share/owncloud/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php -share/owncloud/apps/files_sharing/tests/migrationtest.php -share/owncloud/apps/files_sharing/tests/permissions.php -share/owncloud/apps/files_sharing/tests/propagationtestcase.php -share/owncloud/apps/files_sharing/tests/server2server.php -share/owncloud/apps/files_sharing/tests/share.php -share/owncloud/apps/files_sharing/tests/sharedmount.php -share/owncloud/apps/files_sharing/tests/sharedstorage.php -share/owncloud/apps/files_sharing/tests/sizepropagation.php -share/owncloud/apps/files_sharing/tests/testcase.php -share/owncloud/apps/files_sharing/tests/unsharechildren.php -share/owncloud/apps/files_sharing/tests/updater.php -share/owncloud/apps/files_sharing/tests/watcher.php -share/owncloud/apps/files_texteditor/CONTRIBUTING.md share/owncloud/apps/files_texteditor/appinfo/app.php share/owncloud/apps/files_texteditor/appinfo/application.php share/owncloud/apps/files_texteditor/appinfo/info.xml share/owncloud/apps/files_texteditor/appinfo/routes.php -share/owncloud/apps/files_texteditor/appinfo/version +share/owncloud/apps/files_texteditor/appinfo/signature.json share/owncloud/apps/files_texteditor/controller/filehandlingcontroller.php share/owncloud/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot share/owncloud/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg @@ -6135,21 +6556,7 @@ share/owncloud/apps/files_texteditor/img/app.png share/owncloud/apps/files_texteditor/img/app.svg share/owncloud/apps/files_texteditor/js/editor.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ace.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-elastic_tabstops_lite.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-emmet.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-keybinding_menu.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-language_tools.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-modelist.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-options.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-searchbox.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-settings_menu.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-spellcheck.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-split.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-static_highlight.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-statusbar.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-textarea.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-themelist.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/ext-whitespace.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/keybinding-emacs.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/keybinding-vim.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-abap.js @@ -6238,7 +6645,6 @@ share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-stylus.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-svg.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-tcl.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-tex.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-text.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-textile.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-tmsnippet.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/mode-toml.js @@ -6347,43 +6753,8 @@ share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/snippets/veril share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/snippets/xml.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/snippets/xquery.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/snippets/yaml.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-ambiance.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-chaos.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-chrome.js share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-clouds.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-clouds_midnight.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-cobalt.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-crimson_editor.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-dawn.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-dreamweaver.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-eclipse.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-github.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-idle_fingers.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-kr.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-merbivore.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-merbivore_soft.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-mono_industrial.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-monokai.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-pastel_on_dark.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-solarized_dark.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-solarized_light.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-terminal.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-textmate.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-tomorrow.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-tomorrow_night.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-tomorrow_night_blue.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-tomorrow_night_bright.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-tomorrow_night_eighties.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-twilight.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-vibrant_ink.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/theme-xcode.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/worker-coffee.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/worker-css.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/worker-javascript.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/worker-json.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/worker-lua.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/worker-php.js -share/owncloud/apps/files_texteditor/js/vendor/ace/src-noconflict/worker-xquery.js +share/owncloud/apps/files_texteditor/l10n/.tx/config share/owncloud/apps/files_texteditor/l10n/ar.php share/owncloud/apps/files_texteditor/l10n/az.js share/owncloud/apps/files_texteditor/l10n/az.json @@ -6441,6 +6812,8 @@ share/owncloud/apps/files_texteditor/l10n/fr.php share/owncloud/apps/files_texteditor/l10n/gl.js share/owncloud/apps/files_texteditor/l10n/gl.json share/owncloud/apps/files_texteditor/l10n/gl.php +share/owncloud/apps/files_texteditor/l10n/he.js +share/owncloud/apps/files_texteditor/l10n/he.json share/owncloud/apps/files_texteditor/l10n/he.php share/owncloud/apps/files_texteditor/l10n/hi.php share/owncloud/apps/files_texteditor/l10n/hr.php @@ -6508,6 +6881,8 @@ share/owncloud/apps/files_texteditor/l10n/sk_SK.php share/owncloud/apps/files_texteditor/l10n/sl.js share/owncloud/apps/files_texteditor/l10n/sl.json share/owncloud/apps/files_texteditor/l10n/sl.php +share/owncloud/apps/files_texteditor/l10n/sq.js +share/owncloud/apps/files_texteditor/l10n/sq.json share/owncloud/apps/files_texteditor/l10n/sq.php share/owncloud/apps/files_texteditor/l10n/sr.js share/owncloud/apps/files_texteditor/l10n/sr.json @@ -6515,6 +6890,8 @@ share/owncloud/apps/files_texteditor/l10n/sr.php share/owncloud/apps/files_texteditor/l10n/sr@latin.js share/owncloud/apps/files_texteditor/l10n/sr@latin.json share/owncloud/apps/files_texteditor/l10n/sr@latin.php +share/owncloud/apps/files_texteditor/l10n/sv.js +share/owncloud/apps/files_texteditor/l10n/sv.json share/owncloud/apps/files_texteditor/l10n/sv.php share/owncloud/apps/files_texteditor/l10n/ta_LK.php share/owncloud/apps/files_texteditor/l10n/te.php @@ -6535,10 +6912,9 @@ share/owncloud/apps/files_texteditor/l10n/zh_CN.js share/owncloud/apps/files_texteditor/l10n/zh_CN.json share/owncloud/apps/files_texteditor/l10n/zh_CN.php share/owncloud/apps/files_texteditor/l10n/zh_HK.php +share/owncloud/apps/files_texteditor/l10n/zh_TW.js +share/owncloud/apps/files_texteditor/l10n/zh_TW.json share/owncloud/apps/files_texteditor/l10n/zh_TW.php -share/owncloud/apps/files_texteditor/tests/bootstrap.php -share/owncloud/apps/files_texteditor/tests/controller/filehandlingcontrollertest.php -share/owncloud/apps/files_texteditor/tests/phpunit.xml share/owncloud/apps/files_trashbin/ajax/delete.php share/owncloud/apps/files_trashbin/ajax/isEmpty.php share/owncloud/apps/files_trashbin/ajax/list.php @@ -6551,6 +6927,7 @@ share/owncloud/apps/files_trashbin/appinfo/info.xml share/owncloud/apps/files_trashbin/appinfo/install.php share/owncloud/apps/files_trashbin/appinfo/register_command.php share/owncloud/apps/files_trashbin/appinfo/routes.php +share/owncloud/apps/files_trashbin/appinfo/signature.json share/owncloud/apps/files_trashbin/appinfo/update.php share/owncloud/apps/files_trashbin/command/cleanup.php share/owncloud/apps/files_trashbin/command/expire.php @@ -6724,14 +7101,6 @@ share/owncloud/apps/files_trashbin/lib/storage.php share/owncloud/apps/files_trashbin/lib/trashbin.php share/owncloud/apps/files_trashbin/list.php share/owncloud/apps/files_trashbin/templates/index.php -share/owncloud/apps/files_trashbin/tests/backgroundjob/expiretrash.php -share/owncloud/apps/files_trashbin/tests/command/cleanuptest.php -share/owncloud/apps/files_trashbin/tests/command/expiretest.php -share/owncloud/apps/files_trashbin/tests/expiration.php -share/owncloud/apps/files_trashbin/tests/js/appSpec.js -share/owncloud/apps/files_trashbin/tests/js/filelistSpec.js -share/owncloud/apps/files_trashbin/tests/storage.php -share/owncloud/apps/files_trashbin/tests/trashbin.php share/owncloud/apps/files_versions/ajax/getVersions.php share/owncloud/apps/files_versions/ajax/preview.php share/owncloud/apps/files_versions/ajax/rollbackVersion.php @@ -6741,6 +7110,7 @@ share/owncloud/apps/files_versions/appinfo/info.xml share/owncloud/apps/files_versions/appinfo/install.php share/owncloud/apps/files_versions/appinfo/register_command.php share/owncloud/apps/files_versions/appinfo/routes.php +share/owncloud/apps/files_versions/appinfo/signature.json share/owncloud/apps/files_versions/appinfo/update.php share/owncloud/apps/files_versions/command/cleanup.php share/owncloud/apps/files_versions/command/expire.php @@ -6894,58 +7264,47 @@ share/owncloud/apps/files_versions/lib/capabilities.php share/owncloud/apps/files_versions/lib/expiration.php share/owncloud/apps/files_versions/lib/hooks.php share/owncloud/apps/files_versions/lib/storage.php -share/owncloud/apps/files_versions/tests/command/cleanuptest.php -share/owncloud/apps/files_versions/tests/command/expiretest.php -share/owncloud/apps/files_versions/tests/expirationtest.php -share/owncloud/apps/files_versions/tests/js/versioncollectionSpec.js -share/owncloud/apps/files_versions/tests/js/versionmodelSpec.js -share/owncloud/apps/files_versions/tests/js/versionstabviewSpec.js -share/owncloud/apps/files_versions/tests/versions.php -share/owncloud/apps/files_videoviewer/appinfo/app.php -share/owncloud/apps/files_videoviewer/appinfo/info.xml -share/owncloud/apps/files_videoviewer/appinfo/version -share/owncloud/apps/files_videoviewer/css/mediaelementplayer.css -share/owncloud/apps/files_videoviewer/css/style.css -share/owncloud/apps/files_videoviewer/img/app.png -share/owncloud/apps/files_videoviewer/img/app.svg -share/owncloud/apps/files_videoviewer/img/close.png -share/owncloud/apps/files_videoviewer/img/skin/background.png -share/owncloud/apps/files_videoviewer/img/skin/bigplay.png -share/owncloud/apps/files_videoviewer/img/skin/bigplay.svg -share/owncloud/apps/files_videoviewer/img/skin/controls-ted.png -share/owncloud/apps/files_videoviewer/img/skin/controls-wmp-bg.png -share/owncloud/apps/files_videoviewer/img/skin/controls-wmp.png -share/owncloud/apps/files_videoviewer/img/skin/controls.png -share/owncloud/apps/files_videoviewer/img/skin/controls.svg -share/owncloud/apps/files_videoviewer/img/skin/loading.gif -share/owncloud/apps/files_videoviewer/js/flashmediaelement.swf -share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.js -share/owncloud/apps/files_videoviewer/js/mediaelement-and-player.min.js -share/owncloud/apps/files_videoviewer/js/mep-extra.js -share/owncloud/apps/files_videoviewer/js/silverlightmediaelement.xap -share/owncloud/apps/files_videoviewer/js/viewer.js -share/owncloud/apps/files_videoviewer/src/flash/FlashMediaElement.as -share/owncloud/apps/files_videoviewer/src/flash/FlashMediaElement.fla -share/owncloud/apps/files_videoviewer/src/flash/HtmlMediaEvent.as -share/owncloud/apps/files_videoviewer/src/flash/htmlelements/AudioElement.as -share/owncloud/apps/files_videoviewer/src/flash/htmlelements/IMediaElement.as -share/owncloud/apps/files_videoviewer/src/flash/htmlelements/VideoElement.as -share/owncloud/apps/files_videoviewer/src/flash/htmlelements/YouTubeElement.as -share/owncloud/apps/files_videoviewer/src/silverlight/App.xaml -share/owncloud/apps/files_videoviewer/src/silverlight/App.xaml.cs -share/owncloud/apps/files_videoviewer/src/silverlight/MainPage.xaml -share/owncloud/apps/files_videoviewer/src/silverlight/MainPage.xaml.cs -share/owncloud/apps/files_videoviewer/src/silverlight/Properties/AppManifest.xml -share/owncloud/apps/files_videoviewer/src/silverlight/Properties/AssemblyInfo.cs -share/owncloud/apps/files_videoviewer/src/silverlight/SilverlightMediaElement.csproj -share/owncloud/apps/files_videoviewer/src/silverlight/SilverlightMediaElement.csproj.user -share/owncloud/apps/files_videoviewer/src/silverlight/SilverlightMediaElement.sln -share/owncloud/apps/firstrunwizard/CONTRIBUTING.md +share/owncloud/apps/files_videoplayer/appinfo/app.php +share/owncloud/apps/files_videoplayer/appinfo/info.xml +share/owncloud/apps/files_videoplayer/appinfo/signature.json +share/owncloud/apps/files_videoplayer/css/style.css +share/owncloud/apps/files_videoplayer/img/app.svg +share/owncloud/apps/files_videoplayer/img/poster.png +share/owncloud/apps/files_videoplayer/img/vjs-volume-bar.png +share/owncloud/apps/files_videoplayer/img/vjs-volume-level.png +share/owncloud/apps/files_videoplayer/js/viewer.js +share/owncloud/apps/files_videoplayer/screenshot.jpg +share/owncloud/apps/files_videoplayer/videojs/src/font/vjs.eot +share/owncloud/apps/files_videoplayer/videojs/src/font/vjs.svg +share/owncloud/apps/files_videoplayer/videojs/src/font/vjs.ttf +share/owncloud/apps/files_videoplayer/videojs/src/font/vjs.woff +share/owncloud/apps/files_videoplayer/videojs/src/lang/ar.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/bg.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/ca.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/cs.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/de.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/es.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/fr.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/hu.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/it.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/ja.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/ko.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/nl.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/pt-BR.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/ru.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/tr.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/uk.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/vi.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/zh-CN.js +share/owncloud/apps/files_videoplayer/videojs/src/lang/zh-TW.js +share/owncloud/apps/files_videoplayer/videojs/src/video-js.css +share/owncloud/apps/files_videoplayer/videojs/src/video.js share/owncloud/apps/firstrunwizard/ajax/disable.php share/owncloud/apps/firstrunwizard/ajax/enable.php share/owncloud/apps/firstrunwizard/appinfo/app.php share/owncloud/apps/firstrunwizard/appinfo/info.xml share/owncloud/apps/firstrunwizard/appinfo/routes.php +share/owncloud/apps/firstrunwizard/appinfo/signature.json share/owncloud/apps/firstrunwizard/appinfo/version share/owncloud/apps/firstrunwizard/css/colorbox.css share/owncloud/apps/firstrunwizard/css/firstrunwizard.css @@ -6953,6 +7312,7 @@ share/owncloud/apps/firstrunwizard/img/app.svg share/owncloud/apps/firstrunwizard/js/activate.js share/owncloud/apps/firstrunwizard/js/firstrunwizard.js share/owncloud/apps/firstrunwizard/js/jquery.colorbox.js +share/owncloud/apps/firstrunwizard/l10n/.tx/config share/owncloud/apps/firstrunwizard/l10n/ar.php share/owncloud/apps/firstrunwizard/l10n/ast.js share/owncloud/apps/firstrunwizard/l10n/ast.json @@ -7022,6 +7382,8 @@ share/owncloud/apps/firstrunwizard/l10n/fr.php share/owncloud/apps/firstrunwizard/l10n/gl.js share/owncloud/apps/firstrunwizard/l10n/gl.json share/owncloud/apps/firstrunwizard/l10n/gl.php +share/owncloud/apps/firstrunwizard/l10n/he.js +share/owncloud/apps/firstrunwizard/l10n/he.json share/owncloud/apps/firstrunwizard/l10n/he.php share/owncloud/apps/firstrunwizard/l10n/hr.js share/owncloud/apps/firstrunwizard/l10n/hr.json @@ -7122,30 +7484,30 @@ share/owncloud/apps/firstrunwizard/l10n/zh_TW.php share/owncloud/apps/firstrunwizard/lib/config.php share/owncloud/apps/firstrunwizard/lib/util.php share/owncloud/apps/firstrunwizard/templates/wizard.php -share/owncloud/apps/firstrunwizard/tests/bootstrap.php -share/owncloud/apps/firstrunwizard/tests/lib/configtest.php -share/owncloud/apps/firstrunwizard/tests/lib/utiltest.php -share/owncloud/apps/firstrunwizard/tests/phpunit.xml share/owncloud/apps/firstrunwizard/wizard.php +share/owncloud/apps/gallery/.github/CONTRIBUTING.md +share/owncloud/apps/gallery/.github/issue_template.md +share/owncloud/apps/gallery/.github/pull_request_template.md share/owncloud/apps/gallery/.gitmodules share/owncloud/apps/gallery/AUTHORS.md share/owncloud/apps/gallery/CHANGELOG.md -share/owncloud/apps/gallery/CONTRIBUTING.md share/owncloud/apps/gallery/COPYING share/owncloud/apps/gallery/appinfo/app.php share/owncloud/apps/gallery/appinfo/application.php share/owncloud/apps/gallery/appinfo/info.xml share/owncloud/apps/gallery/appinfo/routes.php +share/owncloud/apps/gallery/appinfo/signature.json share/owncloud/apps/gallery/build/documentation/docpublisher.sh share/owncloud/apps/gallery/build/documentation/index.html -share/owncloud/apps/gallery/build/documentation/reports/code coverage/index.html share/owncloud/apps/gallery/build/documentation/reports/index.html +share/owncloud/apps/gallery/build/screenshots/Gallery.jpg share/owncloud/apps/gallery/build/xdebug_install.sh share/owncloud/apps/gallery/codeception.yml share/owncloud/apps/gallery/composer.json share/owncloud/apps/gallery/composer.lock share/owncloud/apps/gallery/config/configexception.php share/owncloud/apps/gallery/config/configparser.php +share/owncloud/apps/gallery/config/configvalidator.php share/owncloud/apps/gallery/controller/config.php share/owncloud/apps/gallery/controller/configapicontroller.php share/owncloud/apps/gallery/controller/configcontroller.php @@ -7181,8 +7543,6 @@ share/owncloud/apps/gallery/img/dateasc.png share/owncloud/apps/gallery/img/dateasc.svg share/owncloud/apps/gallery/img/datedes.png share/owncloud/apps/gallery/img/datedes.svg -share/owncloud/apps/gallery/img/download.png -share/owncloud/apps/gallery/img/download.svg share/owncloud/apps/gallery/img/folder.png share/owncloud/apps/gallery/img/folder.svg share/owncloud/apps/gallery/img/gallery-dark.png @@ -7194,6 +7554,7 @@ share/owncloud/apps/gallery/img/namedes.svg share/owncloud/apps/gallery/img/toggle.png share/owncloud/apps/gallery/img/toggle.svg share/owncloud/apps/gallery/js/.bowerrc +share/owncloud/apps/gallery/js/.jshintrc share/owncloud/apps/gallery/js/app.js share/owncloud/apps/gallery/js/bower.json share/owncloud/apps/gallery/js/breadcrumb.js @@ -7220,14 +7581,14 @@ share/owncloud/apps/gallery/js/vendor/commonmark/LICENSE share/owncloud/apps/gallery/js/vendor/commonmark/dist/commonmark.js share/owncloud/apps/gallery/js/vendor/commonmark/dist/commonmark.min.js share/owncloud/apps/gallery/js/vendor/dompurify/LICENSE +share/owncloud/apps/gallery/js/vendor/dompurify/README.md share/owncloud/apps/gallery/js/vendor/dompurify/src/purify.js share/owncloud/apps/gallery/js/vendor/eventsource-polyfill/LICENSE +share/owncloud/apps/gallery/js/vendor/eventsource-polyfill/README.md share/owncloud/apps/gallery/js/vendor/eventsource-polyfill/dist/eventsource.js -share/owncloud/apps/gallery/js/vendor/image-scale/LICENSE -share/owncloud/apps/gallery/js/vendor/image-scale/image-scale.js -share/owncloud/apps/gallery/js/vendor/image-scale/image-scale.min.js share/owncloud/apps/gallery/js/vendor/modified-eventsource-polyfill/eventsource-polyfill.js share/owncloud/apps/gallery/js/vendor/owncloud/share.js +share/owncloud/apps/gallery/l10n/.tx/config share/owncloud/apps/gallery/l10n/af_ZA.php share/owncloud/apps/gallery/l10n/ar.js share/owncloud/apps/gallery/l10n/ar.json @@ -7261,12 +7622,10 @@ share/owncloud/apps/gallery/l10n/de_AT.php share/owncloud/apps/gallery/l10n/de_CH.php share/owncloud/apps/gallery/l10n/de_DE.js share/owncloud/apps/gallery/l10n/de_DE.json -share/owncloud/apps/gallery/l10n/de_DE.php share/owncloud/apps/gallery/l10n/el.js share/owncloud/apps/gallery/l10n/el.json share/owncloud/apps/gallery/l10n/en_GB.js share/owncloud/apps/gallery/l10n/en_GB.json -share/owncloud/apps/gallery/l10n/en_GB.php share/owncloud/apps/gallery/l10n/eo.js share/owncloud/apps/gallery/l10n/eo.json share/owncloud/apps/gallery/l10n/eo.php @@ -7289,7 +7648,8 @@ share/owncloud/apps/gallery/l10n/fr.js share/owncloud/apps/gallery/l10n/fr.json share/owncloud/apps/gallery/l10n/gl.js share/owncloud/apps/gallery/l10n/gl.json -share/owncloud/apps/gallery/l10n/he.php +share/owncloud/apps/gallery/l10n/he.js +share/owncloud/apps/gallery/l10n/he.json share/owncloud/apps/gallery/l10n/hi.php share/owncloud/apps/gallery/l10n/hr.js share/owncloud/apps/gallery/l10n/hr.json @@ -7299,7 +7659,8 @@ share/owncloud/apps/gallery/l10n/hu_HU.json share/owncloud/apps/gallery/l10n/ia.php share/owncloud/apps/gallery/l10n/id.js share/owncloud/apps/gallery/l10n/id.json -share/owncloud/apps/gallery/l10n/is.php +share/owncloud/apps/gallery/l10n/is.js +share/owncloud/apps/gallery/l10n/is.json share/owncloud/apps/gallery/l10n/it.js share/owncloud/apps/gallery/l10n/it.json share/owncloud/apps/gallery/l10n/ja.js @@ -7314,7 +7675,6 @@ share/owncloud/apps/gallery/l10n/ku_IQ.php share/owncloud/apps/gallery/l10n/lb.php share/owncloud/apps/gallery/l10n/lt_LT.js share/owncloud/apps/gallery/l10n/lt_LT.json -share/owncloud/apps/gallery/l10n/lt_LT.php share/owncloud/apps/gallery/l10n/lv.php share/owncloud/apps/gallery/l10n/mk.php share/owncloud/apps/gallery/l10n/ms_MY.php @@ -7323,7 +7683,6 @@ share/owncloud/apps/gallery/l10n/nb_NO.json share/owncloud/apps/gallery/l10n/nl.js share/owncloud/apps/gallery/l10n/nl.json share/owncloud/apps/gallery/l10n/nn_NO.php -share/owncloud/apps/gallery/l10n/no-php share/owncloud/apps/gallery/l10n/oc.js share/owncloud/apps/gallery/l10n/oc.json share/owncloud/apps/gallery/l10n/pa.php @@ -7343,10 +7702,8 @@ share/owncloud/apps/gallery/l10n/sk_SK.js share/owncloud/apps/gallery/l10n/sk_SK.json share/owncloud/apps/gallery/l10n/sl.js share/owncloud/apps/gallery/l10n/sl.json -share/owncloud/apps/gallery/l10n/sl.php share/owncloud/apps/gallery/l10n/sq.js share/owncloud/apps/gallery/l10n/sq.json -share/owncloud/apps/gallery/l10n/sq.php share/owncloud/apps/gallery/l10n/sr.php share/owncloud/apps/gallery/l10n/sr@latin.php share/owncloud/apps/gallery/l10n/sv.js @@ -7369,11 +7726,9 @@ share/owncloud/apps/gallery/l10n/vi.json share/owncloud/apps/gallery/l10n/vi.php share/owncloud/apps/gallery/l10n/zh_CN.js share/owncloud/apps/gallery/l10n/zh_CN.json -share/owncloud/apps/gallery/l10n/zh_CN.php share/owncloud/apps/gallery/l10n/zh_HK.php share/owncloud/apps/gallery/l10n/zh_TW.js share/owncloud/apps/gallery/l10n/zh_TW.json -share/owncloud/apps/gallery/l10n/zh_TW.php share/owncloud/apps/gallery/middleware/checkexception.php share/owncloud/apps/gallery/middleware/checkmiddleware.php share/owncloud/apps/gallery/middleware/envcheckmiddleware.php @@ -7401,101 +7756,6 @@ share/owncloud/apps/gallery/templates/part.internalservererror.php share/owncloud/apps/gallery/templates/part.linkerror.php share/owncloud/apps/gallery/templates/public.php share/owncloud/apps/gallery/templates/slideshow.php -share/owncloud/apps/gallery/tests/README.MD -share/owncloud/apps/gallery/tests/_bootstrap.php -share/owncloud/apps/gallery/tests/_data/.nomedia -share/owncloud/apps/gallery/tests/_data/animated.gif -share/owncloud/apps/gallery/tests/_data/bom-gallery.cnf -share/owncloud/apps/gallery/tests/_data/broken-gallery.cnf -share/owncloud/apps/gallery/tests/_data/design-gallery.cnf -share/owncloud/apps/gallery/tests/_data/dump.sql -share/owncloud/apps/gallery/tests/_data/empty-gallery.cnf -share/owncloud/apps/gallery/tests/_data/font.ttf -share/owncloud/apps/gallery/tests/_data/sharer-gallery.cnf -share/owncloud/apps/gallery/tests/_data/sorting-gallery.cnf -share/owncloud/apps/gallery/tests/_data/sources.md -share/owncloud/apps/gallery/tests/_data/tester-gallery.cnf -share/owncloud/apps/gallery/tests/_data/testimage-corrupt.jpg -share/owncloud/apps/gallery/tests/_data/testimage-wide.png -share/owncloud/apps/gallery/tests/_data/testimage.eps -share/owncloud/apps/gallery/tests/_data/testimage.gif -share/owncloud/apps/gallery/tests/_data/testimage.jpg -share/owncloud/apps/gallery/tests/_data/testimage.png -share/owncloud/apps/gallery/tests/_data/testimagelarge.svg -share/owncloud/apps/gallery/tests/_envs/firefox.yml -share/owncloud/apps/gallery/tests/_support/AcceptanceTester.php -share/owncloud/apps/gallery/tests/_support/ApiTester.php -share/owncloud/apps/gallery/tests/_support/FunctionalTester.php -share/owncloud/apps/gallery/tests/_support/Helper/Acceptance.php -share/owncloud/apps/gallery/tests/_support/Helper/Api.php -share/owncloud/apps/gallery/tests/_support/Helper/CoreTestCase.php -share/owncloud/apps/gallery/tests/_support/Helper/DataSetup.php -share/owncloud/apps/gallery/tests/_support/Helper/Functional.php -share/owncloud/apps/gallery/tests/_support/Helper/Integration.php -share/owncloud/apps/gallery/tests/_support/Helper/Unit.php -share/owncloud/apps/gallery/tests/_support/IntegrationTester.php -share/owncloud/apps/gallery/tests/_support/Page/Acceptance/Login.php -share/owncloud/apps/gallery/tests/_support/Page/Files.php -share/owncloud/apps/gallery/tests/_support/Page/Gallery.php -share/owncloud/apps/gallery/tests/_support/Page/Login.php -share/owncloud/apps/gallery/tests/_support/Step/Api/Anonymous.php -share/owncloud/apps/gallery/tests/_support/Step/Api/TokenUser.php -share/owncloud/apps/gallery/tests/_support/Step/Api/User.php -share/owncloud/apps/gallery/tests/_support/UnitTester.php -share/owncloud/apps/gallery/tests/_support/_generated/AcceptanceTesterActions.php -share/owncloud/apps/gallery/tests/_support/_generated/ApiTesterActions.php -share/owncloud/apps/gallery/tests/_support/_generated/FunctionalTesterActions.php -share/owncloud/apps/gallery/tests/_support/_generated/IntegrationTesterActions.php -share/owncloud/apps/gallery/tests/_support/_generated/UnitTesterActions.php -share/owncloud/apps/gallery/tests/acceptance.suite.yml -share/owncloud/apps/gallery/tests/acceptance/LoginCept.php -share/owncloud/apps/gallery/tests/acceptance/SignInAsUserCept.php -share/owncloud/apps/gallery/tests/acceptance/_bootstrap.php -share/owncloud/apps/gallery/tests/api.suite.yml -share/owncloud/apps/gallery/tests/api/CheckTestUsersCest.php -share/owncloud/apps/gallery/tests/api/ConnectWithTokenCest.php -share/owncloud/apps/gallery/tests/api/DownloadCest.php -share/owncloud/apps/gallery/tests/api/DownloadWithTokenCest.php -share/owncloud/apps/gallery/tests/api/GetConfigCest.php -share/owncloud/apps/gallery/tests/api/GetFilesCest.php -share/owncloud/apps/gallery/tests/api/GetPreviewCest.php -share/owncloud/apps/gallery/tests/api/GetThumbnailsCest.php -share/owncloud/apps/gallery/tests/api/OcsCreateUserCest.php -share/owncloud/apps/gallery/tests/api/_bootstrap.php -share/owncloud/apps/gallery/tests/functional.suite.yml -share/owncloud/apps/gallery/tests/functional/_bootstrap.php -share/owncloud/apps/gallery/tests/integration.suite.yml -share/owncloud/apps/gallery/tests/integration/GalleryIntegrationTest.php -share/owncloud/apps/gallery/tests/integration/_bootstrap.php -share/owncloud/apps/gallery/tests/integration/appinfo/AppTest.php -share/owncloud/apps/gallery/tests/integration/appinfo/ApplicationTest.php -share/owncloud/apps/gallery/tests/integration/environment/EnvironmentSetupTest.php -share/owncloud/apps/gallery/tests/unit.suite.yml -share/owncloud/apps/gallery/tests/unit/GalleryUnitTest.php -share/owncloud/apps/gallery/tests/unit/_bootstrap.php -share/owncloud/apps/gallery/tests/unit/config/ConfigParserTest.php -share/owncloud/apps/gallery/tests/unit/controller/ConfigApiControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/ConfigControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/ConfigPublicControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/FilesApiControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/FilesControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/FilesPublicControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/HttpErrorTest.php -share/owncloud/apps/gallery/tests/unit/controller/PageControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/PreviewApiControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/PreviewControllerTest.php -share/owncloud/apps/gallery/tests/unit/controller/PreviewPublicControllerTest.php -share/owncloud/apps/gallery/tests/unit/environment/EnvironmentTest.php -share/owncloud/apps/gallery/tests/unit/http/ImageResponseTest.php -share/owncloud/apps/gallery/tests/unit/middleware/EnvCheckMiddlewareTest.php -share/owncloud/apps/gallery/tests/unit/middleware/SharingCheckMiddlewareTest.php -share/owncloud/apps/gallery/tests/unit/preview/PreviewTest.php -share/owncloud/apps/gallery/tests/unit/service/Base64EncodeTest.php -share/owncloud/apps/gallery/tests/unit/service/ConfigServiceTest.php -share/owncloud/apps/gallery/tests/unit/service/DownloadServiceTest.php -share/owncloud/apps/gallery/tests/unit/service/PreviewServiceTest.php -share/owncloud/apps/gallery/tests/unit/service/SearchFolderServiceTest.php -share/owncloud/apps/gallery/tests/unit/service/SearchMediaServiceTest.php share/owncloud/apps/gallery/utility/eventsource.php share/owncloud/apps/gallery/vendor/autoload.php share/owncloud/apps/gallery/vendor/composer/ClassLoader.php @@ -7504,6 +7764,7 @@ share/owncloud/apps/gallery/vendor/composer/autoload_namespaces.php share/owncloud/apps/gallery/vendor/composer/autoload_psr4.php share/owncloud/apps/gallery/vendor/composer/autoload_real.php share/owncloud/apps/gallery/vendor/composer/installed.json +share/owncloud/apps/gallery/vendor/symfony/yaml/.gitignore share/owncloud/apps/gallery/vendor/symfony/yaml/CHANGELOG.md share/owncloud/apps/gallery/vendor/symfony/yaml/Dumper.php share/owncloud/apps/gallery/vendor/symfony/yaml/Escaper.php @@ -7514,6 +7775,7 @@ share/owncloud/apps/gallery/vendor/symfony/yaml/Exception/RuntimeException.php share/owncloud/apps/gallery/vendor/symfony/yaml/Inline.php share/owncloud/apps/gallery/vendor/symfony/yaml/LICENSE share/owncloud/apps/gallery/vendor/symfony/yaml/Parser.php +share/owncloud/apps/gallery/vendor/symfony/yaml/README.md share/owncloud/apps/gallery/vendor/symfony/yaml/Tests/DumperTest.php share/owncloud/apps/gallery/vendor/symfony/yaml/Tests/Fixtures/YtsAnchorAlias.yml share/owncloud/apps/gallery/vendor/symfony/yaml/Tests/Fixtures/YtsBasicTests.yml @@ -7543,15 +7805,17 @@ share/owncloud/apps/gallery/vendor/symfony/yaml/Unescaper.php share/owncloud/apps/gallery/vendor/symfony/yaml/Yaml.php share/owncloud/apps/gallery/vendor/symfony/yaml/composer.json share/owncloud/apps/gallery/vendor/symfony/yaml/phpunit.xml.dist -share/owncloud/apps/notifications/CONTRIBUTING.md share/owncloud/apps/notifications/COPYING share/owncloud/apps/notifications/appinfo/app.php share/owncloud/apps/notifications/appinfo/application.php share/owncloud/apps/notifications/appinfo/database.xml share/owncloud/apps/notifications/appinfo/info.xml share/owncloud/apps/notifications/appinfo/routes.php +share/owncloud/apps/notifications/appinfo/signature.json share/owncloud/apps/notifications/controller/endpointcontroller.php share/owncloud/apps/notifications/css/styles.css +share/owncloud/apps/notifications/docs/notification-workflow.md +share/owncloud/apps/notifications/docs/ocs-endpoint-v1.md share/owncloud/apps/notifications/img/notifications-new.png share/owncloud/apps/notifications/img/notifications-new.svg share/owncloud/apps/notifications/img/notifications.png @@ -7563,38 +7827,183 @@ share/owncloud/apps/notifications/js/notification.js share/owncloud/apps/notifications/lib/app.php share/owncloud/apps/notifications/lib/capabilities.php share/owncloud/apps/notifications/lib/handler.php -share/owncloud/apps/notifications/tests/appinfo/AppTest.php -share/owncloud/apps/notifications/tests/appinfo/ApplicationTest.php -share/owncloud/apps/notifications/tests/appinfo/RoutesTest.php -share/owncloud/apps/notifications/tests/bootstrap.php -share/owncloud/apps/notifications/tests/controller/EndpointControllerTest.php -share/owncloud/apps/notifications/tests/lib/AppTest.php -share/owncloud/apps/notifications/tests/lib/CapabilitiesTest.php -share/owncloud/apps/notifications/tests/lib/HandlerTest.php -share/owncloud/apps/notifications/tests/phpunit.xml -share/owncloud/apps/notifications/tests/testcase.php -share/owncloud/apps/provisioning_api/appinfo/app.php share/owncloud/apps/provisioning_api/appinfo/info.xml share/owncloud/apps/provisioning_api/appinfo/routes.php +share/owncloud/apps/provisioning_api/appinfo/signature.json share/owncloud/apps/provisioning_api/img/app.svg share/owncloud/apps/provisioning_api/lib/apps.php share/owncloud/apps/provisioning_api/lib/groups.php share/owncloud/apps/provisioning_api/lib/users.php -share/owncloud/apps/provisioning_api/tests/appstest.php -share/owncloud/apps/provisioning_api/tests/groupstest.php -share/owncloud/apps/provisioning_api/tests/testcase.php -share/owncloud/apps/provisioning_api/tests/userstest.php -share/owncloud/apps/templateeditor/CONTRIBUTING.md +share/owncloud/apps/systemtags/activity/extension.php +share/owncloud/apps/systemtags/activity/listener.php +share/owncloud/apps/systemtags/appinfo/app.php +share/owncloud/apps/systemtags/appinfo/info.xml +share/owncloud/apps/systemtags/appinfo/signature.json +share/owncloud/apps/systemtags/css/systemtagsfilelist.css +share/owncloud/apps/systemtags/img/tag.png +share/owncloud/apps/systemtags/img/tag.svg +share/owncloud/apps/systemtags/js/app.js +share/owncloud/apps/systemtags/js/filesplugin.js +share/owncloud/apps/systemtags/js/systemtagsfilelist.js +share/owncloud/apps/systemtags/js/systemtagsinfoview.js +share/owncloud/apps/systemtags/l10n/ar.js +share/owncloud/apps/systemtags/l10n/ar.json +share/owncloud/apps/systemtags/l10n/ast.js +share/owncloud/apps/systemtags/l10n/ast.json +share/owncloud/apps/systemtags/l10n/az.js +share/owncloud/apps/systemtags/l10n/az.json +share/owncloud/apps/systemtags/l10n/bg_BG.js +share/owncloud/apps/systemtags/l10n/bg_BG.json +share/owncloud/apps/systemtags/l10n/bn_BD.js +share/owncloud/apps/systemtags/l10n/bn_BD.json +share/owncloud/apps/systemtags/l10n/bn_IN.js +share/owncloud/apps/systemtags/l10n/bn_IN.json +share/owncloud/apps/systemtags/l10n/bs.js +share/owncloud/apps/systemtags/l10n/bs.json +share/owncloud/apps/systemtags/l10n/ca.js +share/owncloud/apps/systemtags/l10n/ca.json +share/owncloud/apps/systemtags/l10n/cs_CZ.js +share/owncloud/apps/systemtags/l10n/cs_CZ.json +share/owncloud/apps/systemtags/l10n/cy_GB.js +share/owncloud/apps/systemtags/l10n/cy_GB.json +share/owncloud/apps/systemtags/l10n/da.js +share/owncloud/apps/systemtags/l10n/da.json +share/owncloud/apps/systemtags/l10n/de.js +share/owncloud/apps/systemtags/l10n/de.json +share/owncloud/apps/systemtags/l10n/de_DE.js +share/owncloud/apps/systemtags/l10n/de_DE.json +share/owncloud/apps/systemtags/l10n/el.js +share/owncloud/apps/systemtags/l10n/el.json +share/owncloud/apps/systemtags/l10n/en_GB.js +share/owncloud/apps/systemtags/l10n/en_GB.json +share/owncloud/apps/systemtags/l10n/eo.js +share/owncloud/apps/systemtags/l10n/eo.json +share/owncloud/apps/systemtags/l10n/es.js +share/owncloud/apps/systemtags/l10n/es.json +share/owncloud/apps/systemtags/l10n/es_AR.js +share/owncloud/apps/systemtags/l10n/es_AR.json +share/owncloud/apps/systemtags/l10n/es_MX.js +share/owncloud/apps/systemtags/l10n/es_MX.json +share/owncloud/apps/systemtags/l10n/et_EE.js +share/owncloud/apps/systemtags/l10n/et_EE.json +share/owncloud/apps/systemtags/l10n/eu.js +share/owncloud/apps/systemtags/l10n/eu.json +share/owncloud/apps/systemtags/l10n/fa.js +share/owncloud/apps/systemtags/l10n/fa.json +share/owncloud/apps/systemtags/l10n/fi_FI.js +share/owncloud/apps/systemtags/l10n/fi_FI.json +share/owncloud/apps/systemtags/l10n/fr.js +share/owncloud/apps/systemtags/l10n/fr.json +share/owncloud/apps/systemtags/l10n/gl.js +share/owncloud/apps/systemtags/l10n/gl.json +share/owncloud/apps/systemtags/l10n/he.js +share/owncloud/apps/systemtags/l10n/he.json +share/owncloud/apps/systemtags/l10n/hr.js +share/owncloud/apps/systemtags/l10n/hr.json +share/owncloud/apps/systemtags/l10n/hu_HU.js +share/owncloud/apps/systemtags/l10n/hu_HU.json +share/owncloud/apps/systemtags/l10n/hy.js +share/owncloud/apps/systemtags/l10n/hy.json +share/owncloud/apps/systemtags/l10n/ia.js +share/owncloud/apps/systemtags/l10n/ia.json +share/owncloud/apps/systemtags/l10n/id.js +share/owncloud/apps/systemtags/l10n/id.json +share/owncloud/apps/systemtags/l10n/is.js +share/owncloud/apps/systemtags/l10n/is.json +share/owncloud/apps/systemtags/l10n/it.js +share/owncloud/apps/systemtags/l10n/it.json +share/owncloud/apps/systemtags/l10n/ja.js +share/owncloud/apps/systemtags/l10n/ja.json +share/owncloud/apps/systemtags/l10n/ka_GE.js +share/owncloud/apps/systemtags/l10n/ka_GE.json +share/owncloud/apps/systemtags/l10n/km.js +share/owncloud/apps/systemtags/l10n/km.json +share/owncloud/apps/systemtags/l10n/kn.js +share/owncloud/apps/systemtags/l10n/kn.json +share/owncloud/apps/systemtags/l10n/ko.js +share/owncloud/apps/systemtags/l10n/ko.json +share/owncloud/apps/systemtags/l10n/ku_IQ.js +share/owncloud/apps/systemtags/l10n/ku_IQ.json +share/owncloud/apps/systemtags/l10n/lb.js +share/owncloud/apps/systemtags/l10n/lb.json +share/owncloud/apps/systemtags/l10n/lt_LT.js +share/owncloud/apps/systemtags/l10n/lt_LT.json +share/owncloud/apps/systemtags/l10n/lv.js +share/owncloud/apps/systemtags/l10n/lv.json +share/owncloud/apps/systemtags/l10n/mk.js +share/owncloud/apps/systemtags/l10n/mk.json +share/owncloud/apps/systemtags/l10n/ms_MY.js +share/owncloud/apps/systemtags/l10n/ms_MY.json +share/owncloud/apps/systemtags/l10n/nb_NO.js +share/owncloud/apps/systemtags/l10n/nb_NO.json +share/owncloud/apps/systemtags/l10n/nds.js +share/owncloud/apps/systemtags/l10n/nds.json +share/owncloud/apps/systemtags/l10n/nl.js +share/owncloud/apps/systemtags/l10n/nl.json +share/owncloud/apps/systemtags/l10n/nn_NO.js +share/owncloud/apps/systemtags/l10n/nn_NO.json +share/owncloud/apps/systemtags/l10n/oc.js +share/owncloud/apps/systemtags/l10n/oc.json +share/owncloud/apps/systemtags/l10n/pl.js +share/owncloud/apps/systemtags/l10n/pl.json +share/owncloud/apps/systemtags/l10n/pt_BR.js +share/owncloud/apps/systemtags/l10n/pt_BR.json +share/owncloud/apps/systemtags/l10n/pt_PT.js +share/owncloud/apps/systemtags/l10n/pt_PT.json +share/owncloud/apps/systemtags/l10n/ro.js +share/owncloud/apps/systemtags/l10n/ro.json +share/owncloud/apps/systemtags/l10n/ru.js +share/owncloud/apps/systemtags/l10n/ru.json +share/owncloud/apps/systemtags/l10n/si_LK.js +share/owncloud/apps/systemtags/l10n/si_LK.json +share/owncloud/apps/systemtags/l10n/sk_SK.js +share/owncloud/apps/systemtags/l10n/sk_SK.json +share/owncloud/apps/systemtags/l10n/sl.js +share/owncloud/apps/systemtags/l10n/sl.json +share/owncloud/apps/systemtags/l10n/sq.js +share/owncloud/apps/systemtags/l10n/sq.json +share/owncloud/apps/systemtags/l10n/sr.js +share/owncloud/apps/systemtags/l10n/sr.json +share/owncloud/apps/systemtags/l10n/sr@latin.js +share/owncloud/apps/systemtags/l10n/sr@latin.json +share/owncloud/apps/systemtags/l10n/sv.js +share/owncloud/apps/systemtags/l10n/sv.json +share/owncloud/apps/systemtags/l10n/ta_LK.js +share/owncloud/apps/systemtags/l10n/ta_LK.json +share/owncloud/apps/systemtags/l10n/te.js +share/owncloud/apps/systemtags/l10n/te.json +share/owncloud/apps/systemtags/l10n/th_TH.js +share/owncloud/apps/systemtags/l10n/th_TH.json +share/owncloud/apps/systemtags/l10n/tr.js +share/owncloud/apps/systemtags/l10n/tr.json +share/owncloud/apps/systemtags/l10n/ug.js +share/owncloud/apps/systemtags/l10n/ug.json +share/owncloud/apps/systemtags/l10n/uk.js +share/owncloud/apps/systemtags/l10n/uk.json +share/owncloud/apps/systemtags/l10n/ur_PK.js +share/owncloud/apps/systemtags/l10n/ur_PK.json +share/owncloud/apps/systemtags/l10n/vi.js +share/owncloud/apps/systemtags/l10n/vi.json +share/owncloud/apps/systemtags/l10n/zh_CN.js +share/owncloud/apps/systemtags/l10n/zh_CN.json +share/owncloud/apps/systemtags/l10n/zh_HK.js +share/owncloud/apps/systemtags/l10n/zh_HK.json +share/owncloud/apps/systemtags/l10n/zh_TW.js +share/owncloud/apps/systemtags/l10n/zh_TW.json +share/owncloud/apps/systemtags/list.php +share/owncloud/apps/systemtags/templates/list.php share/owncloud/apps/templateeditor/app/templateeditor.php share/owncloud/apps/templateeditor/appinfo/app.php share/owncloud/apps/templateeditor/appinfo/info.xml share/owncloud/apps/templateeditor/appinfo/routes.php +share/owncloud/apps/templateeditor/appinfo/signature.json share/owncloud/apps/templateeditor/appinfo/version share/owncloud/apps/templateeditor/controller/adminsettingscontroller.php share/owncloud/apps/templateeditor/css/settings-admin.css share/owncloud/apps/templateeditor/http/mailtemplateresponse.php share/owncloud/apps/templateeditor/img/app.svg share/owncloud/apps/templateeditor/js/settings-admin.js +share/owncloud/apps/templateeditor/l10n/.tx/config share/owncloud/apps/templateeditor/l10n/ar.js share/owncloud/apps/templateeditor/l10n/ar.json share/owncloud/apps/templateeditor/l10n/ar.php @@ -7663,6 +8072,8 @@ share/owncloud/apps/templateeditor/l10n/fr.php share/owncloud/apps/templateeditor/l10n/gl.js share/owncloud/apps/templateeditor/l10n/gl.json share/owncloud/apps/templateeditor/l10n/gl.php +share/owncloud/apps/templateeditor/l10n/he.js +share/owncloud/apps/templateeditor/l10n/he.json share/owncloud/apps/templateeditor/l10n/he.php share/owncloud/apps/templateeditor/l10n/hi.php share/owncloud/apps/templateeditor/l10n/hr.php @@ -7725,6 +8136,8 @@ share/owncloud/apps/templateeditor/l10n/sk_SK.php share/owncloud/apps/templateeditor/l10n/sl.js share/owncloud/apps/templateeditor/l10n/sl.json share/owncloud/apps/templateeditor/l10n/sl.php +share/owncloud/apps/templateeditor/l10n/sq.js +share/owncloud/apps/templateeditor/l10n/sq.json share/owncloud/apps/templateeditor/l10n/sq.php share/owncloud/apps/templateeditor/l10n/sr.js share/owncloud/apps/templateeditor/l10n/sr.json @@ -7751,199 +8164,126 @@ share/owncloud/apps/templateeditor/l10n/zh_CN.js share/owncloud/apps/templateeditor/l10n/zh_CN.json share/owncloud/apps/templateeditor/l10n/zh_CN.php share/owncloud/apps/templateeditor/l10n/zh_HK.php +share/owncloud/apps/templateeditor/l10n/zh_TW.js +share/owncloud/apps/templateeditor/l10n/zh_TW.json share/owncloud/apps/templateeditor/l10n/zh_TW.php share/owncloud/apps/templateeditor/lib/mailtemplate.php share/owncloud/apps/templateeditor/settings-admin.php share/owncloud/apps/templateeditor/templates/settings-admin.php -share/owncloud/apps/updater/CONTRIBUTING.md -share/owncloud/apps/updater/COPYING-AGPL -share/owncloud/apps/updater/admin.php -share/owncloud/apps/updater/appinfo/app.php -share/owncloud/apps/updater/appinfo/application.php -share/owncloud/apps/updater/appinfo/info.xml -share/owncloud/apps/updater/appinfo/routes.php -share/owncloud/apps/updater/appinfo/version -share/owncloud/apps/updater/controller/admincontroller.php -share/owncloud/apps/updater/controller/backupcontroller.php -share/owncloud/apps/updater/controller/updatecontroller.php -share/owncloud/apps/updater/css/updater.css -share/owncloud/apps/updater/img/app.svg -share/owncloud/apps/updater/js/3rdparty/angular.js -share/owncloud/apps/updater/js/updater.js -share/owncloud/apps/updater/l10n/ar.php -share/owncloud/apps/updater/l10n/ast.php -share/owncloud/apps/updater/l10n/az.js -share/owncloud/apps/updater/l10n/az.json -share/owncloud/apps/updater/l10n/az.php -share/owncloud/apps/updater/l10n/bg_BG.js -share/owncloud/apps/updater/l10n/bg_BG.json -share/owncloud/apps/updater/l10n/bg_BG.php -share/owncloud/apps/updater/l10n/bn_BD.php -share/owncloud/apps/updater/l10n/bn_IN.php -share/owncloud/apps/updater/l10n/bs.js -share/owncloud/apps/updater/l10n/bs.json -share/owncloud/apps/updater/l10n/bs.php -share/owncloud/apps/updater/l10n/ca.php -share/owncloud/apps/updater/l10n/cs_CZ.js -share/owncloud/apps/updater/l10n/cs_CZ.json -share/owncloud/apps/updater/l10n/cs_CZ.php -share/owncloud/apps/updater/l10n/cy_GB.php -share/owncloud/apps/updater/l10n/da.js -share/owncloud/apps/updater/l10n/da.json -share/owncloud/apps/updater/l10n/da.php -share/owncloud/apps/updater/l10n/de.js -share/owncloud/apps/updater/l10n/de.json -share/owncloud/apps/updater/l10n/de.php -share/owncloud/apps/updater/l10n/de_AT.php -share/owncloud/apps/updater/l10n/de_DE.js -share/owncloud/apps/updater/l10n/de_DE.json -share/owncloud/apps/updater/l10n/de_DE.php -share/owncloud/apps/updater/l10n/el.js -share/owncloud/apps/updater/l10n/el.json -share/owncloud/apps/updater/l10n/el.php -share/owncloud/apps/updater/l10n/en@pirate.php -share/owncloud/apps/updater/l10n/en_GB.js -share/owncloud/apps/updater/l10n/en_GB.json -share/owncloud/apps/updater/l10n/en_GB.php -share/owncloud/apps/updater/l10n/eo.php -share/owncloud/apps/updater/l10n/es.js -share/owncloud/apps/updater/l10n/es.json -share/owncloud/apps/updater/l10n/es.php -share/owncloud/apps/updater/l10n/es_AR.js -share/owncloud/apps/updater/l10n/es_AR.json -share/owncloud/apps/updater/l10n/es_AR.php -share/owncloud/apps/updater/l10n/es_CL.php -share/owncloud/apps/updater/l10n/es_MX.php -share/owncloud/apps/updater/l10n/et_EE.js -share/owncloud/apps/updater/l10n/et_EE.json -share/owncloud/apps/updater/l10n/et_EE.php -share/owncloud/apps/updater/l10n/eu.js -share/owncloud/apps/updater/l10n/eu.json -share/owncloud/apps/updater/l10n/eu.php -share/owncloud/apps/updater/l10n/eu_ES.php -share/owncloud/apps/updater/l10n/fa.php -share/owncloud/apps/updater/l10n/fi_FI.js -share/owncloud/apps/updater/l10n/fi_FI.json -share/owncloud/apps/updater/l10n/fi_FI.php -share/owncloud/apps/updater/l10n/fr.js -share/owncloud/apps/updater/l10n/fr.json -share/owncloud/apps/updater/l10n/fr.php -share/owncloud/apps/updater/l10n/gl.js -share/owncloud/apps/updater/l10n/gl.json -share/owncloud/apps/updater/l10n/gl.php -share/owncloud/apps/updater/l10n/he.php -share/owncloud/apps/updater/l10n/hi.php -share/owncloud/apps/updater/l10n/hr.js -share/owncloud/apps/updater/l10n/hr.json -share/owncloud/apps/updater/l10n/hr.php -share/owncloud/apps/updater/l10n/hu_HU.js -share/owncloud/apps/updater/l10n/hu_HU.json -share/owncloud/apps/updater/l10n/hu_HU.php -share/owncloud/apps/updater/l10n/hy.php -share/owncloud/apps/updater/l10n/ia.php -share/owncloud/apps/updater/l10n/id.js -share/owncloud/apps/updater/l10n/id.json -share/owncloud/apps/updater/l10n/id.php -share/owncloud/apps/updater/l10n/is.php -share/owncloud/apps/updater/l10n/it.js -share/owncloud/apps/updater/l10n/it.json -share/owncloud/apps/updater/l10n/it.php -share/owncloud/apps/updater/l10n/ja.js -share/owncloud/apps/updater/l10n/ja.json -share/owncloud/apps/updater/l10n/ja.php -share/owncloud/apps/updater/l10n/jv.php -share/owncloud/apps/updater/l10n/ka_GE.php -share/owncloud/apps/updater/l10n/km.php -share/owncloud/apps/updater/l10n/ko.js -share/owncloud/apps/updater/l10n/ko.json -share/owncloud/apps/updater/l10n/ko.php -share/owncloud/apps/updater/l10n/ku_IQ.php -share/owncloud/apps/updater/l10n/lb.php -share/owncloud/apps/updater/l10n/lt_LT.php -share/owncloud/apps/updater/l10n/lv.php -share/owncloud/apps/updater/l10n/mk.php -share/owncloud/apps/updater/l10n/ms_MY.php -share/owncloud/apps/updater/l10n/my_MM.php -share/owncloud/apps/updater/l10n/nb_NO.js -share/owncloud/apps/updater/l10n/nb_NO.json -share/owncloud/apps/updater/l10n/nb_NO.php -share/owncloud/apps/updater/l10n/nl.js -share/owncloud/apps/updater/l10n/nl.json -share/owncloud/apps/updater/l10n/nl.php -share/owncloud/apps/updater/l10n/nn_NO.php -share/owncloud/apps/updater/l10n/oc.js -share/owncloud/apps/updater/l10n/oc.json -share/owncloud/apps/updater/l10n/oc.php -share/owncloud/apps/updater/l10n/pa.php -share/owncloud/apps/updater/l10n/pl.js -share/owncloud/apps/updater/l10n/pl.json -share/owncloud/apps/updater/l10n/pl.php -share/owncloud/apps/updater/l10n/pt_BR.js -share/owncloud/apps/updater/l10n/pt_BR.json -share/owncloud/apps/updater/l10n/pt_BR.php -share/owncloud/apps/updater/l10n/pt_PT.js -share/owncloud/apps/updater/l10n/pt_PT.json -share/owncloud/apps/updater/l10n/pt_PT.php -share/owncloud/apps/updater/l10n/ro.php -share/owncloud/apps/updater/l10n/ru.js -share/owncloud/apps/updater/l10n/ru.json -share/owncloud/apps/updater/l10n/ru.php -share/owncloud/apps/updater/l10n/si_LK.php -share/owncloud/apps/updater/l10n/sk_SK.js -share/owncloud/apps/updater/l10n/sk_SK.json -share/owncloud/apps/updater/l10n/sk_SK.php -share/owncloud/apps/updater/l10n/sl.js -share/owncloud/apps/updater/l10n/sl.json -share/owncloud/apps/updater/l10n/sl.php -share/owncloud/apps/updater/l10n/sq.php -share/owncloud/apps/updater/l10n/sr.js -share/owncloud/apps/updater/l10n/sr.json -share/owncloud/apps/updater/l10n/sr.php -share/owncloud/apps/updater/l10n/sr@latin.php -share/owncloud/apps/updater/l10n/sv.js -share/owncloud/apps/updater/l10n/sv.json -share/owncloud/apps/updater/l10n/sv.php -share/owncloud/apps/updater/l10n/ta_LK.php -share/owncloud/apps/updater/l10n/te.php -share/owncloud/apps/updater/l10n/th_TH.js -share/owncloud/apps/updater/l10n/th_TH.json -share/owncloud/apps/updater/l10n/th_TH.php -share/owncloud/apps/updater/l10n/tr.js -share/owncloud/apps/updater/l10n/tr.json -share/owncloud/apps/updater/l10n/tr.php -share/owncloud/apps/updater/l10n/ug.php -share/owncloud/apps/updater/l10n/uk.js -share/owncloud/apps/updater/l10n/uk.json -share/owncloud/apps/updater/l10n/uk.php -share/owncloud/apps/updater/l10n/ur_PK.php -share/owncloud/apps/updater/l10n/vi.php -share/owncloud/apps/updater/l10n/zh_CN.js -share/owncloud/apps/updater/l10n/zh_CN.json -share/owncloud/apps/updater/l10n/zh_CN.php -share/owncloud/apps/updater/l10n/zh_HK.php -share/owncloud/apps/updater/l10n/zh_TW.php -share/owncloud/apps/updater/lib/backup.php -share/owncloud/apps/updater/lib/channel.php -share/owncloud/apps/updater/lib/collection.php -share/owncloud/apps/updater/lib/config.php -share/owncloud/apps/updater/lib/downloader.php -share/owncloud/apps/updater/lib/files.json -share/owncloud/apps/updater/lib/fsexception.php -share/owncloud/apps/updater/lib/helper.php -share/owncloud/apps/updater/lib/location.php -share/owncloud/apps/updater/lib/location/apps.php -share/owncloud/apps/updater/lib/location/core.php -share/owncloud/apps/updater/lib/location/thirdparty.php -share/owncloud/apps/updater/lib/permissionexception.php -share/owncloud/apps/updater/lib/updater.php -share/owncloud/apps/updater/templates/admin.php -share/owncloud/apps/updater/tests/bootstrap.php -share/owncloud/apps/updater/tests/channeltest.php -share/owncloud/apps/updater/tests/controller/backupcontrollertest.php -share/owncloud/apps/updater/tests/phpunit.xml +share/owncloud/apps/updatenotification/admin.php +share/owncloud/apps/updatenotification/appinfo/app.php +share/owncloud/apps/updatenotification/appinfo/application.php +share/owncloud/apps/updatenotification/appinfo/info.xml +share/owncloud/apps/updatenotification/appinfo/routes.php +share/owncloud/apps/updatenotification/appinfo/signature.json +share/owncloud/apps/updatenotification/controller/admincontroller.php +share/owncloud/apps/updatenotification/js/admin.js +share/owncloud/apps/updatenotification/js/notification.js +share/owncloud/apps/updatenotification/l10n/ar.js +share/owncloud/apps/updatenotification/l10n/ar.json +share/owncloud/apps/updatenotification/l10n/ast.js +share/owncloud/apps/updatenotification/l10n/ast.json +share/owncloud/apps/updatenotification/l10n/az.js +share/owncloud/apps/updatenotification/l10n/az.json +share/owncloud/apps/updatenotification/l10n/bg_BG.js +share/owncloud/apps/updatenotification/l10n/bg_BG.json +share/owncloud/apps/updatenotification/l10n/bn_BD.js +share/owncloud/apps/updatenotification/l10n/bn_BD.json +share/owncloud/apps/updatenotification/l10n/bs.js +share/owncloud/apps/updatenotification/l10n/bs.json +share/owncloud/apps/updatenotification/l10n/ca.js +share/owncloud/apps/updatenotification/l10n/ca.json +share/owncloud/apps/updatenotification/l10n/cs_CZ.js +share/owncloud/apps/updatenotification/l10n/cs_CZ.json +share/owncloud/apps/updatenotification/l10n/da.js +share/owncloud/apps/updatenotification/l10n/da.json +share/owncloud/apps/updatenotification/l10n/de.js +share/owncloud/apps/updatenotification/l10n/de.json +share/owncloud/apps/updatenotification/l10n/de_DE.js +share/owncloud/apps/updatenotification/l10n/de_DE.json +share/owncloud/apps/updatenotification/l10n/el.js +share/owncloud/apps/updatenotification/l10n/el.json +share/owncloud/apps/updatenotification/l10n/en_GB.js +share/owncloud/apps/updatenotification/l10n/en_GB.json +share/owncloud/apps/updatenotification/l10n/eo.js +share/owncloud/apps/updatenotification/l10n/eo.json +share/owncloud/apps/updatenotification/l10n/es.js +share/owncloud/apps/updatenotification/l10n/es.json +share/owncloud/apps/updatenotification/l10n/es_AR.js +share/owncloud/apps/updatenotification/l10n/es_AR.json +share/owncloud/apps/updatenotification/l10n/et_EE.js +share/owncloud/apps/updatenotification/l10n/et_EE.json +share/owncloud/apps/updatenotification/l10n/eu.js +share/owncloud/apps/updatenotification/l10n/eu.json +share/owncloud/apps/updatenotification/l10n/fa.js +share/owncloud/apps/updatenotification/l10n/fa.json +share/owncloud/apps/updatenotification/l10n/fi_FI.js +share/owncloud/apps/updatenotification/l10n/fi_FI.json +share/owncloud/apps/updatenotification/l10n/fr.js +share/owncloud/apps/updatenotification/l10n/fr.json +share/owncloud/apps/updatenotification/l10n/gl.js +share/owncloud/apps/updatenotification/l10n/gl.json +share/owncloud/apps/updatenotification/l10n/he.js +share/owncloud/apps/updatenotification/l10n/he.json +share/owncloud/apps/updatenotification/l10n/hr.js +share/owncloud/apps/updatenotification/l10n/hr.json +share/owncloud/apps/updatenotification/l10n/hu_HU.js +share/owncloud/apps/updatenotification/l10n/hu_HU.json +share/owncloud/apps/updatenotification/l10n/id.js +share/owncloud/apps/updatenotification/l10n/id.json +share/owncloud/apps/updatenotification/l10n/is.js +share/owncloud/apps/updatenotification/l10n/is.json +share/owncloud/apps/updatenotification/l10n/it.js +share/owncloud/apps/updatenotification/l10n/it.json +share/owncloud/apps/updatenotification/l10n/ja.js +share/owncloud/apps/updatenotification/l10n/ja.json +share/owncloud/apps/updatenotification/l10n/ko.js +share/owncloud/apps/updatenotification/l10n/ko.json +share/owncloud/apps/updatenotification/l10n/lt_LT.js +share/owncloud/apps/updatenotification/l10n/lt_LT.json +share/owncloud/apps/updatenotification/l10n/mk.js +share/owncloud/apps/updatenotification/l10n/mk.json +share/owncloud/apps/updatenotification/l10n/nb_NO.js +share/owncloud/apps/updatenotification/l10n/nb_NO.json +share/owncloud/apps/updatenotification/l10n/nl.js +share/owncloud/apps/updatenotification/l10n/nl.json +share/owncloud/apps/updatenotification/l10n/oc.js +share/owncloud/apps/updatenotification/l10n/oc.json +share/owncloud/apps/updatenotification/l10n/pl.js +share/owncloud/apps/updatenotification/l10n/pl.json +share/owncloud/apps/updatenotification/l10n/pt_BR.js +share/owncloud/apps/updatenotification/l10n/pt_BR.json +share/owncloud/apps/updatenotification/l10n/pt_PT.js +share/owncloud/apps/updatenotification/l10n/pt_PT.json +share/owncloud/apps/updatenotification/l10n/ru.js +share/owncloud/apps/updatenotification/l10n/ru.json +share/owncloud/apps/updatenotification/l10n/sk_SK.js +share/owncloud/apps/updatenotification/l10n/sk_SK.json +share/owncloud/apps/updatenotification/l10n/sl.js +share/owncloud/apps/updatenotification/l10n/sl.json +share/owncloud/apps/updatenotification/l10n/sq.js +share/owncloud/apps/updatenotification/l10n/sq.json +share/owncloud/apps/updatenotification/l10n/sr.js +share/owncloud/apps/updatenotification/l10n/sr.json +share/owncloud/apps/updatenotification/l10n/sv.js +share/owncloud/apps/updatenotification/l10n/sv.json +share/owncloud/apps/updatenotification/l10n/th_TH.js +share/owncloud/apps/updatenotification/l10n/th_TH.json +share/owncloud/apps/updatenotification/l10n/tr.js +share/owncloud/apps/updatenotification/l10n/tr.json +share/owncloud/apps/updatenotification/l10n/uk.js +share/owncloud/apps/updatenotification/l10n/uk.json +share/owncloud/apps/updatenotification/l10n/zh_CN.js +share/owncloud/apps/updatenotification/l10n/zh_CN.json +share/owncloud/apps/updatenotification/l10n/zh_TW.js +share/owncloud/apps/updatenotification/l10n/zh_TW.json +share/owncloud/apps/updatenotification/lib/resettokenbackgroundjob.php +share/owncloud/apps/updatenotification/lib/updatechecker.php +share/owncloud/apps/updatenotification/templates/admin.php share/owncloud/apps/user_external/appinfo/app.php share/owncloud/apps/user_external/appinfo/database.xml share/owncloud/apps/user_external/appinfo/info.xml +share/owncloud/apps/user_external/appinfo/signature.json share/owncloud/apps/user_external/appinfo/version share/owncloud/apps/user_external/img/app.svg share/owncloud/apps/user_external/lib/base.php @@ -7951,10 +8291,6 @@ share/owncloud/apps/user_external/lib/ftp.php share/owncloud/apps/user_external/lib/imap.php share/owncloud/apps/user_external/lib/smb.php share/owncloud/apps/user_external/lib/webdavauth.php -share/owncloud/apps/user_external/tests/config.php -share/owncloud/apps/user_external/tests/ftp.php -share/owncloud/apps/user_external/tests/imap.php -share/owncloud/apps/user_external/tests/smb.php share/owncloud/apps/user_ldap/ajax/clearMappings.php share/owncloud/apps/user_ldap/ajax/deleteConfiguration.php share/owncloud/apps/user_ldap/ajax/getConfiguration.php @@ -7968,6 +8304,7 @@ share/owncloud/apps/user_ldap/appinfo/info.xml share/owncloud/apps/user_ldap/appinfo/install.php share/owncloud/apps/user_ldap/appinfo/register_command.php share/owncloud/apps/user_ldap/appinfo/routes.php +share/owncloud/apps/user_ldap/appinfo/signature.json share/owncloud/apps/user_ldap/appinfo/update.php share/owncloud/apps/user_ldap/command/checkuser.php share/owncloud/apps/user_ldap/command/createemptyconfig.php @@ -8268,36 +8605,6 @@ share/owncloud/apps/user_ldap/templates/part.wizard-server.php share/owncloud/apps/user_ldap/templates/part.wizard-userfilter.php share/owncloud/apps/user_ldap/templates/part.wizardcontrols.php share/owncloud/apps/user_ldap/templates/settings.php -share/owncloud/apps/user_ldap/tests/.htaccess -share/owncloud/apps/user_ldap/tests/access.php -share/owncloud/apps/user_ldap/tests/configuration.php -share/owncloud/apps/user_ldap/tests/connection.php -share/owncloud/apps/user_ldap/tests/group_ldap.php -share/owncloud/apps/user_ldap/tests/integration/abstractintegrationtest.php -share/owncloud/apps/user_ldap/tests/integration/data/avatar-invalid.gif -share/owncloud/apps/user_ldap/tests/integration/data/avatar-valid.jpg -share/owncloud/apps/user_ldap/tests/integration/exceptionOnLostConnection.php -share/owncloud/apps/user_ldap/tests/integration/fakemanager.php -share/owncloud/apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php -share/owncloud/apps/user_ldap/tests/integration/lib/integrationtestbackupserver.php -share/owncloud/apps/user_ldap/tests/integration/lib/integrationtestcountusersbyloginname.php -share/owncloud/apps/user_ldap/tests/integration/lib/integrationtestfetchusersbyloginname.php -share/owncloud/apps/user_ldap/tests/integration/lib/integrationtestpaging.php -share/owncloud/apps/user_ldap/tests/integration/lib/integrationtestuserhome.php -share/owncloud/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php -share/owncloud/apps/user_ldap/tests/integration/readme.md -share/owncloud/apps/user_ldap/tests/integration/run-test.sh -share/owncloud/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroups.php -share/owncloud/apps/user_ldap/tests/integration/setup-scripts/createExplicitGroupsDifferentOU.php -share/owncloud/apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php -share/owncloud/apps/user_ldap/tests/jobs/cleanup.php -share/owncloud/apps/user_ldap/tests/mapping/abstractmappingtest.php -share/owncloud/apps/user_ldap/tests/mapping/groupmapping.php -share/owncloud/apps/user_ldap/tests/mapping/usermapping.php -share/owncloud/apps/user_ldap/tests/user/manager.php -share/owncloud/apps/user_ldap/tests/user/user.php -share/owncloud/apps/user_ldap/tests/user_ldap.php -share/owncloud/apps/user_ldap/tests/wizard.php share/owncloud/apps/user_ldap/user_ldap.php share/owncloud/apps/user_ldap/user_proxy.php share/owncloud/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE @@ -8311,10 +8618,10 @@ share/owncloud/core/ajax/preview.php share/owncloud/core/ajax/share.php share/owncloud/core/ajax/update.php share/owncloud/core/application.php -share/owncloud/core/avatar/avatarcontroller.php share/owncloud/core/command/app/checkcode.php share/owncloud/core/command/app/disable.php share/owncloud/core/command/app/enable.php +share/owncloud/core/command/app/getpath.php share/owncloud/core/command/app/listapps.php share/owncloud/core/command/background/ajax.php share/owncloud/core/command/background/base.php @@ -8341,6 +8648,10 @@ share/owncloud/core/command/encryption/listmodules.php share/owncloud/core/command/encryption/setdefaultmodule.php share/owncloud/core/command/encryption/showkeystorageroot.php share/owncloud/core/command/encryption/status.php +share/owncloud/core/command/integrity/checkapp.php +share/owncloud/core/command/integrity/checkcore.php +share/owncloud/core/command/integrity/signapp.php +share/owncloud/core/command/integrity/signcore.php share/owncloud/core/command/l10n/createjs.php share/owncloud/core/command/log/manage.php share/owncloud/core/command/log/owncloud.php @@ -8350,6 +8661,9 @@ share/owncloud/core/command/maintenance/mimetype/updatejs.php share/owncloud/core/command/maintenance/mode.php share/owncloud/core/command/maintenance/repair.php share/owncloud/core/command/maintenance/singleuser.php +share/owncloud/core/command/security/importcertificate.php +share/owncloud/core/command/security/listcertificates.php +share/owncloud/core/command/security/removecertificate.php share/owncloud/core/command/status.php share/owncloud/core/command/upgrade.php share/owncloud/core/command/user/add.php @@ -8357,9 +8671,14 @@ share/owncloud/core/command/user/delete.php share/owncloud/core/command/user/lastseen.php share/owncloud/core/command/user/report.php share/owncloud/core/command/user/resetpassword.php +share/owncloud/core/controller/avatarcontroller.php +share/owncloud/core/controller/lostcontroller.php +share/owncloud/core/controller/setupcontroller.php +share/owncloud/core/controller/usercontroller.php share/owncloud/core/css/apps.css share/owncloud/core/css/fixes.css share/owncloud/core/css/fonts.css +share/owncloud/core/css/global.css share/owncloud/core/css/header.css share/owncloud/core/css/icons.css share/owncloud/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png @@ -8373,112 +8692,40 @@ share/owncloud/core/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png share/owncloud/core/css/images/ui-icons_1d2d44_256x240.png share/owncloud/core/css/images/ui-icons_ffd27a_256x240.png share/owncloud/core/css/images/ui-icons_ffffff_256x240.png +share/owncloud/core/css/inputs.css share/owncloud/core/css/jquery-ui-fixes.css share/owncloud/core/css/jquery.ocdialog.css +share/owncloud/core/css/lostpassword/resetpassword.css share/owncloud/core/css/mobile.css share/owncloud/core/css/multiselect.css share/owncloud/core/css/share.css share/owncloud/core/css/styles.css +share/owncloud/core/css/systemtags.css share/owncloud/core/css/tooltip.css -share/owncloud/core/doc/admin/_images/2-updates.png share/owncloud/core/doc/admin/_images/add_storage.png +share/owncloud/core/doc/admin/_images/admin_filehandling-1.png +share/owncloud/core/doc/admin/_images/admin_filehandling-2.png share/owncloud/core/doc/admin/_images/amazons3.png -share/owncloud/core/doc/admin/_images/android_custom_1.png -share/owncloud/core/doc/admin/_images/android_custom_10.png -share/owncloud/core/doc/admin/_images/android_custom_11.png -share/owncloud/core/doc/admin/_images/android_custom_12.png -share/owncloud/core/doc/admin/_images/android_custom_13.png -share/owncloud/core/doc/admin/_images/android_custom_14.png -share/owncloud/core/doc/admin/_images/android_custom_15.png -share/owncloud/core/doc/admin/_images/android_custom_17.png -share/owncloud/core/doc/admin/_images/android_custom_18.png -share/owncloud/core/doc/admin/_images/android_custom_2.png -share/owncloud/core/doc/admin/_images/android_custom_20.png -share/owncloud/core/doc/admin/_images/android_custom_21.png -share/owncloud/core/doc/admin/_images/android_custom_22.png -share/owncloud/core/doc/admin/_images/android_custom_23.png -share/owncloud/core/doc/admin/_images/android_custom_24.png -share/owncloud/core/doc/admin/_images/android_custom_25.png -share/owncloud/core/doc/admin/_images/android_custom_26.png -share/owncloud/core/doc/admin/_images/android_custom_3.png -share/owncloud/core/doc/admin/_images/android_custom_6.png -share/owncloud/core/doc/admin/_images/android_custom_7.png -share/owncloud/core/doc/admin/_images/android_custom_8.png -share/owncloud/core/doc/admin/_images/android_custom_9.png share/owncloud/core/doc/admin/_images/antivirus-app.png share/owncloud/core/doc/admin/_images/antivirus-config.png share/owncloud/core/doc/admin/_images/antivirus-daemon-socket.png -share/owncloud/core/doc/admin/_images/antivirus-daemon.png share/owncloud/core/doc/admin/_images/antivirus-executable.png share/owncloud/core/doc/admin/_images/antivirus-logging.png share/owncloud/core/doc/admin/_images/app-sharepoint-enable.png share/owncloud/core/doc/admin/_images/applicable.png share/owncloud/core/doc/admin/_images/auth_mechanism.png share/owncloud/core/doc/admin/_images/auth_rsa.png -share/owncloud/core/doc/admin/_images/cert-1.png -share/owncloud/core/doc/admin/_images/cert-11.png -share/owncloud/core/doc/admin/_images/cert-12.png -share/owncloud/core/doc/admin/_images/cert-13.png -share/owncloud/core/doc/admin/_images/cert-14.png -share/owncloud/core/doc/admin/_images/cert-15.png -share/owncloud/core/doc/admin/_images/cert-16.png -share/owncloud/core/doc/admin/_images/cert-17.png -share/owncloud/core/doc/admin/_images/cert-18.png -share/owncloud/core/doc/admin/_images/cert-19.png -share/owncloud/core/doc/admin/_images/cert-2.png -share/owncloud/core/doc/admin/_images/cert-20.png -share/owncloud/core/doc/admin/_images/cert-25.png -share/owncloud/core/doc/admin/_images/cert-26.png -share/owncloud/core/doc/admin/_images/cert-27.png -share/owncloud/core/doc/admin/_images/cert-28.png -share/owncloud/core/doc/admin/_images/cert-29.png -share/owncloud/core/doc/admin/_images/cert-3.png -share/owncloud/core/doc/admin/_images/cert-30.png -share/owncloud/core/doc/admin/_images/cert-31.png -share/owncloud/core/doc/admin/_images/cert-32.png -share/owncloud/core/doc/admin/_images/cert-33.png -share/owncloud/core/doc/admin/_images/cert-34.png -share/owncloud/core/doc/admin/_images/cert-35.png -share/owncloud/core/doc/admin/_images/cert-36.png -share/owncloud/core/doc/admin/_images/cert-37.png -share/owncloud/core/doc/admin/_images/cert-38.png -share/owncloud/core/doc/admin/_images/cert-39.png -share/owncloud/core/doc/admin/_images/cert-4.png -share/owncloud/core/doc/admin/_images/cert-40.png -share/owncloud/core/doc/admin/_images/cert-41.png -share/owncloud/core/doc/admin/_images/cert-42.png -share/owncloud/core/doc/admin/_images/cert-43.png -share/owncloud/core/doc/admin/_images/cert-44.png -share/owncloud/core/doc/admin/_images/cert-46.png -share/owncloud/core/doc/admin/_images/cert-47.png -share/owncloud/core/doc/admin/_images/cert-5.png -share/owncloud/core/doc/admin/_images/cert-50.png -share/owncloud/core/doc/admin/_images/cert-53.png -share/owncloud/core/doc/admin/_images/cert-54.png -share/owncloud/core/doc/admin/_images/cert-55.png -share/owncloud/core/doc/admin/_images/cert-56.png -share/owncloud/core/doc/admin/_images/cert-57.png -share/owncloud/core/doc/admin/_images/cert-58.png -share/owncloud/core/doc/admin/_images/cert-59.png -share/owncloud/core/doc/admin/_images/cert-6.png -share/owncloud/core/doc/admin/_images/cert-60.png -share/owncloud/core/doc/admin/_images/cert-61.png -share/owncloud/core/doc/admin/_images/cert-62.png -share/owncloud/core/doc/admin/_images/cert-7.png -share/owncloud/core/doc/admin/_images/cert-8.png -share/owncloud/core/doc/admin/_images/cert-9.png +share/owncloud/core/doc/admin/_images/code-integrity-admin.png +share/owncloud/core/doc/admin/_images/code-integrity-notification.png share/owncloud/core/doc/admin/_images/community-vm-console.png share/owncloud/core/doc/admin/_images/community-vm-splash.png -share/owncloud/core/doc/admin/_images/create_public_share-1.png share/owncloud/core/doc/admin/_images/create_public_share-10.png -share/owncloud/core/doc/admin/_images/create_public_share-2.png -share/owncloud/core/doc/admin/_images/create_public_share-3.png -share/owncloud/core/doc/admin/_images/create_public_share-4.png -share/owncloud/core/doc/admin/_images/create_public_share-5.png share/owncloud/core/doc/admin/_images/create_public_share-6.png -share/owncloud/core/doc/admin/_images/create_public_share-7.png share/owncloud/core/doc/admin/_images/create_public_share-8.png share/owncloud/core/doc/admin/_images/create_public_share-9.png +share/owncloud/core/doc/admin/_images/deprecs-1.png +share/owncloud/core/doc/admin/_images/deprecs-2.png +share/owncloud/core/doc/admin/_images/deprecs-3.png share/owncloud/core/doc/admin/_images/documents_app_enable.png share/owncloud/core/doc/admin/_images/documents_apply_test.png share/owncloud/core/doc/admin/_images/dropbox-allowshare.png @@ -8486,11 +8733,12 @@ share/owncloud/core/doc/admin/_images/dropbox-app.png share/owncloud/core/doc/admin/_images/dropbox-configapp.png share/owncloud/core/doc/admin/_images/dropbox-oc.png share/owncloud/core/doc/admin/_images/dropbox.png -share/owncloud/core/doc/admin/_images/enable_app.png +share/owncloud/core/doc/admin/_images/enable-app.png share/owncloud/core/doc/admin/_images/encryption1.png share/owncloud/core/doc/admin/_images/encryption10.png share/owncloud/core/doc/admin/_images/encryption12.png share/owncloud/core/doc/admin/_images/encryption14.png +share/owncloud/core/doc/admin/_images/encryption15.png share/owncloud/core/doc/admin/_images/encryption3.png share/owncloud/core/doc/admin/_images/encryption7.png share/owncloud/core/doc/admin/_images/encryption8.png @@ -8500,7 +8748,10 @@ share/owncloud/core/doc/admin/_images/external-sites-2.png share/owncloud/core/doc/admin/_images/external-sites-3.png share/owncloud/core/doc/admin/_images/external-sites-4.png share/owncloud/core/doc/admin/_images/external-sites-5.png -share/owncloud/core/doc/admin/_images/federated-sharing.png +share/owncloud/core/doc/admin/_images/federation-0.png +share/owncloud/core/doc/admin/_images/federation-1.png +share/owncloud/core/doc/admin/_images/federation-2.png +share/owncloud/core/doc/admin/_images/federation-3.png share/owncloud/core/doc/admin/_images/files-drop-1.png share/owncloud/core/doc/admin/_images/files-drop-2.png share/owncloud/core/doc/admin/_images/files-drop-3.png @@ -8508,6 +8759,9 @@ share/owncloud/core/doc/admin/_images/files-drop-4.png share/owncloud/core/doc/admin/_images/files-drop-5.png share/owncloud/core/doc/admin/_images/files-drop-6.png share/owncloud/core/doc/admin/_images/files-drop-7.png +share/owncloud/core/doc/admin/_images/firewall-1.png +share/owncloud/core/doc/admin/_images/firewall-2.png +share/owncloud/core/doc/admin/_images/firewall-3.png share/owncloud/core/doc/admin/_images/ftp.png share/owncloud/core/doc/admin/_images/google-drive.png share/owncloud/core/doc/admin/_images/google-drive1.png @@ -8526,30 +8780,6 @@ share/owncloud/core/doc/admin/_images/install-wizard-a.png share/owncloud/core/doc/admin/_images/install-wizard-a1.png share/owncloud/core/doc/admin/_images/install-wizard-a2.png share/owncloud/core/doc/admin/_images/install-wizard-a4.png -share/owncloud/core/doc/admin/_images/ios-p12-2.png -share/owncloud/core/doc/admin/_images/ios-p12-3.png -share/owncloud/core/doc/admin/_images/ios-p12-4.png -share/owncloud/core/doc/admin/_images/ios-p12-5.png -share/owncloud/core/doc/admin/_images/ios-p12-6.png -share/owncloud/core/doc/admin/_images/ios-p12.png -share/owncloud/core/doc/admin/_images/ios-publish-10.png -share/owncloud/core/doc/admin/_images/ios-publish-11.png -share/owncloud/core/doc/admin/_images/ios-publish-12.png -share/owncloud/core/doc/admin/_images/ios-publish-13.png -share/owncloud/core/doc/admin/_images/ios-publish-14.png -share/owncloud/core/doc/admin/_images/ios-publish-15.png -share/owncloud/core/doc/admin/_images/ios-publish-2.png -share/owncloud/core/doc/admin/_images/ios-publish-3.png -share/owncloud/core/doc/admin/_images/ios-publish-4.png -share/owncloud/core/doc/admin/_images/ios-publish-5.png -share/owncloud/core/doc/admin/_images/ios-publish-6.png -share/owncloud/core/doc/admin/_images/ios-publish-7.png -share/owncloud/core/doc/admin/_images/ios-publish-8.png -share/owncloud/core/doc/admin/_images/ios-publish-9.png -share/owncloud/core/doc/admin/_images/ios-publish.png -share/owncloud/core/doc/admin/_images/itunes-udid-3.png -share/owncloud/core/doc/admin/_images/itunes-udid-4.png -share/owncloud/core/doc/admin/_images/itunes-udid.png share/owncloud/core/doc/admin/_images/jive_2.png share/owncloud/core/doc/admin/_images/jive_config.png share/owncloud/core/doc/admin/_images/ldap-advanced-1-connection.png @@ -8568,50 +8798,15 @@ share/owncloud/core/doc/admin/_images/ldaphome-4.png share/owncloud/core/doc/admin/_images/ldaphome-5.png share/owncloud/core/doc/admin/_images/ldaphome-6.png share/owncloud/core/doc/admin/_images/local.png +share/owncloud/core/doc/admin/_images/logging-1.png +share/owncloud/core/doc/admin/_images/logging-3.png share/owncloud/core/doc/admin/_images/lucene-search-enable.png share/owncloud/core/doc/admin/_images/lucene-search-user.png -share/owncloud/core/doc/admin/_images/mac-1.png -share/owncloud/core/doc/admin/_images/mac-2.png -share/owncloud/core/doc/admin/_images/mac-3.png -share/owncloud/core/doc/admin/_images/mac-4.png -share/owncloud/core/doc/admin/_images/mac-5.png -share/owncloud/core/doc/admin/_images/mac-6.png -share/owncloud/core/doc/admin/_images/mac-7.png share/owncloud/core/doc/admin/_images/mount_options.png share/owncloud/core/doc/admin/_images/oc_admin_app_page.png share/owncloud/core/doc/admin/_images/oracle-1.png share/owncloud/core/doc/admin/_images/ownbrander-1.png share/owncloud/core/doc/admin/_images/ownbrander-11.png -share/owncloud/core/doc/admin/_images/ownbrander-110.png -share/owncloud/core/doc/admin/_images/ownbrander-12.png -share/owncloud/core/doc/admin/_images/ownbrander-13.png -share/owncloud/core/doc/admin/_images/ownbrander-131.png -share/owncloud/core/doc/admin/_images/ownbrander-14.png -share/owncloud/core/doc/admin/_images/ownbrander-15.png -share/owncloud/core/doc/admin/_images/ownbrander-16.png -share/owncloud/core/doc/admin/_images/ownbrander-17.png -share/owncloud/core/doc/admin/_images/ownbrander-18.png -share/owncloud/core/doc/admin/_images/ownbrander-19.png -share/owncloud/core/doc/admin/_images/ownbrander-2.png -share/owncloud/core/doc/admin/_images/ownbrander-20.png -share/owncloud/core/doc/admin/_images/ownbrander-21.png -share/owncloud/core/doc/admin/_images/ownbrander-22.png -share/owncloud/core/doc/admin/_images/ownbrander-23.png -share/owncloud/core/doc/admin/_images/ownbrander-24.png -share/owncloud/core/doc/admin/_images/ownbrander-25.png -share/owncloud/core/doc/admin/_images/ownbrander-26.png -share/owncloud/core/doc/admin/_images/ownbrander-27.png -share/owncloud/core/doc/admin/_images/ownbrander-28.png -share/owncloud/core/doc/admin/_images/ownbrander-29.png -share/owncloud/core/doc/admin/_images/ownbrander-3.png -share/owncloud/core/doc/admin/_images/ownbrander-30.png -share/owncloud/core/doc/admin/_images/ownbrander-31.png -share/owncloud/core/doc/admin/_images/ownbrander-32.png -share/owncloud/core/doc/admin/_images/ownbrander-4.png -share/owncloud/core/doc/admin/_images/ownbrander-5.png -share/owncloud/core/doc/admin/_images/ownbrander-6.png -share/owncloud/core/doc/admin/_images/ownbrander-7.png -share/owncloud/core/doc/admin/_images/ownbrander-8.png share/owncloud/core/doc/admin/_images/phpinfo.png share/owncloud/core/doc/admin/_images/preview_images.png share/owncloud/core/doc/admin/_images/scaling-1.png @@ -8622,6 +8817,7 @@ share/owncloud/core/doc/admin/_images/scaling-5.png share/owncloud/core/doc/admin/_images/security-setup-warning-1.png share/owncloud/core/doc/admin/_images/sharepoint-drive-config.png share/owncloud/core/doc/admin/_images/sharing-files-1.png +share/owncloud/core/doc/admin/_images/sharing-files-2.png share/owncloud/core/doc/admin/_images/shib-gui1.png share/owncloud/core/doc/admin/_images/shib-gui4.png share/owncloud/core/doc/admin/_images/shib-gui5.png @@ -8636,18 +8832,8 @@ share/owncloud/core/doc/admin/_images/smtp-config-wizard.png share/owncloud/core/doc/admin/_images/ucsint.png share/owncloud/core/doc/admin/_images/ucsint1.png share/owncloud/core/doc/admin/_images/ucsint2.png -share/owncloud/core/doc/admin/_images/updater-1.png -share/owncloud/core/doc/admin/_images/updater-10.png -share/owncloud/core/doc/admin/_images/updater-11.png -share/owncloud/core/doc/admin/_images/updater-2.png -share/owncloud/core/doc/admin/_images/updater-3.png -share/owncloud/core/doc/admin/_images/updater-7.png -share/owncloud/core/doc/admin/_images/updater-8.png -share/owncloud/core/doc/admin/_images/updater-9.png share/owncloud/core/doc/admin/_images/upgrade-1.png share/owncloud/core/doc/admin/_images/upgrade-2.png -share/owncloud/core/doc/admin/_images/upgrade-3.png -share/owncloud/core/doc/admin/_images/upgrade-notifier.png share/owncloud/core/doc/admin/_images/user_mounts.png share/owncloud/core/doc/admin/_images/users-config-1.png share/owncloud/core/doc/admin/_images/users-config-2.png @@ -8658,7 +8844,7 @@ share/owncloud/core/doc/admin/_images/webbrander-1.png share/owncloud/core/doc/admin/_images/webdav.png share/owncloud/core/doc/admin/_images/wnd-1.png share/owncloud/core/doc/admin/_images/wnd-2.png -share/owncloud/core/doc/admin/_images/wnd-3.jpg +share/owncloud/core/doc/admin/_images/wnd-3.png share/owncloud/core/doc/admin/_sources/configuration_database/db_conversion.txt share/owncloud/core/doc/admin/_sources/configuration_database/index.txt share/owncloud/core/doc/admin/_sources/configuration_database/linux_database_configuration.txt @@ -8715,6 +8901,7 @@ share/owncloud/core/doc/admin/_sources/configuration_server/security_setup_warni share/owncloud/core/doc/admin/_sources/configuration_server/thirdparty_php_configuration.txt share/owncloud/core/doc/admin/_sources/configuration_user/index.txt share/owncloud/core/doc/admin/_sources/configuration_user/reset_admin_password.txt +share/owncloud/core/doc/admin/_sources/configuration_user/reset_user_password.txt share/owncloud/core/doc/admin/_sources/configuration_user/user_auth_ftp_smb_imap.txt share/owncloud/core/doc/admin/_sources/configuration_user/user_auth_ldap.txt share/owncloud/core/doc/admin/_sources/configuration_user/user_auth_ldap_cleanup.txt @@ -8724,7 +8911,6 @@ share/owncloud/core/doc/admin/_sources/contents.txt share/owncloud/core/doc/admin/_sources/enterprise_clients/creating_branded_apps.txt share/owncloud/core/doc/admin/_sources/enterprise_clients/custom_client_repos.txt share/owncloud/core/doc/admin/_sources/enterprise_clients/index.txt -share/owncloud/core/doc/admin/_sources/enterprise_clients/publishing_android_app.txt share/owncloud/core/doc/admin/_sources/enterprise_external_storage/index.txt share/owncloud/core/doc/admin/_sources/enterprise_external_storage/jive_configuration.txt share/owncloud/core/doc/admin/_sources/enterprise_external_storage/ldap_home_connector_configuration.txt @@ -8733,20 +8919,14 @@ share/owncloud/core/doc/admin/_sources/enterprise_external_storage/sharepoint-in share/owncloud/core/doc/admin/_sources/enterprise_external_storage/windows-network-drive_configuration.txt share/owncloud/core/doc/admin/_sources/enterprise_files_drop/files_drop.txt share/owncloud/core/doc/admin/_sources/enterprise_files_drop/index.txt +share/owncloud/core/doc/admin/_sources/enterprise_firewall/file_firewall.txt +share/owncloud/core/doc/admin/_sources/enterprise_firewall/index.txt share/owncloud/core/doc/admin/_sources/enterprise_installation/index.txt share/owncloud/core/doc/admin/_sources/enterprise_installation/license_keys_installation.txt share/owncloud/core/doc/admin/_sources/enterprise_installation/linux_installation.txt share/owncloud/core/doc/admin/_sources/enterprise_installation/supported_apps_installation.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/index.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app_2.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app_3.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app_4.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app_5.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app_6.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app_7.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app_8.txt -share/owncloud/core/doc/admin/_sources/enterprise_ios_app/publishing_ios_app_9.txt +share/owncloud/core/doc/admin/_sources/enterprise_logging/enterprise_logging_apps.txt +share/owncloud/core/doc/admin/_sources/enterprise_logging/index.txt share/owncloud/core/doc/admin/_sources/enterprise_server_branding/enterprise_server_branding.txt share/owncloud/core/doc/admin/_sources/enterprise_server_branding/index.txt share/owncloud/core/doc/admin/_sources/enterprise_user_management/index.txt @@ -8755,6 +8935,7 @@ share/owncloud/core/doc/admin/_sources/index.txt share/owncloud/core/doc/admin/_sources/installation/appliance_installation.txt share/owncloud/core/doc/admin/_sources/installation/apps_management_installation.txt share/owncloud/core/doc/admin/_sources/installation/command_line_installation.txt +share/owncloud/core/doc/admin/_sources/installation/deployment_recommendations.txt share/owncloud/core/doc/admin/_sources/installation/hiawatha_configuration.txt share/owncloud/core/doc/admin/_sources/installation/index.txt share/owncloud/core/doc/admin/_sources/installation/installation_wizard.txt @@ -8768,6 +8949,8 @@ share/owncloud/core/doc/admin/_sources/installation/source_installation.txt share/owncloud/core/doc/admin/_sources/installation/system_requirements.txt share/owncloud/core/doc/admin/_sources/installation/ucs_installation.txt share/owncloud/core/doc/admin/_sources/installation/yaws_configuration.txt +share/owncloud/core/doc/admin/_sources/issues/code_signing.txt +share/owncloud/core/doc/admin/_sources/issues/general_troubleshooting.txt share/owncloud/core/doc/admin/_sources/issues/index.txt share/owncloud/core/doc/admin/_sources/maintenance/backup.txt share/owncloud/core/doc/admin/_sources/maintenance/enable_maintenance.txt @@ -8801,6 +8984,7 @@ share/owncloud/core/doc/admin/_static/img/glyphicons-halflings-white.png share/owncloud/core/doc/admin/_static/img/glyphicons-halflings.png share/owncloud/core/doc/admin/_static/img/note.svg share/owncloud/core/doc/admin/_static/img/todo.svg +share/owncloud/core/doc/admin/_static/jquery-1.11.1.js share/owncloud/core/doc/admin/_static/jquery.js share/owncloud/core/doc/admin/_static/logo-blue.pdf share/owncloud/core/doc/admin/_static/logo-blue.png @@ -8814,6 +8998,7 @@ share/owncloud/core/doc/admin/_static/social/googleplus.png share/owncloud/core/doc/admin/_static/social/rss.png share/owncloud/core/doc/admin/_static/social/twitterround.png share/owncloud/core/doc/admin/_static/style.css +share/owncloud/core/doc/admin/_static/underscore-1.3.1.js share/owncloud/core/doc/admin/_static/underscore.js share/owncloud/core/doc/admin/_static/up-pressed.png share/owncloud/core/doc/admin/_static/up.png @@ -8874,6 +9059,7 @@ share/owncloud/core/doc/admin/configuration_server/security_setup_warnings.html share/owncloud/core/doc/admin/configuration_server/thirdparty_php_configuration.html share/owncloud/core/doc/admin/configuration_user/index.html share/owncloud/core/doc/admin/configuration_user/reset_admin_password.html +share/owncloud/core/doc/admin/configuration_user/reset_user_password.html share/owncloud/core/doc/admin/configuration_user/user_auth_ftp_smb_imap.html share/owncloud/core/doc/admin/configuration_user/user_auth_ldap.html share/owncloud/core/doc/admin/configuration_user/user_auth_ldap_cleanup.html @@ -8883,7 +9069,6 @@ share/owncloud/core/doc/admin/contents.html share/owncloud/core/doc/admin/enterprise_clients/creating_branded_apps.html share/owncloud/core/doc/admin/enterprise_clients/custom_client_repos.html share/owncloud/core/doc/admin/enterprise_clients/index.html -share/owncloud/core/doc/admin/enterprise_clients/publishing_android_app.html share/owncloud/core/doc/admin/enterprise_external_storage/index.html share/owncloud/core/doc/admin/enterprise_external_storage/jive_configuration.html share/owncloud/core/doc/admin/enterprise_external_storage/ldap_home_connector_configuration.html @@ -8892,20 +9077,14 @@ share/owncloud/core/doc/admin/enterprise_external_storage/sharepoint-integration share/owncloud/core/doc/admin/enterprise_external_storage/windows-network-drive_configuration.html share/owncloud/core/doc/admin/enterprise_files_drop/files_drop.html share/owncloud/core/doc/admin/enterprise_files_drop/index.html +share/owncloud/core/doc/admin/enterprise_firewall/file_firewall.html +share/owncloud/core/doc/admin/enterprise_firewall/index.html share/owncloud/core/doc/admin/enterprise_installation/index.html share/owncloud/core/doc/admin/enterprise_installation/license_keys_installation.html share/owncloud/core/doc/admin/enterprise_installation/linux_installation.html share/owncloud/core/doc/admin/enterprise_installation/supported_apps_installation.html -share/owncloud/core/doc/admin/enterprise_ios_app/index.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app_2.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app_3.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app_4.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app_5.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app_6.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app_7.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app_8.html -share/owncloud/core/doc/admin/enterprise_ios_app/publishing_ios_app_9.html +share/owncloud/core/doc/admin/enterprise_logging/enterprise_logging_apps.html +share/owncloud/core/doc/admin/enterprise_logging/index.html share/owncloud/core/doc/admin/enterprise_server_branding/enterprise_server_branding.html share/owncloud/core/doc/admin/enterprise_server_branding/index.html share/owncloud/core/doc/admin/enterprise_user_management/index.html @@ -8915,6 +9094,7 @@ share/owncloud/core/doc/admin/index.html share/owncloud/core/doc/admin/installation/appliance_installation.html share/owncloud/core/doc/admin/installation/apps_management_installation.html share/owncloud/core/doc/admin/installation/command_line_installation.html +share/owncloud/core/doc/admin/installation/deployment_recommendations.html share/owncloud/core/doc/admin/installation/hiawatha_configuration.html share/owncloud/core/doc/admin/installation/index.html share/owncloud/core/doc/admin/installation/installation_wizard.html @@ -8928,6 +9108,8 @@ share/owncloud/core/doc/admin/installation/source_installation.html share/owncloud/core/doc/admin/installation/system_requirements.html share/owncloud/core/doc/admin/installation/ucs_installation.html share/owncloud/core/doc/admin/installation/yaws_configuration.html +share/owncloud/core/doc/admin/issues/code_signing.html +share/owncloud/core/doc/admin/issues/general_troubleshooting.html share/owncloud/core/doc/admin/issues/index.html share/owncloud/core/doc/admin/maintenance/backup.html share/owncloud/core/doc/admin/maintenance/enable_maintenance.html @@ -8980,9 +9162,6 @@ share/owncloud/core/doc/user/_images/create_public_share-6.png share/owncloud/core/doc/user/_images/create_public_share-8.png share/owncloud/core/doc/user/_images/create_public_share-9.png share/owncloud/core/doc/user/_images/direct-share-1.png -share/owncloud/core/doc/user/_images/direct-share-2.png -share/owncloud/core/doc/user/_images/direct-share-3.png -share/owncloud/core/doc/user/_images/direct-share-4.png share/owncloud/core/doc/user/_images/documents_personal_settings.png share/owncloud/core/doc/user/_images/download.png share/owncloud/core/doc/user/_images/email_address_personal_settings.png @@ -9003,10 +9182,14 @@ share/owncloud/core/doc/user/_images/files_page-3.png share/owncloud/core/doc/user/_images/files_page-4.png share/owncloud/core/doc/user/_images/files_page-5.png share/owncloud/core/doc/user/_images/files_page-6.png +share/owncloud/core/doc/user/_images/files_page-7.png +share/owncloud/core/doc/user/_images/files_page-8.png share/owncloud/core/doc/user/_images/files_page.png share/owncloud/core/doc/user/_images/files_page1.png share/owncloud/core/doc/user/_images/files_versioning.png share/owncloud/core/doc/user/_images/full_name.png +share/owncloud/core/doc/user/_images/gallery-1.png +share/owncloud/core/doc/user/_images/gallery-2.png share/owncloud/core/doc/user/_images/gear.png share/owncloud/core/doc/user/_images/kdes.png share/owncloud/core/doc/user/_images/kdes1.png @@ -9050,6 +9233,7 @@ share/owncloud/core/doc/user/_sources/files/desktop_mobile_sync.txt share/owncloud/core/doc/user/_sources/files/encrypting_files.txt share/owncloud/core/doc/user/_sources/files/federated_cloud_sharing.txt share/owncloud/core/doc/user/_sources/files/file_drop.txt +share/owncloud/core/doc/user/_sources/files/gallery_app.txt share/owncloud/core/doc/user/_sources/files/index.txt share/owncloud/core/doc/user/_sources/files/large_file_upload.txt share/owncloud/core/doc/user/_sources/files/quota.txt @@ -9083,6 +9267,7 @@ share/owncloud/core/doc/user/_static/img/glyphicons-halflings-white.png share/owncloud/core/doc/user/_static/img/glyphicons-halflings.png share/owncloud/core/doc/user/_static/img/note.svg share/owncloud/core/doc/user/_static/img/todo.svg +share/owncloud/core/doc/user/_static/jquery-1.11.1.js share/owncloud/core/doc/user/_static/jquery.js share/owncloud/core/doc/user/_static/logo-blue.pdf share/owncloud/core/doc/user/_static/logo-blue.png @@ -9096,6 +9281,7 @@ share/owncloud/core/doc/user/_static/social/googleplus.png share/owncloud/core/doc/user/_static/social/rss.png share/owncloud/core/doc/user/_static/social/twitterround.png share/owncloud/core/doc/user/_static/style.css +share/owncloud/core/doc/user/_static/underscore-1.3.1.js share/owncloud/core/doc/user/_static/underscore.js share/owncloud/core/doc/user/_static/up-pressed.png share/owncloud/core/doc/user/_static/up.png @@ -9113,6 +9299,7 @@ share/owncloud/core/doc/user/files/desktop_mobile_sync.html share/owncloud/core/doc/user/files/encrypting_files.html share/owncloud/core/doc/user/files/federated_cloud_sharing.html share/owncloud/core/doc/user/files/file_drop.html +share/owncloud/core/doc/user/files/gallery_app.html share/owncloud/core/doc/user/files/index.html share/owncloud/core/doc/user/files/large_file_upload.html share/owncloud/core/doc/user/files/quota.html @@ -9144,10 +9331,16 @@ share/owncloud/core/img/actions/caret-dark.png share/owncloud/core/img/actions/caret-dark.svg share/owncloud/core/img/actions/caret.png share/owncloud/core/img/actions/caret.svg +share/owncloud/core/img/actions/checkbox-checked-disabled.png +share/owncloud/core/img/actions/checkbox-checked-disabled.svg share/owncloud/core/img/actions/checkbox-checked-white.png share/owncloud/core/img/actions/checkbox-checked-white.svg share/owncloud/core/img/actions/checkbox-checked.png share/owncloud/core/img/actions/checkbox-checked.svg +share/owncloud/core/img/actions/checkbox-disabled-white.png +share/owncloud/core/img/actions/checkbox-disabled-white.svg +share/owncloud/core/img/actions/checkbox-disabled.png +share/owncloud/core/img/actions/checkbox-disabled.svg share/owncloud/core/img/actions/checkbox-mixed-white.png share/owncloud/core/img/actions/checkbox-mixed-white.svg share/owncloud/core/img/actions/checkbox-mixed.png @@ -9156,16 +9349,22 @@ share/owncloud/core/img/actions/checkbox-white.png share/owncloud/core/img/actions/checkbox-white.svg share/owncloud/core/img/actions/checkbox.png share/owncloud/core/img/actions/checkbox.svg +share/owncloud/core/img/actions/checkmark-color.png +share/owncloud/core/img/actions/checkmark-color.svg share/owncloud/core/img/actions/checkmark-white.png share/owncloud/core/img/actions/checkmark-white.svg share/owncloud/core/img/actions/checkmark.png share/owncloud/core/img/actions/checkmark.svg share/owncloud/core/img/actions/close.png share/owncloud/core/img/actions/close.svg +share/owncloud/core/img/actions/comment.png +share/owncloud/core/img/actions/comment.svg share/owncloud/core/img/actions/confirm.png share/owncloud/core/img/actions/confirm.svg share/owncloud/core/img/actions/delete-hover.png share/owncloud/core/img/actions/delete-hover.svg +share/owncloud/core/img/actions/delete-white.png +share/owncloud/core/img/actions/delete-white.svg share/owncloud/core/img/actions/delete.png share/owncloud/core/img/actions/delete.svg share/owncloud/core/img/actions/details.png @@ -9174,6 +9373,12 @@ share/owncloud/core/img/actions/download.png share/owncloud/core/img/actions/download.svg share/owncloud/core/img/actions/edit.png share/owncloud/core/img/actions/edit.svg +share/owncloud/core/img/actions/error-color.png +share/owncloud/core/img/actions/error-color.svg +share/owncloud/core/img/actions/error-white.png +share/owncloud/core/img/actions/error-white.svg +share/owncloud/core/img/actions/error.png +share/owncloud/core/img/actions/error.svg share/owncloud/core/img/actions/external.png share/owncloud/core/img/actions/external.svg share/owncloud/core/img/actions/history.png @@ -9208,6 +9413,16 @@ share/owncloud/core/img/actions/play.png share/owncloud/core/img/actions/play.svg share/owncloud/core/img/actions/public.png share/owncloud/core/img/actions/public.svg +share/owncloud/core/img/actions/radio-checked-disabled.png +share/owncloud/core/img/actions/radio-checked-disabled.svg +share/owncloud/core/img/actions/radio-checked.png +share/owncloud/core/img/actions/radio-checked.svg +share/owncloud/core/img/actions/radio-disabled.png +share/owncloud/core/img/actions/radio-disabled.svg +share/owncloud/core/img/actions/radio-white.png +share/owncloud/core/img/actions/radio-white.svg +share/owncloud/core/img/actions/radio.png +share/owncloud/core/img/actions/radio.svg share/owncloud/core/img/actions/rename.png share/owncloud/core/img/actions/rename.svg share/owncloud/core/img/actions/search-white.png @@ -9248,6 +9463,8 @@ share/owncloud/core/img/actions/user.png share/owncloud/core/img/actions/user.svg share/owncloud/core/img/actions/view-close.png share/owncloud/core/img/actions/view-close.svg +share/owncloud/core/img/actions/view-download.png +share/owncloud/core/img/actions/view-download.svg share/owncloud/core/img/actions/view-next.png share/owncloud/core/img/actions/view-next.svg share/owncloud/core/img/actions/view-pause.png @@ -9256,13 +9473,16 @@ share/owncloud/core/img/actions/view-play.png share/owncloud/core/img/actions/view-play.svg share/owncloud/core/img/actions/view-previous.png share/owncloud/core/img/actions/view-previous.svg -share/owncloud/core/img/appstore.png +share/owncloud/core/img/appstore.svg share/owncloud/core/img/breadcrumb.png share/owncloud/core/img/breadcrumb.svg +share/owncloud/core/img/default-app-icon.svg share/owncloud/core/img/desktopapp.png share/owncloud/core/img/desktopapp.svg +share/owncloud/core/img/favicon-mask.svg share/owncloud/core/img/favicon-touch.png share/owncloud/core/img/favicon-touch.svg +share/owncloud/core/img/favicon.ico share/owncloud/core/img/favicon.png share/owncloud/core/img/favicon.svg share/owncloud/core/img/filetypes/application-pdf.png @@ -9342,14 +9562,17 @@ share/owncloud/core/img/rating/s7.png share/owncloud/core/img/rating/s8.png share/owncloud/core/img/rating/s9.png share/owncloud/core/js/apps.js -share/owncloud/core/js/avatar.js share/owncloud/core/js/backgroundjobs.js share/owncloud/core/js/compatibility.js share/owncloud/core/js/config.js share/owncloud/core/js/config.php share/owncloud/core/js/core.json share/owncloud/core/js/eventsource.js +share/owncloud/core/js/files/client.js +share/owncloud/core/js/files/fileinfo.js +share/owncloud/core/js/files/iedavclient.js share/owncloud/core/js/installation.js +share/owncloud/core/js/integritycheck-failed-notification.js share/owncloud/core/js/jquery-showpassword.js share/owncloud/core/js/jquery.avatar.js share/owncloud/core/js/jquery.ocdialog.js @@ -9361,12 +9584,14 @@ share/owncloud/core/js/maintenance-check.js share/owncloud/core/js/mimetype.js share/owncloud/core/js/mimetypelist.js share/owncloud/core/js/multiselect.js +share/owncloud/core/js/oc-backbone-webdav.js share/owncloud/core/js/oc-backbone.js share/owncloud/core/js/oc-dialogs.js share/owncloud/core/js/oc-requesttoken.js share/owncloud/core/js/octemplate.js share/owncloud/core/js/placeholder.js share/owncloud/core/js/placeholders.js +share/owncloud/core/js/select2-toggleselect.js share/owncloud/core/js/setup.js share/owncloud/core/js/setupchecks.js share/owncloud/core/js/share.js @@ -9378,19 +9603,29 @@ share/owncloud/core/js/sharedialogshareelistview.js share/owncloud/core/js/sharedialogview.js share/owncloud/core/js/shareitemmodel.js share/owncloud/core/js/singleselect.js +share/owncloud/core/js/systemtags/systemtagmodel.js +share/owncloud/core/js/systemtags/systemtags.js +share/owncloud/core/js/systemtags/systemtagscollection.js +share/owncloud/core/js/systemtags/systemtagsinputfield.js +share/owncloud/core/js/systemtags/systemtagsmappingcollection.js share/owncloud/core/js/tags.js share/owncloud/core/js/tests/lib/sinon-1.15.4.js share/owncloud/core/js/tests/specHelper.js share/owncloud/core/js/tests/specs/appsSpec.js share/owncloud/core/js/tests/specs/coreSpec.js +share/owncloud/core/js/tests/specs/files/clientSpec.js share/owncloud/core/js/tests/specs/jquery.avatarSpec.js share/owncloud/core/js/tests/specs/l10nSpec.js share/owncloud/core/js/tests/specs/mimeTypeSpec.js +share/owncloud/core/js/tests/specs/oc-backbone-webdavSpec.js share/owncloud/core/js/tests/specs/setupchecksSpec.js share/owncloud/core/js/tests/specs/shareSpec.js +share/owncloud/core/js/tests/specs/sharedialogshareelistview.js share/owncloud/core/js/tests/specs/sharedialogviewSpec.js share/owncloud/core/js/tests/specs/shareitemmodelSpec.js -share/owncloud/core/js/update-notification.js +share/owncloud/core/js/tests/specs/systemtags/systemtagsSpec.js +share/owncloud/core/js/tests/specs/systemtags/systemtagscollectionSpec.js +share/owncloud/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js share/owncloud/core/js/update.js share/owncloud/core/js/visitortimezone.js share/owncloud/core/l10n/ach.js @@ -9608,24 +9843,18 @@ share/owncloud/core/l10n/zh_HK.js share/owncloud/core/l10n/zh_HK.json share/owncloud/core/l10n/zh_TW.js share/owncloud/core/l10n/zh_TW.json -share/owncloud/core/lostpassword/controller/lostcontroller.php -share/owncloud/core/lostpassword/css/lostpassword.css -share/owncloud/core/lostpassword/css/resetpassword.css -share/owncloud/core/lostpassword/templates/email.php -share/owncloud/core/lostpassword/templates/resetpassword.php share/owncloud/core/register_command.php share/owncloud/core/routes.php share/owncloud/core/search/ajax/search.php share/owncloud/core/search/css/results.css share/owncloud/core/search/js/search.js share/owncloud/core/search/templates/part.results.html -share/owncloud/core/setup/controller.php share/owncloud/core/shipped.json +share/owncloud/core/signature.json share/owncloud/core/skeleton/Documents/Example.odt share/owncloud/core/skeleton/Photos/Paris.jpg share/owncloud/core/skeleton/Photos/San Francisco.jpg share/owncloud/core/skeleton/Photos/Squirrel.jpg -share/owncloud/core/skeleton/ownCloud_User_Manual.pdf share/owncloud/core/strings.php share/owncloud/core/tags/controller.php share/owncloud/core/templates/403.php @@ -9639,11 +9868,15 @@ share/owncloud/core/templates/filetemplates/template.odp share/owncloud/core/templates/filetemplates/template.ods share/owncloud/core/templates/filetemplates/template.odt share/owncloud/core/templates/installation.php +share/owncloud/core/templates/internalaltmail.php +share/owncloud/core/templates/internalmail.php share/owncloud/core/templates/layout.base.php share/owncloud/core/templates/layout.guest.php share/owncloud/core/templates/layout.noscript.warning.php share/owncloud/core/templates/layout.user.php share/owncloud/core/templates/login.php +share/owncloud/core/templates/lostpassword/email.php +share/owncloud/core/templates/lostpassword/resetpassword.php share/owncloud/core/templates/mail.php share/owncloud/core/templates/message.html share/owncloud/core/templates/singleuser.user.php @@ -9651,13 +9884,24 @@ share/owncloud/core/templates/tags.html share/owncloud/core/templates/untrustedDomain.php share/owncloud/core/templates/update.admin.php share/owncloud/core/templates/update.user.php -share/owncloud/core/user/usercontroller.php +share/owncloud/core/vendor/.gitignore share/owncloud/core/vendor/backbone/.bower.json share/owncloud/core/vendor/backbone/LICENSE share/owncloud/core/vendor/backbone/backbone.js +share/owncloud/core/vendor/base64/.bower.json +share/owncloud/core/vendor/base64/LICENSE +share/owncloud/core/vendor/base64/base64.js share/owncloud/core/vendor/blueimp-md5/.bower.json share/owncloud/core/vendor/blueimp-md5/js/md5.js share/owncloud/core/vendor/bootstrap/js/tooltip.js +share/owncloud/core/vendor/davclient.js/LICENSE +share/owncloud/core/vendor/davclient.js/lib/client.js +share/owncloud/core/vendor/es6-promise/.bower.json +share/owncloud/core/vendor/es6-promise/.npmignore +share/owncloud/core/vendor/es6-promise/.release.json +share/owncloud/core/vendor/es6-promise/.spmignore +share/owncloud/core/vendor/es6-promise/LICENSE +share/owncloud/core/vendor/es6-promise/dist/es6-promise.js share/owncloud/core/vendor/handlebars/.bower.json share/owncloud/core/vendor/handlebars/handlebars.js share/owncloud/core/vendor/jcrop/.bower.json @@ -9708,7 +9952,8 @@ share/owncloud/cron.php share/owncloud/db_structure.xml share/owncloud/index.html share/owncloud/index.php -share/owncloud/indie.json +share/owncloud/l10n/.gitignore +share/owncloud/l10n/.tx/config share/owncloud/l10n/l10n.pl share/owncloud/l10n/rm-old.sh share/owncloud/lib/autoloader.php @@ -9957,7 +10202,11 @@ share/owncloud/lib/private/appframework/http/output.php share/owncloud/lib/private/appframework/http/request.php share/owncloud/lib/private/appframework/middleware/middlewaredispatcher.php share/owncloud/lib/private/appframework/middleware/security/corsmiddleware.php -share/owncloud/lib/private/appframework/middleware/security/securityexception.php +share/owncloud/lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php +share/owncloud/lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php +share/owncloud/lib/private/appframework/middleware/security/exceptions/notadminexception.php +share/owncloud/lib/private/appframework/middleware/security/exceptions/notloggedinexception.php +share/owncloud/lib/private/appframework/middleware/security/exceptions/securityexception.php share/owncloud/lib/private/appframework/middleware/security/securitymiddleware.php share/owncloud/lib/private/appframework/middleware/sessionmiddleware.php share/owncloud/lib/private/appframework/routing/routeactionhandler.php @@ -9969,7 +10218,6 @@ share/owncloud/lib/private/apphelper.php share/owncloud/lib/private/archive.php share/owncloud/lib/private/archive/tar.php share/owncloud/lib/private/archive/zip.php -share/owncloud/lib/private/arrayparser.php share/owncloud/lib/private/avatar.php share/owncloud/lib/private/avatarmanager.php share/owncloud/lib/private/backgroundjob/job.php @@ -9978,6 +10226,7 @@ share/owncloud/lib/private/backgroundjob/legacy/queuedjob.php share/owncloud/lib/private/backgroundjob/legacy/regularjob.php share/owncloud/lib/private/backgroundjob/queuedjob.php share/owncloud/lib/private/backgroundjob/timedjob.php +share/owncloud/lib/private/cache/cappedmemorycache.php share/owncloud/lib/private/cache/file.php share/owncloud/lib/private/capabilitiesmanager.php share/owncloud/lib/private/command/asyncbus.php @@ -9986,36 +10235,12 @@ share/owncloud/lib/private/command/closurejob.php share/owncloud/lib/private/command/commandjob.php share/owncloud/lib/private/command/fileaccess.php share/owncloud/lib/private/command/queuebus.php +share/owncloud/lib/private/comments/comment.php +share/owncloud/lib/private/comments/manager.php +share/owncloud/lib/private/comments/managerfactory.php share/owncloud/lib/private/config.php -share/owncloud/lib/private/connector/sabre/appenabledplugin.php -share/owncloud/lib/private/connector/sabre/auth.php -share/owncloud/lib/private/connector/sabre/blocklegacyclientplugin.php -share/owncloud/lib/private/connector/sabre/copyetagheaderplugin.php -share/owncloud/lib/private/connector/sabre/custompropertiesbackend.php -share/owncloud/lib/private/connector/sabre/directory.php -share/owncloud/lib/private/connector/sabre/dummygetresponseplugin.php -share/owncloud/lib/private/connector/sabre/exception/entitytoolarge.php -share/owncloud/lib/private/connector/sabre/exception/filelocked.php -share/owncloud/lib/private/connector/sabre/exception/invalidpath.php -share/owncloud/lib/private/connector/sabre/exception/unsupportedmediatype.php -share/owncloud/lib/private/connector/sabre/exceptionloggerplugin.php -share/owncloud/lib/private/connector/sabre/fakelockerplugin.php -share/owncloud/lib/private/connector/sabre/file.php -share/owncloud/lib/private/connector/sabre/filesplugin.php -share/owncloud/lib/private/connector/sabre/listenerplugin.php -share/owncloud/lib/private/connector/sabre/lockplugin.php -share/owncloud/lib/private/connector/sabre/maintenanceplugin.php -share/owncloud/lib/private/connector/sabre/node.php -share/owncloud/lib/private/connector/sabre/objecttree.php -share/owncloud/lib/private/connector/sabre/principal.php -share/owncloud/lib/private/connector/sabre/quotaplugin.php -share/owncloud/lib/private/connector/sabre/server.php -share/owncloud/lib/private/connector/sabre/serverfactory.php -share/owncloud/lib/private/connector/sabre/taglist.php -share/owncloud/lib/private/connector/sabre/tagsplugin.php share/owncloud/lib/private/console/application.php share/owncloud/lib/private/console/timestampformatter.php -share/owncloud/lib/private/contacts/localaddressbook.php share/owncloud/lib/private/contactsmanager.php share/owncloud/lib/private/databaseexception.php share/owncloud/lib/private/databasesetupexception.php @@ -10027,7 +10252,6 @@ share/owncloud/lib/private/db/adaptermysql.php share/owncloud/lib/private/db/adapteroci8.php share/owncloud/lib/private/db/adapterpgsql.php share/owncloud/lib/private/db/adaptersqlite.php -share/owncloud/lib/private/db/adaptersqlsrv.php share/owncloud/lib/private/db/connection.php share/owncloud/lib/private/db/connectionfactory.php share/owncloud/lib/private/db/mdb2schemamanager.php @@ -10042,7 +10266,10 @@ share/owncloud/lib/private/db/oracleconnection.php share/owncloud/lib/private/db/oraclemigrator.php share/owncloud/lib/private/db/pgsqltools.php share/owncloud/lib/private/db/querybuilder/compositeexpression.php -share/owncloud/lib/private/db/querybuilder/expressionbuilder.php +share/owncloud/lib/private/db/querybuilder/expressionbuilder/expressionbuilder.php +share/owncloud/lib/private/db/querybuilder/expressionbuilder/mysqlexpressionbuilder.php +share/owncloud/lib/private/db/querybuilder/expressionbuilder/ociexpressionbuilder.php +share/owncloud/lib/private/db/querybuilder/expressionbuilder/pgsqlexpressionbuilder.php share/owncloud/lib/private/db/querybuilder/literal.php share/owncloud/lib/private/db/querybuilder/parameter.php share/owncloud/lib/private/db/querybuilder/querybuilder.php @@ -10077,8 +10304,11 @@ share/owncloud/lib/private/eventsource.php share/owncloud/lib/private/filechunking.php share/owncloud/lib/private/files.php share/owncloud/lib/private/files/cache/cache.php -share/owncloud/lib/private/files/cache/changepropagator.php +share/owncloud/lib/private/files/cache/cacheentry.php share/owncloud/lib/private/files/cache/homecache.php +share/owncloud/lib/private/files/cache/homepropagator.php +share/owncloud/lib/private/files/cache/movefromcachetrait.php +share/owncloud/lib/private/files/cache/propagator.php share/owncloud/lib/private/files/cache/scanner.php share/owncloud/lib/private/files/cache/storage.php share/owncloud/lib/private/files/cache/updater.php @@ -10086,7 +10316,10 @@ share/owncloud/lib/private/files/cache/watcher.php share/owncloud/lib/private/files/cache/wrapper/cachejail.php share/owncloud/lib/private/files/cache/wrapper/cachepermissionsmask.php share/owncloud/lib/private/files/cache/wrapper/cachewrapper.php +share/owncloud/lib/private/files/config/cachedmountinfo.php share/owncloud/lib/private/files/config/mountprovidercollection.php +share/owncloud/lib/private/files/config/usermountcache.php +share/owncloud/lib/private/files/config/usermountcachelistener.php share/owncloud/lib/private/files/fileinfo.php share/owncloud/lib/private/files/filesystem.php share/owncloud/lib/private/files/mount/manager.php @@ -10156,12 +10389,19 @@ share/owncloud/lib/private/http/client/response.php share/owncloud/lib/private/httphelper.php share/owncloud/lib/private/image.php share/owncloud/lib/private/installer.php +share/owncloud/lib/private/integritycheck/checker.php +share/owncloud/lib/private/integritycheck/exceptions/invalidsignatureexception.php +share/owncloud/lib/private/integritycheck/helpers/applocator.php +share/owncloud/lib/private/integritycheck/helpers/environmenthelper.php +share/owncloud/lib/private/integritycheck/helpers/fileaccesshelper.php +share/owncloud/lib/private/integritycheck/iterator/excludefilebynamefilteriterator.php +share/owncloud/lib/private/integritycheck/iterator/excludefoldersbypathfilteriterator.php share/owncloud/lib/private/json.php -share/owncloud/lib/private/l10n.php share/owncloud/lib/private/l10n/factory.php +share/owncloud/lib/private/l10n/l10n.php share/owncloud/lib/private/l10n/string.php share/owncloud/lib/private/largefilehelper.php -share/owncloud/lib/private/legacy/config.php +share/owncloud/lib/private/legacy/l10n.php share/owncloud/lib/private/lock/abstractlockingprovider.php share/owncloud/lib/private/lock/dblockingprovider.php share/owncloud/lib/private/lock/memcachelockingprovider.php @@ -10190,11 +10430,6 @@ share/owncloud/lib/private/naturalsort_defaultcollator.php share/owncloud/lib/private/navigationmanager.php share/owncloud/lib/private/needsupdateexception.php share/owncloud/lib/private/notification/action.php -share/owncloud/lib/private/notification/iaction.php -share/owncloud/lib/private/notification/iapp.php -share/owncloud/lib/private/notification/imanager.php -share/owncloud/lib/private/notification/inotification.php -share/owncloud/lib/private/notification/inotifier.php share/owncloud/lib/private/notification/manager.php share/owncloud/lib/private/notification/notification.php share/owncloud/lib/private/notsquareexception.php @@ -10235,6 +10470,23 @@ share/owncloud/lib/private/preview/txt.php share/owncloud/lib/private/preview/xbitmap.php share/owncloud/lib/private/previewmanager.php share/owncloud/lib/private/repair.php +share/owncloud/lib/private/repair/assetcache.php +share/owncloud/lib/private/repair/cleantags.php +share/owncloud/lib/private/repair/collation.php +share/owncloud/lib/private/repair/dropoldjobs.php +share/owncloud/lib/private/repair/dropoldtables.php +share/owncloud/lib/private/repair/filletags.php +share/owncloud/lib/private/repair/innodb.php +share/owncloud/lib/private/repair/oldgroupmembershipshares.php +share/owncloud/lib/private/repair/preview.php +share/owncloud/lib/private/repair/removegetetagentries.php +share/owncloud/lib/private/repair/repairinvalidshares.php +share/owncloud/lib/private/repair/repairlegacystorages.php +share/owncloud/lib/private/repair/repairmimetypes.php +share/owncloud/lib/private/repair/searchlucenetables.php +share/owncloud/lib/private/repair/sqliteautoincrement.php +share/owncloud/lib/private/repair/updatecertificatestore.php +share/owncloud/lib/private/repair/updateoutdatedocsids.php share/owncloud/lib/private/repairexception.php share/owncloud/lib/private/repairstep.php share/owncloud/lib/private/response.php @@ -10249,12 +10501,19 @@ share/owncloud/lib/private/search/result/folder.php share/owncloud/lib/private/search/result/image.php share/owncloud/lib/private/security/certificate.php share/owncloud/lib/private/security/certificatemanager.php +share/owncloud/lib/private/security/credentialsmanager.php share/owncloud/lib/private/security/crypto.php +share/owncloud/lib/private/security/csp/contentsecuritypolicy.php +share/owncloud/lib/private/security/csp/contentsecuritypolicymanager.php +share/owncloud/lib/private/security/csrf/csrftoken.php +share/owncloud/lib/private/security/csrf/csrftokengenerator.php +share/owncloud/lib/private/security/csrf/csrftokenmanager.php +share/owncloud/lib/private/security/csrf/tokenstorage/sessionstorage.php share/owncloud/lib/private/security/hasher.php share/owncloud/lib/private/security/securerandom.php -share/owncloud/lib/private/security/stringutils.php share/owncloud/lib/private/security/trusteddomainhelper.php share/owncloud/lib/private/server.php +share/owncloud/lib/private/servercontainer.php share/owncloud/lib/private/servernotavailableexception.php share/owncloud/lib/private/serviceunavailableexception.php share/owncloud/lib/private/session/cryptosessiondata.php @@ -10274,9 +10533,20 @@ share/owncloud/lib/private/share/hooks.php share/owncloud/lib/private/share/mailnotifications.php share/owncloud/lib/private/share/searchresultsorter.php share/owncloud/lib/private/share/share.php +share/owncloud/lib/private/share20/defaultshareprovider.php +share/owncloud/lib/private/share20/exception/backenderror.php +share/owncloud/lib/private/share20/exception/invalidshare.php +share/owncloud/lib/private/share20/exception/providerexception.php +share/owncloud/lib/private/share20/manager.php +share/owncloud/lib/private/share20/providerfactory.php +share/owncloud/lib/private/share20/share.php share/owncloud/lib/private/streamer.php share/owncloud/lib/private/subadmin.php share/owncloud/lib/private/systemconfig.php +share/owncloud/lib/private/systemtag/managerfactory.php +share/owncloud/lib/private/systemtag/systemtag.php +share/owncloud/lib/private/systemtag/systemtagmanager.php +share/owncloud/lib/private/systemtag/systemtagobjectmapper.php share/owncloud/lib/private/tagging/tag.php share/owncloud/lib/private/tagging/tagmapper.php share/owncloud/lib/private/tagmanager.php @@ -10310,6 +10580,7 @@ share/owncloud/lib/public/activity/imanager.php share/owncloud/lib/public/api.php share/owncloud/lib/public/app.php share/owncloud/lib/public/app/iappmanager.php +share/owncloud/lib/public/app/managerevent.php share/owncloud/lib/public/appframework/apicontroller.php share/owncloud/lib/public/appframework/app.php share/owncloud/lib/public/appframework/controller.php @@ -10323,6 +10594,7 @@ share/owncloud/lib/public/appframework/http/datadisplayresponse.php share/owncloud/lib/public/appframework/http/datadownloadresponse.php share/owncloud/lib/public/appframework/http/dataresponse.php share/owncloud/lib/public/appframework/http/downloadresponse.php +share/owncloud/lib/public/appframework/http/emptycontentsecuritypolicy.php share/owncloud/lib/public/appframework/http/icallbackresponse.php share/owncloud/lib/public/appframework/http/ioutput.php share/owncloud/lib/public/appframework/http/jsonresponse.php @@ -10347,7 +10619,15 @@ share/owncloud/lib/public/backgroundjob/ijoblist.php share/owncloud/lib/public/capabilities/icapability.php share/owncloud/lib/public/command/ibus.php share/owncloud/lib/public/command/icommand.php +share/owncloud/lib/public/comments/commentsevent.php +share/owncloud/lib/public/comments/icomment.php +share/owncloud/lib/public/comments/icommentsmanager.php +share/owncloud/lib/public/comments/icommentsmanagerfactory.php +share/owncloud/lib/public/comments/illegalidchangeexception.php +share/owncloud/lib/public/comments/messagetoolongexception.php +share/owncloud/lib/public/comments/notfoundexception.php share/owncloud/lib/public/config.php +share/owncloud/lib/public/console/consoleevent.php share/owncloud/lib/public/constants.php share/owncloud/lib/public/contacts.php share/owncloud/lib/public/contacts/imanager.php @@ -10370,13 +10650,22 @@ share/owncloud/lib/public/encryption/imanager.php share/owncloud/lib/public/encryption/keys/istorage.php share/owncloud/lib/public/files.php share/owncloud/lib/public/files/alreadyexistsexception.php +share/owncloud/lib/public/files/cache/icache.php +share/owncloud/lib/public/files/cache/icacheentry.php +share/owncloud/lib/public/files/cache/ipropagator.php +share/owncloud/lib/public/files/cache/iscanner.php +share/owncloud/lib/public/files/cache/iupdater.php +share/owncloud/lib/public/files/cache/iwatcher.php +share/owncloud/lib/public/files/config/icachedmountinfo.php share/owncloud/lib/public/files/config/imountprovider.php share/owncloud/lib/public/files/config/imountprovidercollection.php +share/owncloud/lib/public/files/config/iusermountcache.php share/owncloud/lib/public/files/entitytoolargeexception.php share/owncloud/lib/public/files/file.php share/owncloud/lib/public/files/fileinfo.php share/owncloud/lib/public/files/filenametoolongexception.php share/owncloud/lib/public/files/folder.php +share/owncloud/lib/public/files/forbiddenexception.php share/owncloud/lib/public/files/ihomestorage.php share/owncloud/lib/public/files/imimetypedetector.php share/owncloud/lib/public/files/imimetypeloader.php @@ -10394,9 +10683,15 @@ share/owncloud/lib/public/files/notpermittedexception.php share/owncloud/lib/public/files/objectstore/iobjectstore.php share/owncloud/lib/public/files/reservedwordexception.php share/owncloud/lib/public/files/storage.php +share/owncloud/lib/public/files/storage/ilockingstorage.php +share/owncloud/lib/public/files/storage/istorage.php share/owncloud/lib/public/files/storage/istoragefactory.php +share/owncloud/lib/public/files/storageauthexception.php +share/owncloud/lib/public/files/storagebadconfigexception.php +share/owncloud/lib/public/files/storageconnectionexception.php share/owncloud/lib/public/files/storageinvalidexception.php share/owncloud/lib/public/files/storagenotavailableexception.php +share/owncloud/lib/public/files/storagetimeoutexception.php share/owncloud/lib/public/groupinterface.php share/owncloud/lib/public/http/client/iclient.php share/owncloud/lib/public/http/client/iclientservice.php @@ -10444,6 +10739,11 @@ share/owncloud/lib/public/l10n/ifactory.php share/owncloud/lib/public/lock/ilockingprovider.php share/owncloud/lib/public/lock/lockedexception.php share/owncloud/lib/public/mail/imailer.php +share/owncloud/lib/public/notification/iaction.php +share/owncloud/lib/public/notification/iapp.php +share/owncloud/lib/public/notification/imanager.php +share/owncloud/lib/public/notification/inotification.php +share/owncloud/lib/public/notification/inotifier.php share/owncloud/lib/public/preconditionnotmetexception.php share/owncloud/lib/public/preview/iprovider.php share/owncloud/lib/public/response.php @@ -10454,36 +10754,34 @@ share/owncloud/lib/public/sabrepluginexception.php share/owncloud/lib/public/search/pagedprovider.php share/owncloud/lib/public/search/provider.php share/owncloud/lib/public/search/result.php +share/owncloud/lib/public/security/icontentsecuritypolicymanager.php +share/owncloud/lib/public/security/icredentialsmanager.php share/owncloud/lib/public/security/icrypto.php share/owncloud/lib/public/security/ihasher.php share/owncloud/lib/public/security/isecurerandom.php share/owncloud/lib/public/security/stringutils.php share/owncloud/lib/public/share.php +share/owncloud/lib/public/share/exceptions/genericshareexception.php +share/owncloud/lib/public/share/exceptions/sharenotfound.php +share/owncloud/lib/public/share/imanager.php +share/owncloud/lib/public/share/iproviderfactory.php +share/owncloud/lib/public/share/ishare.php +share/owncloud/lib/public/share/ishareprovider.php share/owncloud/lib/public/share_backend.php share/owncloud/lib/public/share_backend_collection.php share/owncloud/lib/public/share_backend_file_dependent.php +share/owncloud/lib/public/systemtag/isystemtag.php +share/owncloud/lib/public/systemtag/isystemtagmanager.php +share/owncloud/lib/public/systemtag/isystemtagmanagerfactory.php +share/owncloud/lib/public/systemtag/isystemtagobjectmapper.php +share/owncloud/lib/public/systemtag/managerevent.php +share/owncloud/lib/public/systemtag/mapperevent.php +share/owncloud/lib/public/systemtag/tagalreadyexistsexception.php +share/owncloud/lib/public/systemtag/tagnotfoundexception.php share/owncloud/lib/public/template.php share/owncloud/lib/public/user.php share/owncloud/lib/public/userinterface.php share/owncloud/lib/public/util.php -share/owncloud/lib/repair/assetcache.php -share/owncloud/lib/repair/cleantags.php -share/owncloud/lib/repair/collation.php -share/owncloud/lib/repair/dropoldjobs.php -share/owncloud/lib/repair/dropoldtables.php -share/owncloud/lib/repair/filletags.php -share/owncloud/lib/repair/innodb.php -share/owncloud/lib/repair/oldgroupmembershipshares.php -share/owncloud/lib/repair/preview.php -share/owncloud/lib/repair/removegetetagentries.php -share/owncloud/lib/repair/repairconfig.php -share/owncloud/lib/repair/repairinvalidshares.php -share/owncloud/lib/repair/repairlegacystorages.php -share/owncloud/lib/repair/repairmimetypes.php -share/owncloud/lib/repair/searchlucenetables.php -share/owncloud/lib/repair/sqliteautoincrement.php -share/owncloud/lib/repair/updatecertificatestore.php -share/owncloud/lib/repair/updateoutdatedocsids.php share/owncloud/occ share/owncloud/ocs-provider/index.php share/owncloud/ocs-provider/provider.php @@ -10493,12 +10791,13 @@ share/owncloud/ocs/v1.php share/owncloud/ocs/v2.php share/owncloud/public.php share/owncloud/remote.php +share/owncloud/resources/codesigning/core.crt +share/owncloud/resources/codesigning/root.crt share/owncloud/resources/config/ca-bundle.crt share/owncloud/resources/config/mimetypealiases.dist.json share/owncloud/resources/config/mimetypemapping.dist.json share/owncloud/robots.txt share/owncloud/settings/admin.php -share/owncloud/settings/ajax/changedisplayname.php share/owncloud/settings/ajax/disableapp.php share/owncloud/settings/ajax/enableapp.php share/owncloud/settings/ajax/installapp.php @@ -10521,7 +10820,6 @@ share/owncloud/settings/controller/mailsettingscontroller.php share/owncloud/settings/controller/securitysettingscontroller.php share/owncloud/settings/controller/userscontroller.php share/owncloud/settings/css/settings.css -share/owncloud/settings/factory/subadminfactory.php share/owncloud/settings/help.php share/owncloud/settings/img/admin.png share/owncloud/settings/img/admin.svg @@ -10536,8 +10834,8 @@ share/owncloud/settings/img/users.png share/owncloud/settings/img/users.svg share/owncloud/settings/js/admin.js share/owncloud/settings/js/apps.js +share/owncloud/settings/js/certificates.js share/owncloud/settings/js/log.js -share/owncloud/settings/js/old-apps.js share/owncloud/settings/js/personal.js share/owncloud/settings/js/settings.js share/owncloud/settings/js/users/deleteHandler.js @@ -10716,6 +11014,7 @@ share/owncloud/settings/personal.php share/owncloud/settings/routes.php share/owncloud/settings/templates/admin.php share/owncloud/settings/templates/apps.php +share/owncloud/settings/templates/certificates.php share/owncloud/settings/templates/email.new_user.php share/owncloud/settings/templates/email.new_user_plain_text.php share/owncloud/settings/templates/help.php @@ -10735,6 +11034,7 @@ share/owncloud/themes/README share/owncloud/themes/example/core/css/styles.css share/owncloud/themes/example/core/img/favicon-touch.png share/owncloud/themes/example/core/img/favicon-touch.svg +share/owncloud/themes/example/core/img/favicon.ico share/owncloud/themes/example/core/img/favicon.png share/owncloud/themes/example/core/img/favicon.svg share/owncloud/themes/example/core/img/logo-icon.png @@ -10743,4 +11043,430 @@ share/owncloud/themes/example/core/img/logo-mail.gif share/owncloud/themes/example/core/img/logo.png share/owncloud/themes/example/core/img/logo.svg share/owncloud/themes/example/defaults.php +share/owncloud/updater/.gitignore +share/owncloud/updater/.scrutinizer.yml +share/owncloud/updater/.travis.yml +share/owncloud/updater/CONTRIBUTING.md +share/owncloud/updater/COPYING-AGPL +share/owncloud/updater/README.md +share/owncloud/updater/app/bootstrap.php +share/owncloud/updater/app/config/container.php +share/owncloud/updater/application.php +share/owncloud/updater/box.json +share/owncloud/updater/composer.json +share/owncloud/updater/composer.lock +share/owncloud/updater/index.php +share/owncloud/updater/nbproject/project.properties +share/owncloud/updater/nbproject/project.xml +share/owncloud/updater/pub/css/main.css +share/owncloud/updater/pub/img/actions/checkmark-color.png +share/owncloud/updater/pub/img/actions/checkmark-color.svg +share/owncloud/updater/pub/img/actions/confirm.png +share/owncloud/updater/pub/img/actions/confirm.svg +share/owncloud/updater/pub/img/actions/error-color.png +share/owncloud/updater/pub/img/actions/error-color.svg +share/owncloud/updater/pub/img/loading-dark.gif +share/owncloud/updater/pub/img/loading-small.gif +share/owncloud/updater/pub/img/loading.gif +share/owncloud/updater/pub/img/logo-icon.png +share/owncloud/updater/pub/img/logo-icon.svg +share/owncloud/updater/pub/img/logo.png +share/owncloud/updater/pub/img/logo.svg +share/owncloud/updater/pub/js/login.js +share/owncloud/updater/pub/js/main.js +share/owncloud/updater/pub/js/vendor/jquery.min.js +share/owncloud/updater/pub/js/vendor/jquery.min.map +share/owncloud/updater/src/Command/BackupDataCommand.php +share/owncloud/updater/src/Command/BackupDbCommand.php +share/owncloud/updater/src/Command/CheckSystemCommand.php +share/owncloud/updater/src/Command/CheckpointCommand.php +share/owncloud/updater/src/Command/CleanCacheCommand.php +share/owncloud/updater/src/Command/Command.php +share/owncloud/updater/src/Command/DbUpgradeCommand.php +share/owncloud/updater/src/Command/DetectCommand.php +share/owncloud/updater/src/Command/DisableNotShippedAppsCommand.php +share/owncloud/updater/src/Command/EnableNotShippedAppsCommand.php +share/owncloud/updater/src/Command/ExecuteCoreUpgradeScriptsCommand.php +share/owncloud/updater/src/Command/InfoCommand.php +share/owncloud/updater/src/Command/MaintenanceModeCommand.php +share/owncloud/updater/src/Command/PostUpgradeCleanupCommand.php +share/owncloud/updater/src/Command/PostUpgradeRepairCommand.php +share/owncloud/updater/src/Command/PreUpgradeRepairCommand.php +share/owncloud/updater/src/Command/RestartWebServerCommand.php +share/owncloud/updater/src/Command/StartCommand.php +share/owncloud/updater/src/Command/UpdateConfigCommand.php +share/owncloud/updater/src/Command/UpgradeShippedAppsCommand.php +share/owncloud/updater/src/Console/Application.php +share/owncloud/updater/src/Controller/DownloadController.php +share/owncloud/updater/src/Controller/IndexController.php +share/owncloud/updater/src/Formatter/HtmlOutputFormatter.php +share/owncloud/updater/src/Http/Request.php +share/owncloud/updater/src/Resources/views/base.php +share/owncloud/updater/src/Resources/views/partials/inner.php +share/owncloud/updater/src/Resources/views/partials/login.php +share/owncloud/updater/src/Tests/Controller/DownloadControllerTest.php +share/owncloud/updater/src/Tests/Http/RequestTest.php +share/owncloud/updater/src/Tests/StreamInterface.php +share/owncloud/updater/src/Tests/Utils/AppManagerTest.php +share/owncloud/updater/src/Tests/Utils/CheckpointTest.php +share/owncloud/updater/src/Tests/Utils/ConfigReaderTest.php +share/owncloud/updater/src/Tests/Utils/FeedTest.php +share/owncloud/updater/src/Tests/Utils/FetcherTest.php +share/owncloud/updater/src/Tests/Utils/RegistryTest.php +share/owncloud/updater/src/Tests/bootstrap.php +share/owncloud/updater/src/Tests/phpunit.xml +share/owncloud/updater/src/Utils/AppManager.php +share/owncloud/updater/src/Utils/BzipExtractor.php +share/owncloud/updater/src/Utils/Checkpoint.php +share/owncloud/updater/src/Utils/Collection.php +share/owncloud/updater/src/Utils/ConfigReader.php +share/owncloud/updater/src/Utils/ConfigWriter.php +share/owncloud/updater/src/Utils/Feed.php +share/owncloud/updater/src/Utils/Fetcher.php +share/owncloud/updater/src/Utils/FilesystemHelper.php +share/owncloud/updater/src/Utils/Locator.php +share/owncloud/updater/src/Utils/OccRunner.php +share/owncloud/updater/src/Utils/Registry.php +share/owncloud/updater/src/Utils/ZipExtractor.php +share/owncloud/updater/vendor/autoload.php +share/owncloud/updater/vendor/composer/ClassLoader.php +share/owncloud/updater/vendor/composer/LICENSE +share/owncloud/updater/vendor/composer/autoload_classmap.php +share/owncloud/updater/vendor/composer/autoload_files.php +share/owncloud/updater/vendor/composer/autoload_namespaces.php +share/owncloud/updater/vendor/composer/autoload_psr4.php +share/owncloud/updater/vendor/composer/autoload_real.php +share/owncloud/updater/vendor/composer/installed.json +share/owncloud/updater/vendor/guzzlehttp/guzzle/.editorconfig +share/owncloud/updater/vendor/guzzlehttp/guzzle/.gitignore +share/owncloud/updater/vendor/guzzlehttp/guzzle/.travis.yml +share/owncloud/updater/vendor/guzzlehttp/guzzle/CHANGELOG.md +share/owncloud/updater/vendor/guzzlehttp/guzzle/LICENSE +share/owncloud/updater/vendor/guzzlehttp/guzzle/README.md +share/owncloud/updater/vendor/guzzlehttp/guzzle/UPGRADING.md +share/owncloud/updater/vendor/guzzlehttp/guzzle/build/packager.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/composer.json +share/owncloud/updater/vendor/guzzlehttp/guzzle/phpunit.xml.dist +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/BatchResults.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Client.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/ClientInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Collection.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Cookie/FileCookieJar.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Cookie/SessionCookieJar.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Cookie/SetCookie.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/AbstractEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/AbstractRequestEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/AbstractRetryableEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/AbstractTransferEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/BeforeEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/CompleteEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/Emitter.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/EmitterInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/EndEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/ErrorEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/EventInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/HasEmitterInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/HasEmitterTrait.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/ListenerAttacherTrait.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/ProgressEvent.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/RequestEvents.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Event/SubscriberInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/ClientException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/CouldNotRewindStreamException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/ParseException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/ServerException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/StateException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/TooManyRedirectsException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/TransferException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Exception/XmlParseException.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/HasDataTrait.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/AbstractMessage.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/AppliesHeadersInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/FutureResponse.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/MessageFactory.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/MessageFactoryInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/MessageInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/MessageParser.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/Request.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/RequestInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/Response.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Message/ResponseInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Mimetypes.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Pool.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Post/MultipartBody.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Post/PostBody.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Post/PostBodyInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Post/PostFile.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Post/PostFileInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Query.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/QueryParser.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/RequestFsm.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/RingBridge.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Subscriber/Cookie.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Subscriber/History.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Subscriber/HttpError.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Subscriber/Mock.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Subscriber/Prepare.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Subscriber/Redirect.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/ToArrayInterface.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Transaction.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/UriTemplate.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Url.php +share/owncloud/updater/vendor/guzzlehttp/guzzle/src/Utils.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/.gitignore +share/owncloud/updater/vendor/guzzlehttp/ringphp/.travis.yml +share/owncloud/updater/vendor/guzzlehttp/ringphp/CHANGELOG.md +share/owncloud/updater/vendor/guzzlehttp/ringphp/LICENSE +share/owncloud/updater/vendor/guzzlehttp/ringphp/Makefile +share/owncloud/updater/vendor/guzzlehttp/ringphp/README.rst +share/owncloud/updater/vendor/guzzlehttp/ringphp/composer.json +share/owncloud/updater/vendor/guzzlehttp/ringphp/phpunit.xml.dist +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Client/ClientUtils.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Client/CurlFactory.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Client/CurlHandler.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Client/CurlMultiHandler.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Client/Middleware.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Client/MockHandler.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Client/StreamHandler.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Core.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Exception/CancelledException.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Exception/CancelledFutureAccessException.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Exception/ConnectException.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Exception/RingException.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Future/BaseFutureTrait.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureArray.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Future/CompletedFutureValue.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Future/FutureArray.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Future/FutureArrayInterface.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Future/FutureInterface.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Future/FutureValue.php +share/owncloud/updater/vendor/guzzlehttp/ringphp/src/Future/MagicFutureTrait.php +share/owncloud/updater/vendor/guzzlehttp/streams/.gitignore +share/owncloud/updater/vendor/guzzlehttp/streams/.travis.yml +share/owncloud/updater/vendor/guzzlehttp/streams/CHANGELOG.rst +share/owncloud/updater/vendor/guzzlehttp/streams/LICENSE +share/owncloud/updater/vendor/guzzlehttp/streams/Makefile +share/owncloud/updater/vendor/guzzlehttp/streams/README.rst +share/owncloud/updater/vendor/guzzlehttp/streams/composer.json +share/owncloud/updater/vendor/guzzlehttp/streams/phpunit.xml.dist +share/owncloud/updater/vendor/guzzlehttp/streams/src/AppendStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/AsyncReadStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/BufferStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/CachingStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/DroppingStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/Exception/CannotAttachException.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/Exception/SeekException.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/FnStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/GuzzleStreamWrapper.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/InflateStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/LazyOpenStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/LimitStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/MetadataStreamInterface.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/NoSeekStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/NullStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/PumpStream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/Stream.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/StreamDecoratorTrait.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/StreamInterface.php +share/owncloud/updater/vendor/guzzlehttp/streams/src/Utils.php +share/owncloud/updater/vendor/ircmaxell/password-compat/LICENSE.md +share/owncloud/updater/vendor/ircmaxell/password-compat/composer.json +share/owncloud/updater/vendor/ircmaxell/password-compat/lib/password.php +share/owncloud/updater/vendor/ircmaxell/password-compat/version-test.php +share/owncloud/updater/vendor/league/plates/CONTRIBUTING.md +share/owncloud/updater/vendor/league/plates/LICENSE +share/owncloud/updater/vendor/league/plates/README.md +share/owncloud/updater/vendor/league/plates/composer.json +share/owncloud/updater/vendor/league/plates/phpunit.xml.dist +share/owncloud/updater/vendor/league/plates/src/Engine.php +share/owncloud/updater/vendor/league/plates/src/Extension/Asset.php +share/owncloud/updater/vendor/league/plates/src/Extension/ExtensionInterface.php +share/owncloud/updater/vendor/league/plates/src/Extension/URI.php +share/owncloud/updater/vendor/league/plates/src/Template/Data.php +share/owncloud/updater/vendor/league/plates/src/Template/Directory.php +share/owncloud/updater/vendor/league/plates/src/Template/FileExtension.php +share/owncloud/updater/vendor/league/plates/src/Template/Folder.php +share/owncloud/updater/vendor/league/plates/src/Template/Folders.php +share/owncloud/updater/vendor/league/plates/src/Template/Func.php +share/owncloud/updater/vendor/league/plates/src/Template/Functions.php +share/owncloud/updater/vendor/league/plates/src/Template/Name.php +share/owncloud/updater/vendor/league/plates/src/Template/Template.php +share/owncloud/updater/vendor/paragonie/random_compat/CHANGELOG.md +share/owncloud/updater/vendor/paragonie/random_compat/ERRATA.md +share/owncloud/updater/vendor/paragonie/random_compat/LICENSE +share/owncloud/updater/vendor/paragonie/random_compat/README.md +share/owncloud/updater/vendor/paragonie/random_compat/SECURITY.md +share/owncloud/updater/vendor/paragonie/random_compat/composer.json +share/owncloud/updater/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey +share/owncloud/updater/vendor/paragonie/random_compat/dist/random_compat.phar.pubkey.asc +share/owncloud/updater/vendor/paragonie/random_compat/lib/byte_safe_strings.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/cast_to_int.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/error_polyfill.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/random.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/random_bytes_com_dotnet.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/random_bytes_libsodium.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/random_bytes_openssl.php +share/owncloud/updater/vendor/paragonie/random_compat/lib/random_int.php +share/owncloud/updater/vendor/paragonie/random_compat/other/build_phar.php +share/owncloud/updater/vendor/pimple/pimple/.gitignore +share/owncloud/updater/vendor/pimple/pimple/.travis.yml +share/owncloud/updater/vendor/pimple/pimple/CHANGELOG +share/owncloud/updater/vendor/pimple/pimple/LICENSE +share/owncloud/updater/vendor/pimple/pimple/README.rst +share/owncloud/updater/vendor/pimple/pimple/composer.json +share/owncloud/updater/vendor/pimple/pimple/phpunit.xml.dist +share/owncloud/updater/vendor/pimple/pimple/src/Pimple/Container.php +share/owncloud/updater/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php +share/owncloud/updater/vendor/psr/log/.gitignore +share/owncloud/updater/vendor/psr/log/LICENSE +share/owncloud/updater/vendor/psr/log/Psr/Log/AbstractLogger.php +share/owncloud/updater/vendor/psr/log/Psr/Log/InvalidArgumentException.php +share/owncloud/updater/vendor/psr/log/Psr/Log/LogLevel.php +share/owncloud/updater/vendor/psr/log/Psr/Log/LoggerAwareInterface.php +share/owncloud/updater/vendor/psr/log/Psr/Log/LoggerAwareTrait.php +share/owncloud/updater/vendor/psr/log/Psr/Log/LoggerInterface.php +share/owncloud/updater/vendor/psr/log/Psr/Log/LoggerTrait.php +share/owncloud/updater/vendor/psr/log/Psr/Log/NullLogger.php +share/owncloud/updater/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php +share/owncloud/updater/vendor/psr/log/README.md +share/owncloud/updater/vendor/psr/log/composer.json +share/owncloud/updater/vendor/react/promise/.gitignore +share/owncloud/updater/vendor/react/promise/.travis.yml +share/owncloud/updater/vendor/react/promise/CHANGELOG.md +share/owncloud/updater/vendor/react/promise/LICENSE +share/owncloud/updater/vendor/react/promise/README.md +share/owncloud/updater/vendor/react/promise/composer.json +share/owncloud/updater/vendor/react/promise/phpunit.xml.dist +share/owncloud/updater/vendor/react/promise/src/CancellablePromiseInterface.php +share/owncloud/updater/vendor/react/promise/src/Deferred.php +share/owncloud/updater/vendor/react/promise/src/ExtendedPromiseInterface.php +share/owncloud/updater/vendor/react/promise/src/FulfilledPromise.php +share/owncloud/updater/vendor/react/promise/src/LazyPromise.php +share/owncloud/updater/vendor/react/promise/src/Promise.php +share/owncloud/updater/vendor/react/promise/src/PromiseInterface.php +share/owncloud/updater/vendor/react/promise/src/PromisorInterface.php +share/owncloud/updater/vendor/react/promise/src/RejectedPromise.php +share/owncloud/updater/vendor/react/promise/src/UnhandledRejectionException.php +share/owncloud/updater/vendor/react/promise/src/functions.php +share/owncloud/updater/vendor/react/promise/src/functions_include.php +share/owncloud/updater/vendor/symfony/console/.gitignore +share/owncloud/updater/vendor/symfony/console/Application.php +share/owncloud/updater/vendor/symfony/console/CHANGELOG.md +share/owncloud/updater/vendor/symfony/console/Command/Command.php +share/owncloud/updater/vendor/symfony/console/Command/HelpCommand.php +share/owncloud/updater/vendor/symfony/console/Command/ListCommand.php +share/owncloud/updater/vendor/symfony/console/ConsoleEvents.php +share/owncloud/updater/vendor/symfony/console/Descriptor/ApplicationDescription.php +share/owncloud/updater/vendor/symfony/console/Descriptor/Descriptor.php +share/owncloud/updater/vendor/symfony/console/Descriptor/DescriptorInterface.php +share/owncloud/updater/vendor/symfony/console/Descriptor/JsonDescriptor.php +share/owncloud/updater/vendor/symfony/console/Descriptor/MarkdownDescriptor.php +share/owncloud/updater/vendor/symfony/console/Descriptor/TextDescriptor.php +share/owncloud/updater/vendor/symfony/console/Descriptor/XmlDescriptor.php +share/owncloud/updater/vendor/symfony/console/Event/ConsoleCommandEvent.php +share/owncloud/updater/vendor/symfony/console/Event/ConsoleEvent.php +share/owncloud/updater/vendor/symfony/console/Event/ConsoleExceptionEvent.php +share/owncloud/updater/vendor/symfony/console/Event/ConsoleTerminateEvent.php +share/owncloud/updater/vendor/symfony/console/Formatter/OutputFormatter.php +share/owncloud/updater/vendor/symfony/console/Formatter/OutputFormatterInterface.php +share/owncloud/updater/vendor/symfony/console/Formatter/OutputFormatterStyle.php +share/owncloud/updater/vendor/symfony/console/Formatter/OutputFormatterStyleInterface.php +share/owncloud/updater/vendor/symfony/console/Formatter/OutputFormatterStyleStack.php +share/owncloud/updater/vendor/symfony/console/Helper/DebugFormatterHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/DescriptorHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/DialogHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/FormatterHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/Helper.php +share/owncloud/updater/vendor/symfony/console/Helper/HelperInterface.php +share/owncloud/updater/vendor/symfony/console/Helper/HelperSet.php +share/owncloud/updater/vendor/symfony/console/Helper/InputAwareHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/ProcessHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/ProgressBar.php +share/owncloud/updater/vendor/symfony/console/Helper/ProgressHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/QuestionHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/SymfonyQuestionHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/Table.php +share/owncloud/updater/vendor/symfony/console/Helper/TableCell.php +share/owncloud/updater/vendor/symfony/console/Helper/TableHelper.php +share/owncloud/updater/vendor/symfony/console/Helper/TableSeparator.php +share/owncloud/updater/vendor/symfony/console/Helper/TableStyle.php +share/owncloud/updater/vendor/symfony/console/Input/ArgvInput.php +share/owncloud/updater/vendor/symfony/console/Input/ArrayInput.php +share/owncloud/updater/vendor/symfony/console/Input/Input.php +share/owncloud/updater/vendor/symfony/console/Input/InputArgument.php +share/owncloud/updater/vendor/symfony/console/Input/InputAwareInterface.php +share/owncloud/updater/vendor/symfony/console/Input/InputDefinition.php +share/owncloud/updater/vendor/symfony/console/Input/InputInterface.php +share/owncloud/updater/vendor/symfony/console/Input/InputOption.php +share/owncloud/updater/vendor/symfony/console/Input/StringInput.php +share/owncloud/updater/vendor/symfony/console/LICENSE +share/owncloud/updater/vendor/symfony/console/Logger/ConsoleLogger.php +share/owncloud/updater/vendor/symfony/console/Output/BufferedOutput.php +share/owncloud/updater/vendor/symfony/console/Output/ConsoleOutput.php +share/owncloud/updater/vendor/symfony/console/Output/ConsoleOutputInterface.php +share/owncloud/updater/vendor/symfony/console/Output/NullOutput.php +share/owncloud/updater/vendor/symfony/console/Output/Output.php +share/owncloud/updater/vendor/symfony/console/Output/OutputInterface.php +share/owncloud/updater/vendor/symfony/console/Output/StreamOutput.php +share/owncloud/updater/vendor/symfony/console/Question/ChoiceQuestion.php +share/owncloud/updater/vendor/symfony/console/Question/ConfirmationQuestion.php +share/owncloud/updater/vendor/symfony/console/Question/Question.php +share/owncloud/updater/vendor/symfony/console/README.md +share/owncloud/updater/vendor/symfony/console/Resources/bin/hiddeninput.exe +share/owncloud/updater/vendor/symfony/console/Shell.php +share/owncloud/updater/vendor/symfony/console/Style/OutputStyle.php +share/owncloud/updater/vendor/symfony/console/Style/StyleInterface.php +share/owncloud/updater/vendor/symfony/console/Style/SymfonyStyle.php +share/owncloud/updater/vendor/symfony/console/Tester/ApplicationTester.php +share/owncloud/updater/vendor/symfony/console/Tester/CommandTester.php +share/owncloud/updater/vendor/symfony/console/composer.json +share/owncloud/updater/vendor/symfony/console/phpunit.xml.dist +share/owncloud/updater/vendor/symfony/polyfill-php55/LICENSE +share/owncloud/updater/vendor/symfony/polyfill-php55/Php55.php +share/owncloud/updater/vendor/symfony/polyfill-php55/Php55ArrayColumn.php +share/owncloud/updater/vendor/symfony/polyfill-php55/README.md +share/owncloud/updater/vendor/symfony/polyfill-php55/bootstrap.php +share/owncloud/updater/vendor/symfony/polyfill-php55/composer.json +share/owncloud/updater/vendor/symfony/polyfill-php56/LICENSE +share/owncloud/updater/vendor/symfony/polyfill-php56/Php56.php +share/owncloud/updater/vendor/symfony/polyfill-php56/README.md +share/owncloud/updater/vendor/symfony/polyfill-php56/bootstrap.php +share/owncloud/updater/vendor/symfony/polyfill-php56/composer.json +share/owncloud/updater/vendor/symfony/polyfill-util/Binary.php +share/owncloud/updater/vendor/symfony/polyfill-util/BinaryNoFuncOverload.php +share/owncloud/updater/vendor/symfony/polyfill-util/BinaryOnFuncOverload.php +share/owncloud/updater/vendor/symfony/polyfill-util/LICENSE +share/owncloud/updater/vendor/symfony/polyfill-util/README.md +share/owncloud/updater/vendor/symfony/polyfill-util/TestListener.php +share/owncloud/updater/vendor/symfony/polyfill-util/composer.json +share/owncloud/updater/vendor/symfony/process/.gitignore +share/owncloud/updater/vendor/symfony/process/CHANGELOG.md +share/owncloud/updater/vendor/symfony/process/Exception/ExceptionInterface.php +share/owncloud/updater/vendor/symfony/process/Exception/InvalidArgumentException.php +share/owncloud/updater/vendor/symfony/process/Exception/LogicException.php +share/owncloud/updater/vendor/symfony/process/Exception/ProcessFailedException.php +share/owncloud/updater/vendor/symfony/process/Exception/ProcessTimedOutException.php +share/owncloud/updater/vendor/symfony/process/Exception/RuntimeException.php +share/owncloud/updater/vendor/symfony/process/ExecutableFinder.php +share/owncloud/updater/vendor/symfony/process/LICENSE +share/owncloud/updater/vendor/symfony/process/PhpExecutableFinder.php +share/owncloud/updater/vendor/symfony/process/PhpProcess.php +share/owncloud/updater/vendor/symfony/process/Pipes/AbstractPipes.php +share/owncloud/updater/vendor/symfony/process/Pipes/PipesInterface.php +share/owncloud/updater/vendor/symfony/process/Pipes/UnixPipes.php +share/owncloud/updater/vendor/symfony/process/Pipes/WindowsPipes.php +share/owncloud/updater/vendor/symfony/process/Process.php +share/owncloud/updater/vendor/symfony/process/ProcessBuilder.php +share/owncloud/updater/vendor/symfony/process/ProcessUtils.php +share/owncloud/updater/vendor/symfony/process/README.md +share/owncloud/updater/vendor/symfony/process/composer.json +share/owncloud/updater/vendor/symfony/process/phpunit.xml.dist share/owncloud/version.php diff --git a/www/php-owncloud/distinfo b/www/php-owncloud/distinfo index dd19e5fd74165..346f9c09f5bae 100644 --- a/www/php-owncloud/distinfo +++ b/www/php-owncloud/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2015/12/25 23:06:41 ryoon Exp $ +$NetBSD: distinfo,v 1.37 2016/03/21 05:50:37 ryoon Exp $ SHA1 (168707-calendar.zip) = 521fb58ad898529f9a10d94c165bc978010defd3 RMD160 (168707-calendar.zip) = fdb7c3cddc0cd9e0338328d5cf246bd774f28803 @@ -8,7 +8,7 @@ SHA1 (168708-contacts.zip) = abbb3ae9f966a80ec3dc7590c0906ad10b7e340e RMD160 (168708-contacts.zip) = 4d351166cfca85957d72fcbdcc454b21b0965ce7 SHA512 (168708-contacts.zip) = 24e6a104a2cca7d56a0bb33c1458cd5ce5a9f95a202188bfba622433a364c3b4e7f8da92133db2ee71233eb6d4064db8612daf50e2ef3d65440f6ed9ff4022ba Size (168708-contacts.zip) = 1442129 bytes -SHA1 (owncloud-8.2.2.tar.bz2) = 0f16525e196a8706b9bc107820d91bda20399f84 -RMD160 (owncloud-8.2.2.tar.bz2) = 2786f607da8c8616a5b145ef89824ad49b8f54fa -SHA512 (owncloud-8.2.2.tar.bz2) = 3830e8311931da3cbb596e927afe638dee6a5d9fd47d623faf4dabbde96fe39ced1bf7006c1b9e39ff52e72e2b849fe9d1012c3b1a86ca9f8c873d820b944b78 -Size (owncloud-8.2.2.tar.bz2) = 28922075 bytes +SHA1 (owncloud-9.0.0.tar.bz2) = a0a6705c6e9b8d61ccc4145c743feb8e7ae39967 +RMD160 (owncloud-9.0.0.tar.bz2) = c17590f4fd1599e40df0d5df13bbee653231cb90 +SHA512 (owncloud-9.0.0.tar.bz2) = c82f42d227ee59ed2875133230e303a0b51ee28b21e4d3c253d2f142aed514050e3138f57082d02350a3c7a69f28ba34d3fb4dc86ce51384119c817196963e55 +Size (owncloud-9.0.0.tar.bz2) = 22678208 bytes From e8ec83b5a4718f4b333ed9d5f6242dbed9b2d702 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 05:58:16 +0000 Subject: [PATCH 0336/2457] Updated www/php-owncloud to 9.0.0 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 8c279b5e5b540..e5a5dc85900d3 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1264 2016/03/21 00:30:44 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1265 2016/03/21 05:58:16 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1662,3 +1662,4 @@ Changes to the packages collection and infrastructure in 2016: Updated databases/py-pgnotify to 0.1nb3 [wiz 2016-03-20] Updated mail/thunderbird to 38.7.0 [ryoon 2016-03-21] Updated mail/thunderbird-l10n to 38.7.0 [ryoon 2016-03-21] + Updated www/php-owncloud to 9.0.0 [ryoon 2016-03-21] diff --git a/doc/TODO b/doc/TODO index d4bcd739969cf..9c749886a563c 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15606 2016/03/20 09:17:42 wiz Exp $ +$NetBSD: TODO,v 1.15607 2016/03/21 05:58:16 ryoon Exp $ Suggested new packages ====================== @@ -1590,8 +1590,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o php-mongodb-1.1.2 o php-mrbs-1.5.0 o php-orangehrm-3.3.1 - o php-owncloud-8.1.3 [pkg/50247] - o php-owncloud-9.0 o php-pdflib-3.0.4 (require pdflib 7 or later) o php-phrasea2-3.8.6 (php-phrasea-3.8.6?) o php-pthread-3.1.6 From b8e5e53f64a01bee3147761f121d470735ce20f1 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 11:36:13 +0000 Subject: [PATCH 0337/2457] Update to 2.1.1 Changelog: Release 2.1.1 Februrary 10th 2016 UI improvements for HiDPI screens, error messages, RTL languages Fix occurences of "Connection Closed" when a new unauthenticated TCP socket is used Fix undeliberate WiFi scanning done by Qt Network classes Several fixes/improvements to the sharing dialog Several fixes/improvements to the server activity tab Create the directory when using --confdir and it does not exist Windows Overlay icons: Fix DLL and icon oddities Mac Overlay icons: Don't install legacy Finder plugin on >= 10.10 Linux Overlay icons: Nemo plugin Overlay icons: Fix several wrong icon state computations Allow changeable upload chunk size in owncloud.cfg Crash fixes on account deletion Forget password on explicit sign-out OS X: Fix the file system watcher ignoring unicode paths (#4424) Windows Installer: Update to NSIS 2.50, fixes possible DLL injection Sync Engine: .lnk files Sync Engine: symlinked syn directories Sync Engine: Windows: Fix deleting and replacing of read-only files (#4308, #4277) Sync Engine: Fixes for files becoming directories and vice versa (#4302) Misc other fixes/improvements --- net/owncloudclient/Makefile | 5 ++--- net/owncloudclient/PLIST | 3 ++- net/owncloudclient/distinfo | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/owncloudclient/Makefile b/net/owncloudclient/Makefile index 34b34f8baf507..39dbe3ed702b2 100644 --- a/net/owncloudclient/Makefile +++ b/net/owncloudclient/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2016/03/05 11:29:09 jperkin Exp $ +# $NetBSD: Makefile,v 1.10 2016/03/21 11:36:13 ryoon Exp $ -DISTNAME= owncloudclient-2.1.0 -PKGREVISION= 1 +DISTNAME= owncloudclient-2.1.1 CATEGORIES= net MASTER_SITES= https://download.owncloud.com/desktop/stable/ EXTRACT_SUFX= .tar.xz diff --git a/net/owncloudclient/PLIST b/net/owncloudclient/PLIST index b24a7d4936198..8d0a034a342cf 100644 --- a/net/owncloudclient/PLIST +++ b/net/owncloudclient/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2015/12/26 00:38:29 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.5 2016/03/21 11:36:13 ryoon Exp $ bin/owncloud bin/owncloudcmd include/owncloudsync/creds/abstractcredentials.h @@ -83,6 +83,7 @@ share/icons/hicolor/72x72/apps/ownCloud_sync_shared.png share/icons/hicolor/72x72/apps/ownCloud_warn.png share/icons/hicolor/72x72/apps/ownCloud_warn_shared.png share/nautilus-python/extensions/syncstate.py +share/nemo-python/extensions/syncstate.py share/owncloud/i18n/client_TW.qm share/owncloud/i18n/client_ca.qm share/owncloud/i18n/client_cs.qm diff --git a/net/owncloudclient/distinfo b/net/owncloudclient/distinfo index 412e929b24775..bd961c4b3f108 100644 --- a/net/owncloudclient/distinfo +++ b/net/owncloudclient/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2015/12/26 00:38:29 ryoon Exp $ +$NetBSD: distinfo,v 1.6 2016/03/21 11:36:13 ryoon Exp $ -SHA1 (owncloudclient-2.1.0.tar.xz) = 9ca9d6e3c1711d33b38b6d8a96913e439b8fa772 -RMD160 (owncloudclient-2.1.0.tar.xz) = 6e4d37915ba6e37a0f915aff6ebb6b006a28e97f -SHA512 (owncloudclient-2.1.0.tar.xz) = 1db9c27fa00b2896799c8ab2ca7b9bed40c5f514e495320234a06d453c703356ddf012eacde9abe9ffb3c29472fedc7e1eac78baae8a43ea743e2c1ab1176b1d -Size (owncloudclient-2.1.0.tar.xz) = 11749608 bytes +SHA1 (owncloudclient-2.1.1.tar.xz) = 456cc73ad3deec5dd512c0b52e316395038bd09b +RMD160 (owncloudclient-2.1.1.tar.xz) = 05507dfab485d47170aaab10b771cf8598d43a09 +SHA512 (owncloudclient-2.1.1.tar.xz) = 62cd22c1c7119cc2269537ab562072bffa1a968b720263810f35b58722bac5b370b7b7ae6ec6fd3e9778bd996c8e4b0b91c34c1a3b533e1a60853963a8de5e19 +Size (owncloudclient-2.1.1.tar.xz) = 11920024 bytes From c2d1674d80ca7620c21c1ed870ba47c19609632a Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 11:36:53 +0000 Subject: [PATCH 0338/2457] Updated net/owncloudclient to 2.1.1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index e5a5dc85900d3..05d5ce7d6b3e5 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1265 2016/03/21 05:58:16 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1266 2016/03/21 11:36:53 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1663,3 +1663,4 @@ Changes to the packages collection and infrastructure in 2016: Updated mail/thunderbird to 38.7.0 [ryoon 2016-03-21] Updated mail/thunderbird-l10n to 38.7.0 [ryoon 2016-03-21] Updated www/php-owncloud to 9.0.0 [ryoon 2016-03-21] + Updated net/owncloudclient to 2.1.1 [ryoon 2016-03-21] From 30105738c3f2fefbbac33007ffafdbe54aa1eec2 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 11:40:30 +0000 Subject: [PATCH 0339/2457] Update to 0.9.4 Changelog: Sigil-0.9.4 Bug Fixes - Prevent the use of zero length key fields when obfuscating fonts - IDPF font obfuscation key accepts all input except as specified - Fix typo in main.ui accelerator assignment - Update Transifex project URL - Prevent NCX Weirdness with ampersand added when editing NCX in codeview and TOC widget showing - Fix lost namespace attributes on metadata tag - Allow auto conversion from package version 1.0 to 2.0 - Remove unused parameter from gumbo create_text_node - Fix bug that hits package version when no xml declaration on opf on import - Add id to Heading structure to greatly speed up NCX/TOC creation even more - Only the true nav should ever have the nav manifest property set - Prevent nav property from being overwritten when updating manifest properties - Prevent segfault if user add semantics but never chooses one - Prevent Add Cover from returning the wrong doctype for epub3 - Make sure cover-image and svg (if needed) are added as epub3 manifest properties when adding a cover - Make sure all referenced resources are found for Delete Unused Media - Remap non-standard epub namespace prefixes in the opf to those now reserved for epub3 - Make loading epubs with broken opf files more robust New Features - Extract all MarcRelators related code into its own class so it can be shared - Added some missing MARC relators - Removed obsolete MARC relators (ctb replaced clb, and sng replaces voc) - Completely redesign MetaEditor gui to work with both epub2 and epub3 metadata - Add default metadata language and title for the user - Make the Nav a required part of an epub3 - create an empty one if need be - Create NavProcessor to use gumbo to update the nav.xhtml - Add support for Adding/Removing Nav Landmarks - Better identify the true nav when loading epub3s - Add ability to generate Nav TOC from Book Headings to CreateTOC tool - Check for valid nav otherwise create a new default one ready for updates - Do not allow split markers to be added to nav.xhtml - Do not allow nav to get merged - Do not allow the nav to be deleted - Do not allow plugins to delete the nav under epub3 - Completely Revamp BookBrowser interface to support both Guide and Landmark Semantics - Create Semantics Dialog to better handle epub2 and epub3 semantics - Create Separate Guide/Landmarks classes for epub2 and epub3 respectively - Rename DescriptiveMetaInfo structure to just DescriptiveInfo to work with guide/landmarks elements - Add a mapping from Landmark to Guide and Back - Remove old GuideSemantics code - Make sure Landmarks semantics show up in BookBrowser tooltips - Update epub3 semantic vocab in Landmarks - Completely Revamp how the dockable TableOfContents gui widget is built and updated - Remove strong coupling between TableOfContents widget and NCX - Allow dockable Table Of Contents to refresh from Nav under epub3 - Large update for translations needed - Many new strings supporting the MetaEditor GUI and Add Semantics GUI were added --- editors/Sigil/Makefile | 5 ++--- editors/Sigil/PLIST | 8 ++++---- editors/Sigil/distinfo | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile index c767227bd5f88..ef0bc3dfd2d8e 100644 --- a/editors/Sigil/Makefile +++ b/editors/Sigil/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.79 2016/03/05 11:28:26 jperkin Exp $ +# $NetBSD: Makefile,v 1.80 2016/03/21 11:40:30 ryoon Exp $ -DISTNAME= Sigil-0.9.3 -PKGREVISION= 1 +DISTNAME= Sigil-0.9.4 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GITHUB:=Sigil-Ebook/} GITHUB_PROJECT= Sigil diff --git a/editors/Sigil/PLIST b/editors/Sigil/PLIST index 9e57dfc5bd0fb..edc856e6ea055 100644 --- a/editors/Sigil/PLIST +++ b/editors/Sigil/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2016/03/02 23:08:22 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.13 2016/03/21 11:40:30 ryoon Exp $ bin/sigil lib/sigil/libhunspell.${RUBY_DLEXT} lib/sigil/libsigilgumbo.${RUBY_DLEXT} @@ -69,7 +69,9 @@ share/sigil/plugin_launchers/python/validationcontainer.py share/sigil/plugin_launchers/python/validationresult.py share/sigil/plugin_launchers/python/wrapper.py share/sigil/polyfills/MathJax.js -share/sigil/python3lib/navgenerator.py +share/sigil/python3lib/metadata_utils.py +share/sigil/python3lib/metaproc2.py +share/sigil/python3lib/metaproc3.py share/sigil/python3lib/ncxgenerator.py share/sigil/python3lib/opf_newparser.py share/sigil/python3lib/sanitycheck.py @@ -82,10 +84,8 @@ share/sigil/translations/sigil_de.qm share/sigil/translations/sigil_el_GR.qm share/sigil/translations/sigil_en.qm share/sigil/translations/sigil_es.qm -share/sigil/translations/sigil_es_419.qm share/sigil/translations/sigil_fi.qm share/sigil/translations/sigil_fr.qm -share/sigil/translations/sigil_gl.qm share/sigil/translations/sigil_he.qm share/sigil/translations/sigil_hu_HU.qm share/sigil/translations/sigil_id_ID.qm diff --git a/editors/Sigil/distinfo b/editors/Sigil/distinfo index 4a5e0a862cd1e..0320b5b160a53 100644 --- a/editors/Sigil/distinfo +++ b/editors/Sigil/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.34 2016/03/02 23:08:22 ryoon Exp $ +$NetBSD: distinfo,v 1.35 2016/03/21 11:40:30 ryoon Exp $ -SHA1 (Sigil-0.9.3.tar.gz) = 312b7e45491256dac64370ed009e77470ef276e6 -RMD160 (Sigil-0.9.3.tar.gz) = 8f68a281306d7579f09bd6c5c45aec70bb5524a7 -SHA512 (Sigil-0.9.3.tar.gz) = c3463e0b16188b9d15f2f00e2b4fb8c565c0281cde144b840e49dbf7026462251d44ad8b5ae4b0ac8f88569ce73c6a9bcd781864283f3b5b8b25be7962b0f9b1 -Size (Sigil-0.9.3.tar.gz) = 18095814 bytes +SHA1 (Sigil-0.9.4.tar.gz) = c86e5354a966a6c50ac433080bc3c77211446ac3 +RMD160 (Sigil-0.9.4.tar.gz) = d3246fe45ce26b7f3ff754d781afc1811e3276ef +SHA512 (Sigil-0.9.4.tar.gz) = dad5d44061375da99748d767c0cc288e11d02cc475c239b7709b4ace36cfd0deec8b2a5bcd74431e0465e1cd4d927bafd094ba238aec06bf40ec62d43d568cc1 +Size (Sigil-0.9.4.tar.gz) = 18084460 bytes SHA1 (patch-3rdparty_minizip_ioapi.c) = a68dead89687529b7022cda3bc8a079e5f5c1459 From b61bfe7d593982a0e323a658238c13bb395a8548 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 21 Mar 2016 11:40:59 +0000 Subject: [PATCH 0340/2457] Updated editors/Sigil to 0.9.4 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 05d5ce7d6b3e5..487e314933ae7 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1266 2016/03/21 11:36:53 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1267 2016/03/21 11:40:59 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1664,3 +1664,4 @@ Changes to the packages collection and infrastructure in 2016: Updated mail/thunderbird-l10n to 38.7.0 [ryoon 2016-03-21] Updated www/php-owncloud to 9.0.0 [ryoon 2016-03-21] Updated net/owncloudclient to 2.1.1 [ryoon 2016-03-21] + Updated editors/Sigil to 0.9.4 [ryoon 2016-03-21] diff --git a/doc/TODO b/doc/TODO index 9c749886a563c..2276a984b7689 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15607 2016/03/21 05:58:16 ryoon Exp $ +$NetBSD: TODO,v 1.15608 2016/03/21 11:40:59 ryoon Exp $ Suggested new packages ====================== @@ -397,7 +397,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o SDL2_image-2.0.1 o SDL2_net-2.0.1 o SOPE-3.0.2 - o Sigil-0.9.4 o TeXmacs-1.99.4 o TeXmacs-devel-1.0.7.21 o TiffIO-140a From 8f54666e672cf5a864e0ab0a85bcee496484acfa Mon Sep 17 00:00:00 2001 From: gdt Date: Mon, 21 Mar 2016 13:40:28 +0000 Subject: [PATCH 0341/2457] Update to 1.0.20160315 This is an update to address security issues, but contains more changes. Packaging changes include: remove lib/privs.c patch (integrated upstream) opaque LSA no longer an option (always on) pimd enabled by default upstream and hence in the package Upstream changes from http://savannah.nongnu.org/news/?group=quagga Quagga 1.0.20160315 Released Quagga 1.0.20160309 has been released, and is available at http://download.savannah.gnu.org/releases/quagga/ This is a bug fix release. It addresses a crash in protocols with a redistribute statement. Quagga 1.0.20160309 Released Quagga 1.0.20160309 has been released, and is available at http://download.savannah.gnu.org/releases/quagga/ This release addresses Security Vulnerability VU #270232. Users using VPNv4 to untrusted peers and zebra that have untrusted clients talking to it are advised to upgrade to this release. For further details see the CERT Vulnerability note: https://www.kb.cert.org/vuls/id/270232 Major user-visible changes: [quagga] - Namespace VRF Support has been added. [lib] - Add 'show commandtree' [bgpd] - vpnv4 and vpnv6 handling has been included. [bgpd] - Add 'set metric (rtt|+rtt|-rtt)' to route map handling. [bgpd] - Addition of 'show ip bgp dampening' command tree. [bgpd] - If route-map does not exist default to DENY for redistribute statements [bgpd] - Lower default 'timers connect' in BGP to 10 seconds. [bgpd] - Enable "bgp log-neighbor-changes" by default [bgpd] - Add support for timer commands with peer-group syntax [bgpd] - Extend Dump to allow Extended Time Format [babeld] - Removed from the distribution. [isisd] - Allow the adjustment of lsp-mtu [isisd] - Allow the import of routes from other protocols [ospfd] - Add per interface 'ip ospf area' command [ospfd] - Lower the default OSPF spf timers to '0 50 5000' [ripngd] - Add ECMP support [pimd] - Add multicast static routes. [pimd] - Add ability to set DR priority for an interface [pimd] - Add ability to modify hello and hold timers per interface [vtysh] - Add 'show thread cpu ..' and 'show work-queues' [vtysh] - Add 'show run ' command [vtysh] - Fix history handling --- net/quagga/Makefile | 5 +- net/quagga/PLIST | 15 ++- net/quagga/PLIST.opaquelsa | 5 - net/quagga/distinfo | 11 +- net/quagga/options.mk | 14 +-- net/quagga/patches/patch-lib_privs.c | 162 --------------------------- 6 files changed, 20 insertions(+), 192 deletions(-) delete mode 100644 net/quagga/PLIST.opaquelsa delete mode 100644 net/quagga/patches/patch-lib_privs.c diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 079067535d11f..3d4a468359154 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2016/01/27 13:48:01 jperkin Exp $ +# $NetBSD: Makefile,v 1.54 2016/03/21 13:40:28 gdt Exp $ # -DISTNAME= quagga-0.99.24.1 -PKGREVISION= 2 +DISTNAME= quagga-1.0.20160315 CATEGORIES= net MASTER_SITES= http://download.savannah.gnu.org/releases/quagga/ diff --git a/net/quagga/PLIST b/net/quagga/PLIST index 17acd375f173f..a33f22799a2c2 100644 --- a/net/quagga/PLIST +++ b/net/quagga/PLIST @@ -1,8 +1,11 @@ -@comment $NetBSD: PLIST,v 1.16 2015/03/10 16:46:51 gdt Exp $ +@comment $NetBSD: PLIST,v 1.17 2016/03/21 13:40:28 gdt Exp $ +bin/bgp_btoa +bin/test_igmpv3_join include/quagga/buffer.h include/quagga/checksum.h include/quagga/command.h include/quagga/distribute.h +include/quagga/fifo.h include/quagga/filter.h include/quagga/getopt.h include/quagga/hash.h @@ -17,6 +20,7 @@ include/quagga/md5.h include/quagga/memory.h include/quagga/memtypes.h include/quagga/network.h +include/quagga/ospfapi/ospf_apiclient.h include/quagga/ospfd/ospf_api.h include/quagga/ospfd/ospf_asbr.h include/quagga/ospfd/ospf_dump.h @@ -42,6 +46,7 @@ include/quagga/table.h include/quagga/thread.h include/quagga/vector.h include/quagga/version.h +include/quagga/vrf.h include/quagga/vty.h include/quagga/workqueue.h include/quagga/zassert.h @@ -49,18 +54,22 @@ include/quagga/zclient.h include/quagga/zebra.h info/quagga.info lib/libospf.la +lib/libospfapiclient.la lib/libzebra.la man/man1/vtysh.1 man/man8/bgpd.8 man/man8/isisd.8 +man/man8/ospfclient.8 man/man8/ospfd.8 +man/man8/pimd.8 man/man8/ripd.8 man/man8/watchquagga.8 man/man8/zebra.8 -sbin/babeld sbin/bgpd sbin/isisd +sbin/ospfclient sbin/ospfd +sbin/pimd sbin/ripd sbin/watchquagga sbin/zebra @@ -70,11 +79,11 @@ share/doc/quagga/mpls/ChangeLog.opaque.txt share/doc/quagga/mpls/cli_summary.txt share/doc/quagga/mpls/opaque_lsa.txt share/doc/quagga/mpls/ospfd.conf -share/examples/quagga/babeld.conf.sample share/examples/quagga/bgpd.conf.sample share/examples/quagga/bgpd.conf.sample2 share/examples/quagga/isisd.conf.sample share/examples/quagga/log_syslog.conf share/examples/quagga/ospfd.conf.sample +share/examples/quagga/pimd.conf.sample share/examples/quagga/ripd.conf.sample share/examples/quagga/zebra.conf.sample diff --git a/net/quagga/PLIST.opaquelsa b/net/quagga/PLIST.opaquelsa deleted file mode 100644 index fba4a8cea72ca..0000000000000 --- a/net/quagga/PLIST.opaquelsa +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST.opaquelsa,v 1.3 2012/06/07 23:38:16 gdt Exp $ -include/quagga/ospfapi/ospf_apiclient.h -lib/libospfapiclient.la -man/man8/ospfclient.8 -sbin/ospfclient diff --git a/net/quagga/distinfo b/net/quagga/distinfo index 163f8823371c0..d45409e23f3f9 100644 --- a/net/quagga/distinfo +++ b/net/quagga/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.25 2016/01/27 13:48:01 jperkin Exp $ +$NetBSD: distinfo,v 1.26 2016/03/21 13:40:28 gdt Exp $ -SHA1 (quagga-0.99.24.1.tar.gz) = da5d4b1b6f524becb217355f95f99076b7a969d5 -RMD160 (quagga-0.99.24.1.tar.gz) = a6b5c6d93b2d129aa4f627ae0359fa6539de6645 -SHA512 (quagga-0.99.24.1.tar.gz) = 6b15aa3ed961081eba4878ba4a6fb5fd03dd8fc16684f28cf7176f0636c33ed734da8787edf9352c108d9e528dd7ba74e2ee0113e782adc4465945cdae88ec51 -Size (quagga-0.99.24.1.tar.gz) = 2683800 bytes -SHA1 (patch-lib_privs.c) = d86ec56c9f57f38af6cce5285fb95759efc7c8e9 +SHA1 (quagga-1.0.20160315.tar.gz) = 1d7168e2a5b33a1fd6bf89673e4c8f32c7f56ae8 +RMD160 (quagga-1.0.20160315.tar.gz) = dae1a9de36482c0b6306840d375577c300a58f4d +SHA512 (quagga-1.0.20160315.tar.gz) = f17191facc4d5b0bee2d00cc3ecc4d546c6472ce5b081d79458cacca3536bd6dcea10aef480ae117f4a7f466dd88257bf2a3e37ccbe3b3b55f27ef18ead6107f +Size (quagga-1.0.20160315.tar.gz) = 2788131 bytes SHA1 (patch-solaris_quagga.init.in) = 446f9c1efc47d54cb1af0eba47193571b63d91c0 diff --git a/net/quagga/options.mk b/net/quagga/options.mk index 776513483fb47..0674291f2dad4 100644 --- a/net/quagga/options.mk +++ b/net/quagga/options.mk @@ -1,11 +1,9 @@ -# $NetBSD: options.mk,v 1.8 2013/08/07 14:05:15 gdt Exp $ +# $NetBSD: options.mk,v 1.9 2016/03/21 13:40:28 gdt Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.quagga PKG_SUPPORTED_OPTIONS= inet6 -PKG_SUPPORTED_OPTIONS+= quagga-ospf-opaque-lsa PKG_SUPPORTED_OPTIONS+= quagga-vtysh PKG_SUGGESTED_OPTIONS= inet6 -PKG_SUGGESTED_OPTIONS+= quagga-ospf-opaque-lsa PKG_SUGGESTED_OPTIONS+= quagga-vtysh .include "../../mk/bsd.options.mk" @@ -37,13 +35,3 @@ PLIST_CAT+= ${PKGDIR}/PLIST.vtysh .else CONFIGURE_ARGS+= --disable-vtysh .endif - -### -### Include Opaque LSA support in OSPF (RFC2370). -### -.if !empty(PKG_OPTIONS:Mquagga-ospf-opaque-lsa) -# opaque-lsa is now the upstream default. -PLIST_CAT+= ${PKGDIR}/PLIST.opaquelsa -.else -CONFIGURE_ARGS+= --disable-opaque-lsa -.endif diff --git a/net/quagga/patches/patch-lib_privs.c b/net/quagga/patches/patch-lib_privs.c deleted file mode 100644 index c65d89b1bb9e4..0000000000000 --- a/net/quagga/patches/patch-lib_privs.c +++ /dev/null @@ -1,162 +0,0 @@ -$NetBSD: patch-lib_privs.c,v 1.1 2015/01/25 22:14:05 fhajny Exp $ - -Fix minimum privileges setup, makes Quagga work on SunOS. -https://github.com/illumos/illumos-userland/blob/master/components/quagga/patches/75-privs-basicprivset.patch ---- lib/privs.c.orig 2014-08-25 16:56:53.000000000 +0000 -+++ lib/privs.c -@@ -2,7 +2,7 @@ - * Zebra privileges. - * - * Copyright (C) 2003 Paul Jakma. -- * Copyright (C) 2005 Sun Microsystems, Inc. -+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. - * - * This file is part of GNU Zebra. - * -@@ -348,6 +348,26 @@ zprivs_caps_terminate (void) - * - http://blogs.sun.com/roller/page/gbrunett?entry=privilege_enabling_set_id_programs1 - */ - -+static pset_t * -+zprivs_caps_minimal () -+{ -+ pset_t *minimal; -+ -+ if ((minimal = priv_str_to_set("basic", ",", NULL)) == NULL) -+ { -+ fprintf (stderr, "%s: couldn't get basic set!\n", __func__); -+ exit (1); -+ } -+ -+ /* create a minimal privilege set from the basic set */ -+ (void) priv_delset(minimal, PRIV_PROC_EXEC); -+ (void) priv_delset(minimal, PRIV_PROC_INFO); -+ (void) priv_delset(minimal, PRIV_PROC_SESSION); -+ (void) priv_delset(minimal, PRIV_FILE_LINK_ANY); -+ -+ return minimal; -+} -+ - /* convert zebras privileges to system capabilities */ - static pset_t * - zcaps2sys (zebra_capabilities_t *zcaps, int num) -@@ -376,26 +396,34 @@ zcaps2sys (zebra_capabilities_t *zcaps, - int - zprivs_change_caps (zebra_privs_ops_t op) - { -+ pset_t *privset; - - /* should be no possibility of being called without valid caps */ - assert (zprivs_state.syscaps_p); - if (!zprivs_state.syscaps_p) - { -+ fprintf (stderr, "%s: Eek, missing privileged caps!", __func__); -+ exit (1); -+ } -+ -+ assert (zprivs_state.caps); -+ if (!zprivs_state.caps) -+ { - fprintf (stderr, "%s: Eek, missing caps!", __func__); - exit (1); - } -- -- /* to raise: copy original permitted into our working effective set -- * to lower: just clear the working effective set -+ -+ /* to raise: copy original permitted as our working effective set -+ * to lower: copy regular effective set stored in zprivs_state.caps - */ - if (op == ZPRIVS_RAISE) -- priv_copyset (zprivs_state.syscaps_p, zprivs_state.caps); -+ privset = zprivs_state.syscaps_p; - else if (op == ZPRIVS_LOWER) -- priv_emptyset (zprivs_state.caps); -+ privset = zprivs_state.caps; - else - return -1; - -- if (setppriv (PRIV_SET, PRIV_EFFECTIVE, zprivs_state.caps) != 0) -+ if (setppriv (PRIV_SET, PRIV_EFFECTIVE, privset) != 0) - return -1; - - return 0; -@@ -423,15 +451,15 @@ zprivs_state_caps (void) - } - else - { -- if (priv_isemptyset (effective) == B_TRUE) -+ if (priv_isequalset (effective, zprivs_state.syscaps_p)) -+ result = ZPRIVS_RAISED; -+ else if (priv_isequalset (effective, zprivs_state.caps)) - result = ZPRIVS_LOWERED; - else -- result = ZPRIVS_RAISED; -+ result = ZPRIVS_UNKNOWN; - } - -- if (effective) -- priv_freeset (effective); -- -+ priv_freeset (effective); - return result; - } - -@@ -439,7 +467,7 @@ static void - zprivs_caps_init (struct zebra_privs_t *zprivs) - { - pset_t *basic; -- pset_t *empty; -+ pset_t *minimal; - - /* the specified sets */ - zprivs_state.syscaps_p = zcaps2sys (zprivs->caps_p, zprivs->cap_num_p); -@@ -467,14 +495,6 @@ zprivs_caps_init (struct zebra_privs_t * - priv_union (basic, zprivs_state.syscaps_p); - priv_freeset (basic); - -- /* we need an empty set for 'effective', potentially for inheritable too */ -- if ( (empty = priv_allocset()) == NULL) -- { -- fprintf (stderr, "%s: couldn't get empty set!\n", __func__); -- exit (1); -- } -- priv_emptyset (empty); -- - /* Hey kernel, we know about privileges! - * this isn't strictly required, use of setppriv should have same effect - */ -@@ -517,16 +537,19 @@ zprivs_caps_init (struct zebra_privs_t * - exit (1); - } - -- /* now clear the effective set and we're ready to go */ -- if (setppriv (PRIV_SET, PRIV_EFFECTIVE, empty)) -+ /* we need a minimal basic set for 'effective', potentially for inheritable too */ -+ minimal = zprivs_caps_minimal(); -+ -+ /* now set the effective set with a subset of basic privileges */ -+ if (setppriv (PRIV_SET, PRIV_EFFECTIVE, minimal)) - { - fprintf (stderr, "%s: error setting effective set!, %s\n", __func__, - safe_strerror (errno) ); - exit (1); - } - -- /* we'll use this as our working-storage privset */ -- zprivs_state.caps = empty; -+ /* we'll use the minimal set as our working-storage privset */ -+ zprivs_state.caps = minimal; - - /* set methods for the caller to use */ - zprivs->change = zprivs_change_caps; -@@ -538,8 +561,7 @@ zprivs_caps_terminate (void) - { - assert (zprivs_state.caps); - -- /* clear all capabilities */ -- priv_emptyset (zprivs_state.caps); -+ /* clear all capabilities by using working-storage privset */ - setppriv (PRIV_SET, PRIV_EFFECTIVE, zprivs_state.caps); - setppriv (PRIV_SET, PRIV_PERMITTED, zprivs_state.caps); - setppriv (PRIV_SET, PRIV_INHERITABLE, zprivs_state.caps); From 5c6f1713b37b992489a4c70f5319d2e3fa7b729e Mon Sep 17 00:00:00 2001 From: gdt Date: Mon, 21 Mar 2016 13:40:43 +0000 Subject: [PATCH 0342/2457] Updated net/quagga to 1.0.20160315 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 487e314933ae7..486312e4db43d 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1267 2016/03/21 11:40:59 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1268 2016/03/21 13:40:43 gdt Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1665,3 +1665,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/php-owncloud to 9.0.0 [ryoon 2016-03-21] Updated net/owncloudclient to 2.1.1 [ryoon 2016-03-21] Updated editors/Sigil to 0.9.4 [ryoon 2016-03-21] + Updated net/quagga to 1.0.20160315 [gdt 2016-03-21] From 636e4554a55802784415410febbe2a492d2aa06d Mon Sep 17 00:00:00 2001 From: khorben Date: Mon, 21 Mar 2016 17:48:30 +0000 Subject: [PATCH 0343/2457] Add support for CFLAGS This fixes the build with PKGSRC_MKPIE. --- multimedia/fxtv/distinfo | 5 +++-- multimedia/fxtv/patches/patch-aa | 14 ++++++++------ multimedia/fxtv/patches/patch-videolib_Makefile | 16 ++++++++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 multimedia/fxtv/patches/patch-videolib_Makefile diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo index a40c35131b485..4d38d87b2f953 100644 --- a/multimedia/fxtv/distinfo +++ b/multimedia/fxtv/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.17 2015/11/03 23:54:24 agc Exp $ +$NetBSD: distinfo,v 1.18 2016/03/21 17:48:30 khorben Exp $ SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9 RMD160 (fxtv-1.03.tgz) = 740ddbb4e3b58028a6b8f17483bc27b82420f280 SHA512 (fxtv-1.03.tgz) = 5aa0372227f7c8d5b7bdf4885fead20ce174fcd1102e77febcd5166ecc1a8123f15c9b23ca536b9486bd281ff1c872c96f32845a188d503564de9aebc0d26016 Size (fxtv-1.03.tgz) = 198669 bytes -SHA1 (patch-aa) = 1dcf7033dd1b48d49de56d3d814f506741fd38f9 +SHA1 (patch-aa) = 0a1eeea6abc5818b1ae18116465c40ff2fdf0c45 SHA1 (patch-ab) = 803ef888b8894617b4f3516fc6822784aba314ee SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15 SHA1 (patch-actions_c) = 3b1c75de416c66a9f502d9096a31192363da4ac9 @@ -36,3 +36,4 @@ SHA1 (patch-bg) = 8078acbccbb34bb30251187f56cb2a28db579bf4 SHA1 (patch-ca) = f80c76b57cd6b4be91a432d506141896d6630be5 SHA1 (patch-remotetrans_c) = 87e8cc3ad428c082f89d76c018bcca76298d62cf SHA1 (patch-tvscreen_c) = 4e9d49674610e827a42ea02fc350698c435162cf +SHA1 (patch-videolib_Makefile) = a15a33fb4e756d2b2ddfa2e72835b1ffcbcd8c60 diff --git a/multimedia/fxtv/patches/patch-aa b/multimedia/fxtv/patches/patch-aa index 3ea6dfbe041d2..e114b2a351956 100644 --- a/multimedia/fxtv/patches/patch-aa +++ b/multimedia/fxtv/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2011/07/05 03:27:22 dholland Exp $ +$NetBSD: patch-aa,v 1.10 2016/03/21 17:48:30 khorben Exp $ Config for pkgsrc. ---- Makefile.orig 2001-02-12 23:08:59.000000000 +0100 +--- Makefile.orig 2001-02-12 22:08:59.000000000 +0000 +++ Makefile @@ -4,13 +4,10 @@ @@ -36,7 +36,7 @@ Config for pkgsrc. # OpenBSD stuff # ifeq ($(OS),OpenBSD) -@@ -50,10 +38,13 @@ endif +@@ -50,19 +38,22 @@ endif ifeq ($(OS),NetBSD) override RPATH_FLAG = -R endif @@ -52,12 +52,14 @@ Config for pkgsrc. endif # -@@ -62,7 +53,7 @@ endif + # CFLAGS + # ifneq ($(DEBUG),NO) - override CFLAGS = -DDEBUG -g +- override CFLAGS = -DDEBUG -g ++ override CFLAGS += -DDEBUG -g else - override CFLAGS = -DNDEBUG -O2 -+ override CFLAGS = -DNDEBUG ++ override CFLAGS += -DNDEBUG endif C_WARN_FLAG = -Wall override CFLAGS += $(C_WARN_FLAG) $(INC) $(CF_VERS) diff --git a/multimedia/fxtv/patches/patch-videolib_Makefile b/multimedia/fxtv/patches/patch-videolib_Makefile new file mode 100644 index 0000000000000..c029765fe74bc --- /dev/null +++ b/multimedia/fxtv/patches/patch-videolib_Makefile @@ -0,0 +1,16 @@ +$NetBSD: patch-videolib_Makefile,v 1.1 2016/03/21 17:48:30 khorben Exp $ + +--- videolib/Makefile.orig 2001-02-12 19:04:45.000000000 +0000 ++++ videolib/Makefile +@@ -13,9 +13,9 @@ override INC = + # CFLAGS + # + ifneq ($(DEBUG),NO) +- override CFLAGS = -DDEBUG -g ++ override CFLAGS += -DDEBUG -g + else +- override CFLAGS = -DNDEBUG -O2 ++ override CFLAGS += -DNDEBUG -O2 + endif + C_WARN_FLAG = -Wall + override CFLAGS += $(C_WARN_FLAG) $(INC) From 03cb80894d24093969e4068195353a24d28e105c Mon Sep 17 00:00:00 2001 From: khorben Date: Mon, 21 Mar 2016 19:09:09 +0000 Subject: [PATCH 0344/2457] Register missing dependency on devel/ncurses Found with an unprivileged bootstrap on NetBSD/amd64 (--prefer-pkgsrc yes) --- chat/jabberd2/Makefile | 3 ++- net/gssdp/Makefile | 3 ++- net/libsoup/Makefile | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index ada222d1fb7ae..c17df1e70b0c4 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.104 2016/03/05 11:28:07 jperkin Exp $ +# $NetBSD: Makefile,v 1.105 2016/03/21 19:09:09 khorben Exp $ DISTNAME= jabberd-2.3.6 PKGREVISION= 1 @@ -127,6 +127,7 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../net/udns/buildlink3.mk" .include "../../security/gsasl/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile index cb335a84e0c77..a977c75e35f2c 100644 --- a/net/gssdp/Makefile +++ b/net/gssdp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2016/02/04 12:13:31 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2016/03/21 19:09:09 khorben Exp $ DISTNAME= gssdp-0.14.11 PKGREVISION= 4 @@ -20,6 +20,7 @@ PKGCONFIG_OVERRIDE+= gssdp-1.0.pc.in .include "../../devel/glib2/buildlink3.mk" .include "../../devel/gobject-introspection/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../lang/vala/buildlink3.mk" .include "../../net/libsoup/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index e48aed668d357..13f2b72b3dc15 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2016/01/04 14:46:37 leot Exp $ +# $NetBSD: Makefile,v 1.22 2016/03/21 19:09:09 khorben Exp $ DISTNAME= libsoup-2.52.2 CATEGORIES= net gnome @@ -44,6 +44,7 @@ PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/application.mk" .include "../../databases/sqlite3/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0 .include "../../devel/glib2/buildlink3.mk" BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 From d70d336deffa9fa0a295f5b856dcf5949da1bc69 Mon Sep 17 00:00:00 2001 From: khorben Date: Mon, 21 Mar 2016 19:22:14 +0000 Subject: [PATCH 0345/2457] More accurate fix for packages depending on net/libsoup Apparently linking with libsoup requires devel/ncurses too now. --- net/gssdp/Makefile | 3 +-- net/libsoup/buildlink3.mk | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/gssdp/Makefile b/net/gssdp/Makefile index a977c75e35f2c..7081ba07d8946 100644 --- a/net/gssdp/Makefile +++ b/net/gssdp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2016/03/21 19:09:09 khorben Exp $ +# $NetBSD: Makefile,v 1.54 2016/03/21 19:22:14 khorben Exp $ DISTNAME= gssdp-0.14.11 PKGREVISION= 4 @@ -20,7 +20,6 @@ PKGCONFIG_OVERRIDE+= gssdp-1.0.pc.in .include "../../devel/glib2/buildlink3.mk" .include "../../devel/gobject-introspection/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" .include "../../lang/vala/buildlink3.mk" .include "../../net/libsoup/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk index 0b18e0409d4f2..a53654043e126 100644 --- a/net/libsoup/buildlink3.mk +++ b/net/libsoup/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2015/06/08 14:52:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2016/03/21 19:22:14 khorben Exp $ BUILDLINK_TREE+= libsoup @@ -10,6 +10,7 @@ BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .endif # LIBSOUP_BUILDLINK3_MK From adacde3ff61380970cf8e76b14b1f1bdb23913dc Mon Sep 17 00:00:00 2001 From: khorben Date: Mon, 21 Mar 2016 22:52:34 +0000 Subject: [PATCH 0346/2457] Relax the requirement on libncurses to any implementation As suggested by wiz@. net/gssdp still builds with this change. --- net/libsoup/Makefile | 4 ++-- net/libsoup/buildlink3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index 13f2b72b3dc15..751da4418efc3 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2016/03/21 19:09:09 khorben Exp $ +# $NetBSD: Makefile,v 1.23 2016/03/21 22:52:34 khorben Exp $ DISTNAME= libsoup-2.52.2 CATEGORIES= net gnome @@ -44,7 +44,7 @@ PYTHON_FOR_BUILD_ONLY= yes .include "../../lang/python/application.mk" .include "../../databases/sqlite3/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0 .include "../../devel/glib2/buildlink3.mk" BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=0.9.5 diff --git a/net/libsoup/buildlink3.mk b/net/libsoup/buildlink3.mk index a53654043e126..6f766ba55019f 100644 --- a/net/libsoup/buildlink3.mk +++ b/net/libsoup/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2016/03/21 19:22:14 khorben Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2016/03/21 22:52:34 khorben Exp $ BUILDLINK_TREE+= libsoup @@ -8,9 +8,9 @@ LIBSOUP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libsoup+= libsoup>=2.50.0 BUILDLINK_PKGSRCDIR.libsoup?= ../../net/libsoup +.include "../../mk/curses.buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .endif # LIBSOUP_BUILDLINK3_MK From 388a265b7047839d9095fcd637e81e0686d02008 Mon Sep 17 00:00:00 2001 From: khorben Date: Mon, 21 Mar 2016 22:59:37 +0000 Subject: [PATCH 0347/2457] Relax the requirement on libncurses to any implementation As suggested by wiz@. --- chat/jabberd2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index c17df1e70b0c4..23048b971ecd0 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2016/03/21 19:09:09 khorben Exp $ +# $NetBSD: Makefile,v 1.106 2016/03/21 22:59:37 khorben Exp $ DISTNAME= jabberd-2.3.6 PKGREVISION= 1 @@ -127,11 +127,11 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/libidn/buildlink3.mk" -.include "../../devel/ncurses/buildlink3.mk" .include "../../net/udns/buildlink3.mk" .include "../../security/gsasl/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" From 33b026de9439c3e06c8a58513575e2360920ddd4 Mon Sep 17 00:00:00 2001 From: manu Date: Tue, 22 Mar 2016 08:14:00 +0000 Subject: [PATCH 0348/2457] Update glusterfs to 3.7.9 This is a maintenance release --- filesystems/glusterfs/Makefile | 8 +- filesystems/glusterfs/PLIST | 157 +++++++++++++++++---------------- filesystems/glusterfs/distinfo | 8 +- 3 files changed, 87 insertions(+), 86 deletions(-) diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile index 65a4417e23e8a..1bdb401fad1a4 100644 --- a/filesystems/glusterfs/Makefile +++ b/filesystems/glusterfs/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2016/03/05 11:28:29 jperkin Exp $ +# $NetBSD: Makefile,v 1.63 2016/03/22 08:14:00 manu Exp $ -DISTNAME= glusterfs-3.7.8 +DISTNAME= glusterfs-3.7.9 #PKGREVISION= 1 -PKGREVISION= 1 CATEGORIES= filesystems MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ @@ -25,6 +24,7 @@ MAKE_FLAGS+= LEXLIB="" PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # only 2.x supported as of 3.6.0 REPLACE_PYTHON+= contrib/ipaddr-py/ipaddr.py +REPLACE_PYTHON+= extras/geo-rep/schedule_georep.py REPLACE_PYTHON+= extras/snap_scheduler/gcron.py REPLACE_PYTHON+= extras/snap_scheduler/snap_scheduler.py REPLACE_PYTHON+= geo-replication/src/peer_mountbroker.in @@ -78,7 +78,7 @@ SUBST_SED.etc= -e "s,/etc/gluster,${PREFIX}/etc/gluster,g" SUBST_CLASSES+= vol SUBST_STAGE.vol= post-build SUBST_FILES.vol= extras/Makefile -SUBST_SED.vol= -e "/^vol_DATA/s/glusterd.vol/glusterd.vol.sample/g" +SUBST_SED.vol= -e "/vol_DATA/s/glusterd.vol/glusterd.vol.sample/g" EGDIR= ${PREFIX}/etc/glusterfs CONF_FILES+= ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST index a02f3d24cd096..e02d7741de510 100644 --- a/filesystems/glusterfs/PLIST +++ b/filesystems/glusterfs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2016/02/09 11:04:51 manu Exp $ +@comment $NetBSD: PLIST,v 1.32 2016/03/22 08:14:00 manu Exp $ ${PYSITELIB}/gluster/__init__.py ${PYSITELIB}/gluster/__init__.pyc ${PYSITELIB}/gluster/__init__.pyo @@ -23,83 +23,83 @@ include/glusterfs/gfdb/gfdb_data_store_types.h include/glusterfs/gfdb/gfdb_mem-types.h include/glusterfs/gfdb/gfdb_sqlite3.h include/glusterfs/gfdb/gfdb_sqlite3_helper.h -lib/glusterfs/3.7.8/auth/addr.la -lib/glusterfs/3.7.8/auth/login.la -lib/glusterfs/3.7.8/rpc-transport/socket.la -lib/glusterfs/3.7.8/xlator/cluster/afr.la -lib/glusterfs/3.7.8/xlator/cluster/dht.la -lib/glusterfs/3.7.8/xlator/cluster/disperse.so -lib/glusterfs/3.7.8/xlator/cluster/distribute.so -lib/glusterfs/3.7.8/xlator/cluster/ec.la -lib/glusterfs/3.7.8/xlator/cluster/nufa.la -lib/glusterfs/3.7.8/xlator/cluster/pump.la -lib/glusterfs/3.7.8/xlator/cluster/replicate.so -lib/glusterfs/3.7.8/xlator/cluster/stripe.la -lib/glusterfs/3.7.8/xlator/cluster/switch.la -lib/glusterfs/3.7.8/xlator/cluster/tier.la -lib/glusterfs/3.7.8/xlator/debug/error-gen.la -lib/glusterfs/3.7.8/xlator/debug/io-stats.la -lib/glusterfs/3.7.8/xlator/debug/trace.la -lib/glusterfs/3.7.8/xlator/encryption/crypt.la -lib/glusterfs/3.7.8/xlator/encryption/rot-13.la -lib/glusterfs/3.7.8/xlator/features/access-control.so -lib/glusterfs/3.7.8/xlator/features/arbiter.la -lib/glusterfs/3.7.8/xlator/features/barrier.la -lib/glusterfs/3.7.8/xlator/features/bit-rot.la -lib/glusterfs/3.7.8/xlator/features/bitrot-stub.la -lib/glusterfs/3.7.8/xlator/features/cdc.la -lib/glusterfs/3.7.8/xlator/features/changelog.la -lib/glusterfs/3.7.8/xlator/features/changetimerecorder.la -lib/glusterfs/3.7.8/xlator/features/ganesha.la -lib/glusterfs/3.7.8/xlator/features/gfid-access.la -lib/glusterfs/3.7.8/xlator/features/glupy.la -lib/glusterfs/3.7.8/xlator/features/glupy/debug-trace.py -lib/glusterfs/3.7.8/xlator/features/glupy/debug-trace.pyc -lib/glusterfs/3.7.8/xlator/features/glupy/debug-trace.pyo -lib/glusterfs/3.7.8/xlator/features/glupy/helloworld.py -lib/glusterfs/3.7.8/xlator/features/glupy/helloworld.pyc -lib/glusterfs/3.7.8/xlator/features/glupy/helloworld.pyo -lib/glusterfs/3.7.8/xlator/features/glupy/negative.py -lib/glusterfs/3.7.8/xlator/features/glupy/negative.pyc -lib/glusterfs/3.7.8/xlator/features/glupy/negative.pyo -lib/glusterfs/3.7.8/xlator/features/index.la -lib/glusterfs/3.7.8/xlator/features/locks.la -lib/glusterfs/3.7.8/xlator/features/mac-compat.la -lib/glusterfs/3.7.8/xlator/features/marker.la -lib/glusterfs/3.7.8/xlator/features/posix-locks.so -lib/glusterfs/3.7.8/xlator/features/prot_client.la -lib/glusterfs/3.7.8/xlator/features/prot_dht.la -lib/glusterfs/3.7.8/xlator/features/prot_server.la -lib/glusterfs/3.7.8/xlator/features/quiesce.la -lib/glusterfs/3.7.8/xlator/features/quota.la -lib/glusterfs/3.7.8/xlator/features/quotad.la -lib/glusterfs/3.7.8/xlator/features/read-only.la -lib/glusterfs/3.7.8/xlator/features/shard.la -lib/glusterfs/3.7.8/xlator/features/snapview-client.la -lib/glusterfs/3.7.8/xlator/features/snapview-server.la -lib/glusterfs/3.7.8/xlator/features/trash.la -lib/glusterfs/3.7.8/xlator/features/upcall.la -lib/glusterfs/3.7.8/xlator/features/worm.la -lib/glusterfs/3.7.8/xlator/meta.la -lib/glusterfs/3.7.8/xlator/mgmt/glusterd.la -lib/glusterfs/3.7.8/xlator/mount/api.la -lib/glusterfs/3.7.8/xlator/mount/fuse.la -lib/glusterfs/3.7.8/xlator/nfs/server.la -lib/glusterfs/3.7.8/xlator/performance/io-cache.la -lib/glusterfs/3.7.8/xlator/performance/io-threads.la -lib/glusterfs/3.7.8/xlator/performance/md-cache.la -lib/glusterfs/3.7.8/xlator/performance/open-behind.la -lib/glusterfs/3.7.8/xlator/performance/quick-read.la -lib/glusterfs/3.7.8/xlator/performance/read-ahead.la -lib/glusterfs/3.7.8/xlator/performance/readdir-ahead.la -lib/glusterfs/3.7.8/xlator/performance/stat-prefetch.so -lib/glusterfs/3.7.8/xlator/performance/write-behind.la -lib/glusterfs/3.7.8/xlator/protocol/client.la -lib/glusterfs/3.7.8/xlator/protocol/server.la -lib/glusterfs/3.7.8/xlator/storage/posix.la -lib/glusterfs/3.7.8/xlator/system/posix-acl.la -lib/glusterfs/3.7.8/xlator/testing/features/template.la -lib/glusterfs/3.7.8/xlator/testing/performance/symlink-cache.la +lib/glusterfs/3.7.9/auth/addr.la +lib/glusterfs/3.7.9/auth/login.la +lib/glusterfs/3.7.9/rpc-transport/socket.la +lib/glusterfs/3.7.9/xlator/cluster/afr.la +lib/glusterfs/3.7.9/xlator/cluster/dht.la +lib/glusterfs/3.7.9/xlator/cluster/disperse.so +lib/glusterfs/3.7.9/xlator/cluster/distribute.so +lib/glusterfs/3.7.9/xlator/cluster/ec.la +lib/glusterfs/3.7.9/xlator/cluster/nufa.la +lib/glusterfs/3.7.9/xlator/cluster/pump.la +lib/glusterfs/3.7.9/xlator/cluster/replicate.so +lib/glusterfs/3.7.9/xlator/cluster/stripe.la +lib/glusterfs/3.7.9/xlator/cluster/switch.la +lib/glusterfs/3.7.9/xlator/cluster/tier.la +lib/glusterfs/3.7.9/xlator/debug/error-gen.la +lib/glusterfs/3.7.9/xlator/debug/io-stats.la +lib/glusterfs/3.7.9/xlator/debug/trace.la +lib/glusterfs/3.7.9/xlator/encryption/crypt.la +lib/glusterfs/3.7.9/xlator/encryption/rot-13.la +lib/glusterfs/3.7.9/xlator/features/access-control.so +lib/glusterfs/3.7.9/xlator/features/arbiter.la +lib/glusterfs/3.7.9/xlator/features/barrier.la +lib/glusterfs/3.7.9/xlator/features/bit-rot.la +lib/glusterfs/3.7.9/xlator/features/bitrot-stub.la +lib/glusterfs/3.7.9/xlator/features/cdc.la +lib/glusterfs/3.7.9/xlator/features/changelog.la +lib/glusterfs/3.7.9/xlator/features/changetimerecorder.la +lib/glusterfs/3.7.9/xlator/features/ganesha.la +lib/glusterfs/3.7.9/xlator/features/gfid-access.la +lib/glusterfs/3.7.9/xlator/features/glupy.la +lib/glusterfs/3.7.9/xlator/features/glupy/debug-trace.py +lib/glusterfs/3.7.9/xlator/features/glupy/debug-trace.pyc +lib/glusterfs/3.7.9/xlator/features/glupy/debug-trace.pyo +lib/glusterfs/3.7.9/xlator/features/glupy/helloworld.py +lib/glusterfs/3.7.9/xlator/features/glupy/helloworld.pyc +lib/glusterfs/3.7.9/xlator/features/glupy/helloworld.pyo +lib/glusterfs/3.7.9/xlator/features/glupy/negative.py +lib/glusterfs/3.7.9/xlator/features/glupy/negative.pyc +lib/glusterfs/3.7.9/xlator/features/glupy/negative.pyo +lib/glusterfs/3.7.9/xlator/features/index.la +lib/glusterfs/3.7.9/xlator/features/locks.la +lib/glusterfs/3.7.9/xlator/features/mac-compat.la +lib/glusterfs/3.7.9/xlator/features/marker.la +lib/glusterfs/3.7.9/xlator/features/posix-locks.so +lib/glusterfs/3.7.9/xlator/features/prot_client.la +lib/glusterfs/3.7.9/xlator/features/prot_dht.la +lib/glusterfs/3.7.9/xlator/features/prot_server.la +lib/glusterfs/3.7.9/xlator/features/quiesce.la +lib/glusterfs/3.7.9/xlator/features/quota.la +lib/glusterfs/3.7.9/xlator/features/quotad.la +lib/glusterfs/3.7.9/xlator/features/read-only.la +lib/glusterfs/3.7.9/xlator/features/shard.la +lib/glusterfs/3.7.9/xlator/features/snapview-client.la +lib/glusterfs/3.7.9/xlator/features/snapview-server.la +lib/glusterfs/3.7.9/xlator/features/trash.la +lib/glusterfs/3.7.9/xlator/features/upcall.la +lib/glusterfs/3.7.9/xlator/features/worm.la +lib/glusterfs/3.7.9/xlator/meta.la +lib/glusterfs/3.7.9/xlator/mgmt/glusterd.la +lib/glusterfs/3.7.9/xlator/mount/api.la +lib/glusterfs/3.7.9/xlator/mount/fuse.la +lib/glusterfs/3.7.9/xlator/nfs/server.la +lib/glusterfs/3.7.9/xlator/performance/io-cache.la +lib/glusterfs/3.7.9/xlator/performance/io-threads.la +lib/glusterfs/3.7.9/xlator/performance/md-cache.la +lib/glusterfs/3.7.9/xlator/performance/open-behind.la +lib/glusterfs/3.7.9/xlator/performance/quick-read.la +lib/glusterfs/3.7.9/xlator/performance/read-ahead.la +lib/glusterfs/3.7.9/xlator/performance/readdir-ahead.la +lib/glusterfs/3.7.9/xlator/performance/stat-prefetch.so +lib/glusterfs/3.7.9/xlator/performance/write-behind.la +lib/glusterfs/3.7.9/xlator/protocol/client.la +lib/glusterfs/3.7.9/xlator/protocol/server.la +lib/glusterfs/3.7.9/xlator/storage/posix.la +lib/glusterfs/3.7.9/xlator/system/posix-acl.la +lib/glusterfs/3.7.9/xlator/testing/features/template.la +lib/glusterfs/3.7.9/xlator/testing/performance/symlink-cache.la lib/libgfapi.la lib/libgfchangelog.la lib/libgfdb.la @@ -222,6 +222,7 @@ share/glusterfs/scripts/gsync-sync-gfid share/glusterfs/scripts/gsync-upgrade.sh share/glusterfs/scripts/post-upgrade-script-for-quota.sh share/glusterfs/scripts/pre-upgrade-script-for-quota.sh +share/glusterfs/scripts/schedule_georep.py share/glusterfs/scripts/slave-upgrade.sh share/glusterfs/scripts/stop-all-gluster-processes.sh @exec test -d ${PKG_SYSCONFDIR}/glusterd -a ! -d ${VARBASE}/lib/glusterd && ${MKDIR} -p ${VARBASE}/lib/ && mv ${PKG_SYSCONFDIR}/glusterd ${VARBASE}/lib/glusterd && ${LN} -s ${VARBASE}/lib/glusterd ${PKG_SYSCONFDIR}/glusterd diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo index bdcba59688fc1..6cd4fdb291bf0 100644 --- a/filesystems/glusterfs/distinfo +++ b/filesystems/glusterfs/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.48 2016/02/09 11:04:51 manu Exp $ +$NetBSD: distinfo,v 1.49 2016/03/22 08:14:00 manu Exp $ -SHA1 (glusterfs-3.7.8.tar.gz) = 7e35c369e9dbca8125bd977f4d537f7bd6ae3d63 -RMD160 (glusterfs-3.7.8.tar.gz) = b040564a67cd17fb299455532b8c3bb0fb387ea1 -Size (glusterfs-3.7.8.tar.gz) = 7866091 bytes +SHA1 (glusterfs-3.7.9.tar.gz) = 37aafabb849c7bcc5fa1c3017c0f2f0df36ef431 +RMD160 (glusterfs-3.7.9.tar.gz) = 992557a72f0506b0ef97bcb98abad149de7f55e8 +Size (glusterfs-3.7.9.tar.gz) = 7971840 bytes From a58d9267eeedc7931b0005197ccc70406979edde Mon Sep 17 00:00:00 2001 From: manu Date: Tue, 22 Mar 2016 08:14:54 +0000 Subject: [PATCH 0349/2457] Update filesystems/glusterfs to 3.7.9 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 486312e4db43d..9fc55593fb359 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1268 2016/03/21 13:40:43 gdt Exp $ +$NetBSD: CHANGES-2016,v 1.1269 2016/03/22 08:14:54 manu Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1666,3 +1666,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/owncloudclient to 2.1.1 [ryoon 2016-03-21] Updated editors/Sigil to 0.9.4 [ryoon 2016-03-21] Updated net/quagga to 1.0.20160315 [gdt 2016-03-21] + Updated filesystems/glusterfs to 3.7.9 [manu 2016-03-22] From 680d77dfb4a8b824b95747e95be3aea76830626c Mon Sep 17 00:00:00 2001 From: khorben Date: Tue, 22 Mar 2016 11:29:11 +0000 Subject: [PATCH 0350/2457] Register missing dependency on security/openssl This fixes the build with PKGSRC_MKPIE. --- comms/deforaos-phone/Makefile | 3 ++- comms/deforaos-phone/distinfo | 3 ++- .../patches/patch-src_plugins_Makefile | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 comms/deforaos-phone/patches/patch-src_plugins_Makefile diff --git a/comms/deforaos-phone/Makefile b/comms/deforaos-phone/Makefile index 93f72a587a9a1..16079bb0cab16 100644 --- a/comms/deforaos-phone/Makefile +++ b/comms/deforaos-phone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2016/02/20 02:28:14 khorben Exp $ +# $NetBSD: Makefile,v 1.25 2016/03/22 11:29:11 khorben Exp $ DISTNAME= Phone-0.5.0 PKGNAME= deforaos-phone-0.5.0 @@ -40,6 +40,7 @@ post-install: .endif .include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../x11/deforaos-libdesktop/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/deforaos-phone/distinfo b/comms/deforaos-phone/distinfo index a87039532f2a9..09d7a7363d2f8 100644 --- a/comms/deforaos-phone/distinfo +++ b/comms/deforaos-phone/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.8 2016/02/20 02:10:07 khorben Exp $ +$NetBSD: distinfo,v 1.9 2016/03/22 11:29:11 khorben Exp $ SHA1 (Phone-0.5.0.tar.gz) = 59d0eba0bdb135969d5a0d0cecf2c50b717a8eb6 RMD160 (Phone-0.5.0.tar.gz) = fcba14ca763beedabf26e2e73cdc1ffe13fc185f SHA512 (Phone-0.5.0.tar.gz) = a503f2dc549b0dd151ef690d031cc8dd4940625cdb93b12dde5adecdea6550c3df6984a5dd12cd17b162532ef30e9cf2ba772113ae8fd4dd3058c387943c50a2 Size (Phone-0.5.0.tar.gz) = 317290 bytes +SHA1 (patch-src_plugins_Makefile) = f3921e3be820f627162b614860d264b5e5fb22c8 diff --git a/comms/deforaos-phone/patches/patch-src_plugins_Makefile b/comms/deforaos-phone/patches/patch-src_plugins_Makefile new file mode 100644 index 0000000000000..2652a4c9fffb0 --- /dev/null +++ b/comms/deforaos-phone/patches/patch-src_plugins_Makefile @@ -0,0 +1,17 @@ +$NetBSD: patch-src_plugins_Makefile,v 1.1 2016/03/22 11:29:11 khorben Exp $ + +Build and link the "smscrypt" plug-in with OpenSSL as required. + +--- src/plugins/Makefile.orig 2016-03-22 11:22:04.000000000 +0000 ++++ src/plugins/Makefile +@@ -115,8 +115,8 @@ $(OBJDIR)profiles$(SOEXT): $(profiles_OB + $(CCSHARED) -o $(OBJDIR)profiles$(SOEXT) $(profiles_OBJS) $(profiles_LDFLAGS) + + smscrypt_OBJS = $(OBJDIR)smscrypt.o +-smscrypt_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) +-smscrypt_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) ++smscrypt_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags openssl` ++smscrypt_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` + + $(OBJDIR)smscrypt$(SOEXT): $(smscrypt_OBJS) + $(CCSHARED) -o $(OBJDIR)smscrypt$(SOEXT) $(smscrypt_OBJS) $(smscrypt_LDFLAGS) From 3efe6aeb01769296fae25cd1f4bddcd27318fa63 Mon Sep 17 00:00:00 2001 From: khorben Date: Tue, 22 Mar 2016 14:43:53 +0000 Subject: [PATCH 0351/2457] Register missing dependency on curses Found with an unprivileged bootstrap on NetBSD/amd64 (--prefer-pkgsrc yes) --- print/cups/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/print/cups/Makefile b/print/cups/Makefile index 3b23cb1b552eb..2fc3360743d21 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.228 2016/03/05 11:27:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.229 2016/03/22 14:43:53 khorben Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -179,6 +179,7 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../print/libpaper/buildlink3.mk" From 3244e00bd8020d9fb304bbbfeadc1937cb1a0b62 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 22 Mar 2016 16:57:55 +0000 Subject: [PATCH 0352/2457] Update contao35 to 3.5.9, a leaf package. Version 3.5.9 (2016-03-21) -------------------------- ### Fixed Prevent the autofocus attribute from being added multiple times (see #8281). ### Fixed Respect the SSL settings of the root page when generating sitemaps (see #8270). ### Fixed Read from the temporary file if it has not been closed yet (see #8269). ### Fixed Always use HTTPS if the target server supports SSL connections (see #8183). ### Fixed Adjust the meta wizard field length to the column length (see #8277). ### Fixed Correctly handle custom mime icon paths (see #8275). ### Fixed Only log errors that have been configured to get logged (see #8267). ### Fixed Show the 404 error page if an unpublished article is requested (see #8264). ### Fixed Correctly count the URLs when rebuilding the search index (see #8262). ### Fixed Ensure that every image has a width and height attribute (see #8162). ### Fixed Set the correct mime type when embedding SVG images (see #8245). ### Fixed Handle the "float_left" and "float_right" classes in the back end (see #8239). ### Fixed Consider the fallback language if a page alias is ambiguous (see #8142). ### Fixed Fix the error 403/404 redirect (see contao/website#74). --- www/contao35/Makefile | 4 ++-- www/contao35/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/www/contao35/Makefile b/www/contao35/Makefile index d8ce761c40cb0..1c1b9c5b4d730 100644 --- a/www/contao35/Makefile +++ b/www/contao35/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2016/03/05 06:16:44 taca Exp $ +# $NetBSD: Makefile,v 1.10 2016/03/22 16:57:55 taca Exp $ # DISTNAME= contao-${CT_PKGVER} @@ -23,7 +23,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib DEPENDS+= bash>=4.0:../../shells/bash -CT_VERSION= 3.5.8 +CT_VERSION= 3.5.9 USE_TOOLS= bash pax NO_BUILD= yes FILESDIR?= ${.CURDIR}/files diff --git a/www/contao35/distinfo b/www/contao35/distinfo index bc01edd35846b..ebb91c46bae65 100644 --- a/www/contao35/distinfo +++ b/www/contao35/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.7 2016/03/05 06:16:44 taca Exp $ +$NetBSD: distinfo,v 1.8 2016/03/22 16:57:55 taca Exp $ -SHA1 (contao-3.5.8.tar.gz) = 4027059bbebf95ebead8a40d8ae7596f798b156a -RMD160 (contao-3.5.8.tar.gz) = 2f56a1be019d79df41d1b8936489570db92293d1 -SHA512 (contao-3.5.8.tar.gz) = 4dd0a83f06cd3fbb886bc45e825de6d848ab477ead135aaf95a5c272b6a0ae56be275f5e0521145983cc4efe59ef92ef1ccb6e9f0069ce69e0b053c2c47bf9db -Size (contao-3.5.8.tar.gz) = 11867646 bytes +SHA1 (contao-3.5.9.tar.gz) = dd3bd2afd64416be92dfc015f359d476d8d11e41 +RMD160 (contao-3.5.9.tar.gz) = 7a7ec9756928af33f315d9fded655ad22bf8cbd4 +SHA512 (contao-3.5.9.tar.gz) = 431c6d698d0fd8446b04e86e6e82fd81fd6454598832d995014f737d411dd23baf143fa7989cdec5b277d50fb8978f5edccaa011ae29b82b55ec1033b8dcb767 +Size (contao-3.5.9.tar.gz) = 11867993 bytes From c6cde54382fcbb334e11115453db6082d27d3295 Mon Sep 17 00:00:00 2001 From: taca Date: Tue, 22 Mar 2016 16:58:30 +0000 Subject: [PATCH 0353/2457] Note update of www/contao35 package to 3.5.9. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 9fc55593fb359..5980ddcee9332 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1269 2016/03/22 08:14:54 manu Exp $ +$NetBSD: CHANGES-2016,v 1.1270 2016/03/22 16:58:30 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1667,3 +1667,4 @@ Changes to the packages collection and infrastructure in 2016: Updated editors/Sigil to 0.9.4 [ryoon 2016-03-21] Updated net/quagga to 1.0.20160315 [gdt 2016-03-21] Updated filesystems/glusterfs to 3.7.9 [manu 2016-03-22] + Updated www/contao35 to 3.5.9 [taca 2016-03-22] From 74b586bed44a005e72af2bd281429144f0d3e334 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 22 Mar 2016 18:55:30 +0000 Subject: [PATCH 0354/2457] Deal with API changes of jpeg-9. --- graphics/cpia2view/distinfo | 4 ++-- graphics/cpia2view/patches/patch-jpeg__decode.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/cpia2view/distinfo b/graphics/cpia2view/distinfo index 35f0bff9fbbc4..3edbbcb29f822 100644 --- a/graphics/cpia2view/distinfo +++ b/graphics/cpia2view/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 21:33:54 agc Exp $ +$NetBSD: distinfo,v 1.7 2016/03/22 18:55:30 joerg Exp $ SHA1 (cpia2_driver-1.0.tgz) = 72c70f88fd894118510e761c9c9f5f5a928e7e42 RMD160 (cpia2_driver-1.0.tgz) = bdec7a2cd68c08d10a734ad66f16433b9622ba84 @@ -14,4 +14,4 @@ SHA1 (patch-ac) = f4645a7c31dbbc9232ecdc71619ba1c4b777b266 SHA1 (patch-ad) = 4e92276bb154bdb33af581a278c1bb656d139895 SHA1 (patch-ae) = 4f2f601f02e4d5060ce39d002fad8aaa5cdc5afc SHA1 (patch-af) = 11cfd02d70bd35e8485f3d92a3cb3e8b96f480d3 -SHA1 (patch-jpeg__decode.c) = 102e8afe4a8a8cf650cd4811ea7d687ad10cdf98 +SHA1 (patch-jpeg__decode.c) = 82290a80d6ced8d7a724b9828c127a854bebc6b3 diff --git a/graphics/cpia2view/patches/patch-jpeg__decode.c b/graphics/cpia2view/patches/patch-jpeg__decode.c index 81f3bb22f705e..24267ddf7668c 100644 --- a/graphics/cpia2view/patches/patch-jpeg__decode.c +++ b/graphics/cpia2view/patches/patch-jpeg__decode.c @@ -1,6 +1,6 @@ -$NetBSD: patch-jpeg__decode.c,v 1.1 2014/02/10 11:43:09 obache Exp $ +$NetBSD: patch-jpeg__decode.c,v 1.2 2016/03/22 18:55:30 joerg Exp $ -* To match prototype from jpeg>=8 library. +* To match prototype from jpeg>=9 library. --- jpeg_decode.c.orig 2014-02-10 11:34:47.000000000 +0000 +++ jpeg_decode.c @@ -9,7 +9,7 @@ GLOBAL(void) -jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * source_ptr, size_t source_length) -+jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * source_ptr, unsigned long source_length) ++jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * source_ptr, unsigned long source_length) { mem_src_ptr src; From ee9cc64fcc91b1d2472bae9a25e079430839ba77 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 22 Mar 2016 18:56:36 +0000 Subject: [PATCH 0355/2457] Help configure to find shutdown on NetBSD where PATH might not contain /sbin. --- sysutils/apcupsd/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index a355a7de22d97..b584b915d28ed 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2016/02/26 10:24:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.82 2016/03/22 18:56:36 joerg Exp $ DISTNAME= apcupsd-3.14.13r2365 CATEGORIES= sysutils @@ -51,6 +51,8 @@ CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin CONFIGURE_ENV+= SCRIPTSHELL=${TOOLS_SH:Q} CONFIGURE_ENV+= ac_cv_path_MAKE=${MAKE:Q} LD=${CXX} +CONFIGURE_ARGS.NetBSD+= ac_cv_path_SHUTDOWN=/sbin/shutdown + EGDIR= ${PREFIX}/share/examples/apcupsd CONF_FILES_PERMS+= ${EGDIR}/apcupsd.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644 From d7592d9539cf974e8fdf4b333fc995d08e655767 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 22 Mar 2016 18:57:04 +0000 Subject: [PATCH 0356/2457] Add comment to explain why MAKE_JOBS=no is needed. --- misc/koffice/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile index e2608a24c73cc..87349d78bcbc3 100644 --- a/misc/koffice/Makefile +++ b/misc/koffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.176 2016/03/05 11:28:56 jperkin Exp $ +# $NetBSD: Makefile,v 1.177 2016/03/22 18:57:04 joerg Exp $ DISTNAME= koffice-1.6.3 PKGREVISION= 67 @@ -11,6 +11,7 @@ HOMEPAGE= http://www.koffice.org/ COMMENT= KDE Office Suite LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 +# moc use is not serialised with all consumers MAKE_JOBS_SAFE= no PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ From 62ab2616533d2c2153b68f9a05b9bd37fc380d3e Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 22 Mar 2016 18:58:27 +0000 Subject: [PATCH 0357/2457] Fix build against Qt5 when reduced-relocation hack is active. --- math/octave/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/math/octave/Makefile b/math/octave/Makefile index f12f33e793f98..0706d0104d122 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.134 2016/03/05 11:28:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.135 2016/03/22 18:58:27 joerg Exp $ DISTNAME= octave-4.0.0 PKGREVISION= 1 @@ -82,6 +82,12 @@ SUBST_SED.qt5-pkg-config+= -e 's,QtGui,Qt5Widgets,g' SUBST_SED.qt5-pkg-config+= -e 's,QtNetwork,Qt5Network,g' SUBST_SED.qt5-pkg-config+= -e 's,QtOpenGL,Qt5OpenGL,g' +# Matches reduce-relocations logic in x11/qt5-qtbase +.if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && \ + (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)) +CFLAGS+= -fPIC +.endif + PREPEND_PATH+= ${QTDIR}/bin MAKE_ENV+= V=1 From e485c2c507160c981a436581947759a74ae95c80 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 22 Mar 2016 19:01:17 +0000 Subject: [PATCH 0358/2457] Requires Python for build. Fix UB on left shift of negative values. --- lang/micropython/Makefile | 12 +++++++++--- lang/micropython/distinfo | 7 ++++--- lang/micropython/patches/patch-py_obj.h | 15 +++++++++++++++ .../{patch-Makefile => patch-unix_Makefile} | 12 ++++++------ ...h-mpconfigport.h => patch-unix_mpconfigport.h} | 8 ++++---- 5 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 lang/micropython/patches/patch-py_obj.h rename lang/micropython/patches/{patch-Makefile => patch-unix_Makefile} (85%) rename lang/micropython/patches/{patch-mpconfigport.h => patch-unix_mpconfigport.h} (58%) diff --git a/lang/micropython/Makefile b/lang/micropython/Makefile index 8cfe3e44cfc7d..7e0807865d5fc 100644 --- a/lang/micropython/Makefile +++ b/lang/micropython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/01/18 07:54:51 agc Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/22 19:01:17 joerg Exp $ DISTNAME= micropython-1.5.2 CATEGORIES= lang @@ -10,13 +10,19 @@ HOMEPAGE= https://micropython.org/ COMMENT= Embedded version of python LICENSE= mit -WRKSRC= ${WRKDIR}/${DISTNAME}/unix DIST_SUBDIR= ${PKGNAME_NOREV} +BUILD_DIRS= unix USE_TOOLS+= gmake pkg-config AUTO_MKDIRS= yes -.include "../../devel/libffi/buildlink3.mk" +MAKE_FLAGS+= PYTHON=${PYTHONBIN} + +REPLACE_PYTHON+= tools/make-frozen.py +PYTHON_FOR_BUILD_ONLY= yes + +.include "../../devel/libffi/buildlink3.mk" +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/micropython/distinfo b/lang/micropython/distinfo index 58a09f64d63e5..988255f5e934e 100644 --- a/lang/micropython/distinfo +++ b/lang/micropython/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.1 2016/01/18 07:54:51 agc Exp $ +$NetBSD: distinfo,v 1.2 2016/03/22 19:01:17 joerg Exp $ SHA1 (micropython-1.5.2/micropython-1.5.2.tar.gz) = 493cf36aa722b50b6034efb8de6433dcea546b0f RMD160 (micropython-1.5.2/micropython-1.5.2.tar.gz) = 0f5c316ecd716734fe8e1dbdf9a360ef6f126b85 SHA512 (micropython-1.5.2/micropython-1.5.2.tar.gz) = 309dcb20a3369ac5bec92a6a5cd8af37d671fc2a8e3b6a36c4c49d1f4730eaaa46dffb2351eb5783de12f045069554c22ee70c0100cf98ab09138ef42594a65a Size (micropython-1.5.2/micropython-1.5.2.tar.gz) = 6673101 bytes -SHA1 (patch-Makefile) = fd7a3c143cd6c4137782b0ed2e1b361e13910364 -SHA1 (patch-mpconfigport.h) = 7cd3b0604f6f7941e5a44d276fd8393ba71b5447 +SHA1 (patch-py_obj.h) = b945ad9b6c2e8dd4631c88b7c3c3d1008fe40fae +SHA1 (patch-unix_Makefile) = 302b1963bbf36dd7513380bfa34fa9cbf358aeaf +SHA1 (patch-unix_mpconfigport.h) = beb3b1b94cbb0cb81b24ef956f6f24cd86ca0194 diff --git a/lang/micropython/patches/patch-py_obj.h b/lang/micropython/patches/patch-py_obj.h new file mode 100644 index 0000000000000..6acf8e9b57cc7 --- /dev/null +++ b/lang/micropython/patches/patch-py_obj.h @@ -0,0 +1,15 @@ +$NetBSD: patch-py_obj.h,v 1.1 2016/03/22 19:01:17 joerg Exp $ + +Avoid Undefined Behavior. + +--- py/obj.h.orig 2016-03-02 16:07:50.524241926 +0000 ++++ py/obj.h +@@ -81,7 +81,7 @@ typedef struct _mp_obj_base_t mp_obj_bas + static inline bool MP_OBJ_IS_SMALL_INT(mp_const_obj_t o) + { return ((((mp_int_t)(o)) & 1) != 0); } + #define MP_OBJ_SMALL_INT_VALUE(o) (((mp_int_t)(o)) >> 1) +-#define MP_OBJ_NEW_SMALL_INT(small_int) ((mp_obj_t)((((mp_int_t)(small_int)) << 1) | 1)) ++#define MP_OBJ_NEW_SMALL_INT(small_int) ((mp_obj_t)((((mp_int_t)(small_int)) * 2) | 1)) + + static inline bool MP_OBJ_IS_QSTR(mp_const_obj_t o) + { return ((((mp_int_t)(o)) & 3) == 2); } diff --git a/lang/micropython/patches/patch-Makefile b/lang/micropython/patches/patch-unix_Makefile similarity index 85% rename from lang/micropython/patches/patch-Makefile rename to lang/micropython/patches/patch-unix_Makefile index 265b502053166..1ea96a9a9bde2 100644 --- a/lang/micropython/patches/patch-Makefile +++ b/lang/micropython/patches/patch-unix_Makefile @@ -1,10 +1,10 @@ -$NetBSD: patch-Makefile,v 1.1 2016/01/18 07:54:51 agc Exp $ +$NetBSD: patch-unix_Makefile,v 1.1 2016/03/22 19:01:17 joerg Exp $ Invoke gmake properly ---- Makefile 2016/01/09 21:43:06 1.1 -+++ Makefile 2016/01/09 21:51:39 -@@ -149,14 +149,13 @@ +--- unix/Makefile.orig 2015-12-31 14:43:19.000000000 +0000 ++++ unix/Makefile +@@ -149,14 +149,13 @@ test: $(PROG) ../tests/run-tests # install micropython in /usr/local/bin TARGET = micropython @@ -22,7 +22,7 @@ Invoke gmake properly # uninstall micropython uninstall: -@@ -196,12 +195,12 @@ +@@ -196,12 +195,12 @@ $(BUILD)/_frozen_upip.c: $(BUILD)/frozen ../tools/make-frozen.py $(dir $^) > $@ # Select latest upip version available @@ -37,7 +37,7 @@ Invoke gmake properly $(Q)rm -rf $(dir $@) $(Q)mkdir -p $(dir $@) $(Q)cp $(BUILD)/micropython-upip-*/upip*.py $(dir $@) -@@ -224,10 +223,10 @@ +@@ -224,10 +223,10 @@ libffi: cd ../lib/libffi; ./autogen.sh mkdir -p ../lib/libffi/build_dir; cd ../lib/libffi/build_dir; \ ../configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; \ diff --git a/lang/micropython/patches/patch-mpconfigport.h b/lang/micropython/patches/patch-unix_mpconfigport.h similarity index 58% rename from lang/micropython/patches/patch-mpconfigport.h rename to lang/micropython/patches/patch-unix_mpconfigport.h index 26a676de31155..bc689acf6dc0f 100644 --- a/lang/micropython/patches/patch-mpconfigport.h +++ b/lang/micropython/patches/patch-unix_mpconfigport.h @@ -1,10 +1,10 @@ -$NetBSD: patch-mpconfigport.h,v 1.1 2016/01/18 07:54:51 agc Exp $ +$NetBSD: patch-unix_mpconfigport.h,v 1.1 2016/03/22 19:01:17 joerg Exp $ Generalise for all BSDs ---- mpconfigport.h 2016/01/09 20:30:55 1.1 -+++ mpconfigport.h 2016/01/09 20:32:14 -@@ -251,7 +251,8 @@ +--- unix/mpconfigport.h.orig 2015-12-31 14:43:19.000000000 +0000 ++++ unix/mpconfigport.h +@@ -261,7 +261,8 @@ void mp_hal_dupterm_tx_strn(const char * // We need to provide a declaration/definition of alloca() // unless support for it is disabled. #if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0 From 8ce97595c59dd163aa612ff73b75671c578ac1e2 Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 22 Mar 2016 19:01:46 +0000 Subject: [PATCH 0359/2457] Not MAKE_JOBS_SAFE. --- geography/libspatialite/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/geography/libspatialite/Makefile b/geography/libspatialite/Makefile index 16143ab3b39d4..65090fb4580b0 100644 --- a/geography/libspatialite/Makefile +++ b/geography/libspatialite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2015/11/27 14:03:33 adam Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/22 19:01:46 joerg Exp $ DISTNAME= libspatialite-4.3.0a CATEGORIES= geography @@ -16,6 +16,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-examples PKGCONFIG_OVERRIDE= spatialite.pc.in +# src/shapefiles wants to create both a module and library +# from the same sources. This confuses some temporary file handling +# in libtool 2.4.2. +MAKE_JOBS_SAFE=no + .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../geography/geos/buildlink3.mk" From c8824a98cdf3f0cf69042e59cf6a9969a94dab03 Mon Sep 17 00:00:00 2001 From: richard Date: Tue, 22 Mar 2016 19:31:15 +0000 Subject: [PATCH 0360/2457] Get a working ast-ksh build for SunOS using c99 and defining _XPG6 (and __EXTENSIONS__ for strict STDC). Also needs -lm. Fix testing to work prior to [stage-]install. No revbump needed. okay'd by jperkin@ NB there are still some corner cases not working on some SunOS, but on illumos SunOS 5.11 this actually goes a real long way over stock sh/ksh! --- shells/ast-ksh/Makefile.common | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common index 8771e6c7d3004..d892a86a10c3e 100644 --- a/shells/ast-ksh/Makefile.common +++ b/shells/ast-ksh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.33 2014/07/03 15:00:41 wiz Exp $ +# $NetBSD: Makefile.common,v 1.34 2016/03/22 19:31:15 richard Exp $ # # used by shells/ast-ksh/Makefile # used by shells/static-ast-ksh/Makefile @@ -41,6 +41,14 @@ PDKSH= /bin/ksh KSH93_MAKEFLAGS+= CCFLAGS=-lm .endif +.if ${OPSYS} == "SunOS" +# need c99 and _XPG6 in order to avoid patching libast/features/standards +# __EXTENSIONS__ is needed in case of __STDC__ == 1 (i.e. -std=c99 not gnu99) +# for things like mamake, ratz and some others for now. +USE_LANGUAGES+= c99 +KSH93_MAKEFLAGS+= LDFLAGS=-lm CCFLAGS="-D_XPG6 -D__EXTENSIONS__" +.endif + PKG_SHELL= bin/ksh93 INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 @@ -65,8 +73,11 @@ do-install: # Part of regression test do-test: - @cd ${WRKSRC:Q}/src/cmd/ksh93/tests && \ - ${SETENV} SHELL=${PREFIX:Q}/bin/ksh93 ${PREFIX:Q}/bin/ksh93 shtests + @set -e; \ + arch=`${WRKSRC}/bin/package host`; \ + cd ${WRKSRC:Q}/src/cmd/ksh93/tests && \ + ${SETENV} SHELL=${WRKSRC}/arch/"$${arch}"/bin/ksh \ + ${WRKSRC}/arch/"$${arch}"/bin/ksh shtests # XXX Their 'test' target needs nmake (Korn's another tool) # @cd ${WRKSRC}; \ # ${SETENV} SHELL=${PDKSH} ${PDKSH} ./bin/package test From 6b54bc3b171eba42ed01ac51971bfb8b73bb97bf Mon Sep 17 00:00:00 2001 From: tez Date: Tue, 22 Mar 2016 19:38:15 +0000 Subject: [PATCH 0361/2457] Fix for CVE-2016-3191 from http://vcs.pcre.org/pcre?view=revision&revision=1631 --- devel/pcre/Makefile | 4 +- devel/pcre/distinfo | 6 ++- devel/pcre/patches/patch-pcre_compile.c | 60 ++++++++++++++++++++++-- devel/pcre/patches/patch-pcre_internal.h | 25 ++++++++++ devel/pcre/patches/patch-pcreposix.c | 26 ++++++++++ doc/CHANGES-2016 | 3 +- 6 files changed, 116 insertions(+), 8 deletions(-) create mode 100644 devel/pcre/patches/patch-pcre_internal.h create mode 100644 devel/pcre/patches/patch-pcreposix.c diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 2887c79d386df..12cb348f31bbf 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.78 2016/03/18 21:25:10 tez Exp $ +# $NetBSD: Makefile,v 1.79 2016/03/22 19:38:15 tez Exp $ DISTNAME= pcre-8.38 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ \ diff --git a/devel/pcre/distinfo b/devel/pcre/distinfo index 93c5fb991e210..d51b2d5cc15cf 100644 --- a/devel/pcre/distinfo +++ b/devel/pcre/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.59 2016/03/18 21:25:10 tez Exp $ +$NetBSD: distinfo,v 1.60 2016/03/22 19:38:15 tez Exp $ SHA1 (pcre-8.38.tar.bz2) = ae84e3b3ef0764788ce33b1adeff1add938126e1 RMD160 (pcre-8.38.tar.bz2) = eba6da5ef34780f63f8b96c60bd70ac197df3b52 @@ -7,4 +7,6 @@ Size (pcre-8.38.tar.bz2) = 1562265 bytes SHA1 (patch-aa) = ed20cfb5ca7b1e620e368c8e41a7f691d6f93282 SHA1 (patch-ab) = 0b8fbde09c27e2716e5bfa32abce8ee4a79fb7fb SHA1 (patch-doc_pcredemo.3) = 90f9b3a021f58973149d839735d40c5e2e245912 -SHA1 (patch-pcre_compile.c) = a901b33130bc421eb16883cc2de959b452e13840 +SHA1 (patch-pcre_compile.c) = 71ab3ebc517dc7c1fe74c447e0c2b1391c1403c7 +SHA1 (patch-pcre_internal.h) = 0005aded75cb7e68e1a271ed6f64174a5343c94b +SHA1 (patch-pcreposix.c) = 39ed9f8eb3fba1de64cbeae1fd8ff7ea88a383e2 diff --git a/devel/pcre/patches/patch-pcre_compile.c b/devel/pcre/patches/patch-pcre_compile.c index 62b62de171753..4907cc5c6014e 100644 --- a/devel/pcre/patches/patch-pcre_compile.c +++ b/devel/pcre/patches/patch-pcre_compile.c @@ -1,11 +1,65 @@ -$NetBSD: patch-pcre_compile.c,v 1.1 2016/03/18 21:25:10 tez Exp $ +$NetBSD: patch-pcre_compile.c,v 1.2 2016/03/22 19:38:15 tez Exp $ Fix for CVE-2016-1283 from http://vcs.pcre.org/pcre?view=revision&revision=1636 ---- pcre_compile.c.orig 2016-03-18 21:00:47.095736300 +0000 +Fix for CVE-2016-3191 from + http://vcs.pcre.org/pcre?view=revision&revision=1631 + +--- pcre_compile.c.orig 2015-11-23 12:37:21.000000000 +0000 +++ pcre_compile.c -@@ -7274,7 +7274,12 @@ for (;; ptr++) +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -560,6 +560,7 @@ static const char error_texts[] = + /* 85 */ + "parentheses are too deeply nested (stack check)\0" + "digits missing in \\x{} or \\o{}\0" ++ "regular expression is too complicated\0" + ; + + /* Table to identify digits and hex digits. This is used when compiling +@@ -4591,7 +4592,8 @@ for (;; ptr++) + if (code > cd->start_workspace + cd->workspace_size - + WORK_SIZE_SAFETY_MARGIN) /* Check for overrun */ + { +- *errorcodeptr = ERR52; ++ *errorcodeptr = (code >= cd->start_workspace + cd->workspace_size)? ++ ERR52 : ERR87; + goto FAILED; + } + +@@ -6604,8 +6606,21 @@ for (;; ptr++) + cd->had_accept = TRUE; + for (oc = cd->open_caps; oc != NULL; oc = oc->next) + { +- *code++ = OP_CLOSE; +- PUT2INC(code, 0, oc->number); ++ if (lengthptr != NULL) ++ { ++#ifdef COMPILE_PCRE8 ++ *lengthptr += 1 + IMM2_SIZE; ++#elif defined COMPILE_PCRE16 ++ *lengthptr += 2 + IMM2_SIZE; ++#elif defined COMPILE_PCRE32 ++ *lengthptr += 4 + IMM2_SIZE; ++#endif ++ } ++ else ++ { ++ *code++ = OP_CLOSE; ++ PUT2INC(code, 0, oc->number); ++ } + } + setverb = *code++ = + (cd->assert_depth > 0)? OP_ASSERT_ACCEPT : OP_ACCEPT; +@@ -7274,7 +7289,12 @@ for (;; ptr++) so far in order to get the number. If the name is not found, leave the value of recno as 0 for a forward reference. */ diff --git a/devel/pcre/patches/patch-pcre_internal.h b/devel/pcre/patches/patch-pcre_internal.h new file mode 100644 index 0000000000000..00a6da49e1b93 --- /dev/null +++ b/devel/pcre/patches/patch-pcre_internal.h @@ -0,0 +1,25 @@ +$NetBSD: patch-pcre_internal.h,v 1.1 2016/03/22 19:38:15 tez Exp $ + +Fix for CVE-2016-3191 from + http://vcs.pcre.org/pcre?view=revision&revision=1631 + +--- pcre_internal.h.orig 2016-03-22 19:14:14.468718400 +0000 ++++ pcre_internal.h +@@ -7,7 +7,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -2289,7 +2289,7 @@ enum { ERR0, ERR1, ERR2, ERR3, ERR4, + ERR50, ERR51, ERR52, ERR53, ERR54, ERR55, ERR56, ERR57, ERR58, ERR59, + ERR60, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, + ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, +- ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERRCOUNT }; ++ ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERRCOUNT }; + + /* JIT compiling modes. The function list is indexed by them. */ + diff --git a/devel/pcre/patches/patch-pcreposix.c b/devel/pcre/patches/patch-pcreposix.c new file mode 100644 index 0000000000000..4b5c03c4acfa1 --- /dev/null +++ b/devel/pcre/patches/patch-pcreposix.c @@ -0,0 +1,26 @@ +$NetBSD: patch-pcreposix.c,v 1.1 2016/03/22 19:38:15 tez Exp $ + +Fix for CVE-2016-3191 from + http://vcs.pcre.org/pcre?view=revision&revision=1631 + +--- pcreposix.c.orig 2016-03-22 19:29:47.648202900 +0000 ++++ pcreposix.c +@@ -6,7 +6,7 @@ + and semantics are as close as possible to those of the Perl 5 language. + + Written by Philip Hazel +- Copyright (c) 1997-2014 University of Cambridge ++ Copyright (c) 1997-2016 University of Cambridge + + ----------------------------------------------------------------------------- + Redistribution and use in source and binary forms, with or without +@@ -173,7 +173,8 @@ static const int eint[] = { + REG_BADPAT, /* group name must start with a non-digit */ + /* 85 */ + REG_BADPAT, /* parentheses too deeply nested (stack check) */ +- REG_BADPAT /* missing digits in \x{} or \o{} */ ++ REG_BADPAT, /* missing digits in \x{} or \o{} */ ++ REG_BADPAT /* pattern too complicated */ + }; + + /* Table of texts corresponding to POSIX error codes */ diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 5980ddcee9332..6adcd2fa0a56f 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1270 2016/03/22 16:58:30 taca Exp $ +$NetBSD: CHANGES-2016,v 1.1271 2016/03/22 19:39:12 tez Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1668,3 +1668,4 @@ Changes to the packages collection and infrastructure in 2016: Updated net/quagga to 1.0.20160315 [gdt 2016-03-21] Updated filesystems/glusterfs to 3.7.9 [manu 2016-03-22] Updated www/contao35 to 3.5.9 [taca 2016-03-22] + Updated devel/pcre to 8.38nb2 [tez 2016-03-22] From ff1ed6f90d12a09d03a41c34be9fe31e551dea84 Mon Sep 17 00:00:00 2001 From: leot Date: Tue, 22 Mar 2016 20:10:15 +0000 Subject: [PATCH 0362/2457] Add www/webkit-gtk/hacks.mk also to www/webkit24-gtk* that from 2.4.10 is affected by the same problem. Should fix build issues on NetBSD/i386 (noticed via tnn@'s bulk builds). --- www/webkit24-gtk/hacks.mk | 16 ++++++++++++++++ www/webkit24-gtk3/hacks.mk | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 www/webkit24-gtk/hacks.mk create mode 100644 www/webkit24-gtk3/hacks.mk diff --git a/www/webkit24-gtk/hacks.mk b/www/webkit24-gtk/hacks.mk new file mode 100644 index 0000000000000..1ef8b3c171521 --- /dev/null +++ b/www/webkit24-gtk/hacks.mk @@ -0,0 +1,16 @@ +# $NetBSD: hacks.mk,v 1.1 2016/03/22 20:10:15 leot Exp $ + +.if !defined(WEBKIT24_GTK_HACKS_MK) +WEBKIT24_GTK_HACKS_MK= defined + +# [Sun Mar 20 12:21:27 CET 2016 : leot] +# On i386 archs -latomic is added during the build phase and lead to a failure +# when linking various binaries/libraries. +# Forcing -march=i586 (or better) avoids that (i[56]86 provide required +# 64-bit compare-and-swap instruction). +.if ${MACHINE_ARCH} == "i386" +PKG_HACKS+= i386-atomicops +CXXFLAGS+= -march=i586 +.endif + +.endif # WEBKIT24_GTK_HACKS_MK diff --git a/www/webkit24-gtk3/hacks.mk b/www/webkit24-gtk3/hacks.mk new file mode 100644 index 0000000000000..bc8e2cfabf126 --- /dev/null +++ b/www/webkit24-gtk3/hacks.mk @@ -0,0 +1,16 @@ +# $NetBSD: hacks.mk,v 1.1 2016/03/22 20:10:15 leot Exp $ + +.if !defined(WEBKIT24_GTK3_HACKS_MK) +WEBKIT24_GTK3_HACKS_MK= defined + +# [Sun Mar 20 12:21:27 CET 2016 : leot] +# On i386 archs -latomic is added during the build phase and lead to a failure +# when linking various binaries/libraries. +# Forcing -march=i586 (or better) avoids that (i[56]86 provide required +# 64-bit compare-and-swap instruction). +.if ${MACHINE_ARCH} == "i386" +PKG_HACKS+= i386-atomicops +CXXFLAGS+= -march=i586 +.endif + +.endif # WEBKIT24_GTK3_HACKS_MK From 8fad666a107f77bef901680391074b1c935b6ae8 Mon Sep 17 00:00:00 2001 From: tez Date: Tue, 22 Mar 2016 21:50:13 +0000 Subject: [PATCH 0363/2457] Fix for CVE-2015-8781, CVE-2015-8782, CVE-2015-8783 from: https://github.com/vadz/libtiff/commit/aaab5c3c9d2a2c6984f23ccbc79702610439bc65.diff --- graphics/tiff/Makefile | 3 +- graphics/tiff/distinfo | 3 +- graphics/tiff/patches/patch-libtiff_tif_luv.c | 162 ++++++++++++++++++ 3 files changed, 166 insertions(+), 2 deletions(-) create mode 100644 graphics/tiff/patches/patch-libtiff_tif_luv.c diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index a3c45ecaa6b36..979fb77ac1a8e 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.121 2015/09/13 09:27:08 wiz Exp $ +# $NetBSD: Makefile,v 1.122 2016/03/22 21:50:13 tez Exp $ DISTNAME= tiff-4.0.6 +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ http://libtiff.maptools.org/dl/ diff --git a/graphics/tiff/distinfo b/graphics/tiff/distinfo index 697295b75e0cd..782b16014dd08 100644 --- a/graphics/tiff/distinfo +++ b/graphics/tiff/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.68 2015/11/03 21:34:33 agc Exp $ +$NetBSD: distinfo,v 1.69 2016/03/22 21:50:13 tez Exp $ SHA1 (tiff-4.0.6.tar.gz) = 280e27704eaca5f592b82e71ac0c78b87395e2de RMD160 (tiff-4.0.6.tar.gz) = 3d5d6951a36baf32ab0e0958d3b4a9413b7f2e07 SHA512 (tiff-4.0.6.tar.gz) = 2c8dbaaaab9f82a7722bfe8cb6fcfcf67472beb692f1b7dafaf322759e7016dad1bc58457c0f03db50aa5bd088fef2b37358fcbc1524e20e9e14a9620373fdf8 Size (tiff-4.0.6.tar.gz) = 2192991 bytes SHA1 (patch-configure) = a0032133f06b6ac92bbf52349fabe83f74ea14a6 +SHA1 (patch-libtiff_tif_luv.c) = dacf0ac8943e02dac1cd618af979aec5d760d855 diff --git a/graphics/tiff/patches/patch-libtiff_tif_luv.c b/graphics/tiff/patches/patch-libtiff_tif_luv.c new file mode 100644 index 0000000000000..c891fc231b7ea --- /dev/null +++ b/graphics/tiff/patches/patch-libtiff_tif_luv.c @@ -0,0 +1,162 @@ +$NetBSD: patch-libtiff_tif_luv.c,v 1.1 2016/03/22 21:50:13 tez Exp $ + +Fix for CVE-2015-8781, CVE-2015-8782, CVE-2015-8783 from: + https://github.com/vadz/libtiff/commit/aaab5c3c9d2a2c6984f23ccbc79702610439bc65.diff + +--- libtiff/tif_luv.c.orig ++++ libtiff/tif_luv.c +@@ -202,7 +202,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) + if (sp->user_datafmt == SGILOGDATAFMT_16BIT) + tp = (int16*) op; + else { +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + tp = (int16*) sp->tbuf; + } + _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0])); +@@ -211,9 +215,11 @@ LogL16Decode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) + cc = tif->tif_rawcc; + /* get each byte string */ + for (shft = 2*8; (shft -= 8) >= 0; ) { +- for (i = 0; i < npixels && cc > 0; ) ++ for (i = 0; i < npixels && cc > 0; ) { + if (*bp >= 128) { /* run */ +- rc = *bp++ + (2-128); /* TODO: potential input buffer overrun when decoding corrupt or truncated data */ ++ if( cc < 2 ) ++ break; ++ rc = *bp++ + (2-128); + b = (int16)(*bp++ << shft); + cc -= 2; + while (rc-- && i < npixels) +@@ -223,6 +229,7 @@ LogL16Decode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) + while (--cc && rc-- && i < npixels) + tp[i++] |= (int16)*bp++ << shft; + } ++ } + if (i != npixels) { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFErrorExt(tif->tif_clientdata, module, +@@ -268,13 +275,17 @@ LogLuvDecode24(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) + if (sp->user_datafmt == SGILOGDATAFMT_RAW) + tp = (uint32 *)op; + else { +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + tp = (uint32 *) sp->tbuf; + } + /* copy to array of uint32 */ + bp = (unsigned char*) tif->tif_rawcp; + cc = tif->tif_rawcc; +- for (i = 0; i < npixels && cc > 0; i++) { ++ for (i = 0; i < npixels && cc >= 3; i++) { + tp[i] = bp[0] << 16 | bp[1] << 8 | bp[2]; + bp += 3; + cc -= 3; +@@ -325,7 +336,11 @@ LogLuvDecode32(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) + if (sp->user_datafmt == SGILOGDATAFMT_RAW) + tp = (uint32*) op; + else { +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + tp = (uint32*) sp->tbuf; + } + _TIFFmemset((void*) tp, 0, npixels*sizeof (tp[0])); +@@ -334,11 +349,13 @@ LogLuvDecode32(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) + cc = tif->tif_rawcc; + /* get each byte string */ + for (shft = 4*8; (shft -= 8) >= 0; ) { +- for (i = 0; i < npixels && cc > 0; ) ++ for (i = 0; i < npixels && cc > 0; ) { + if (*bp >= 128) { /* run */ ++ if( cc < 2 ) ++ break; + rc = *bp++ + (2-128); + b = (uint32)*bp++ << shft; +- cc -= 2; /* TODO: potential input buffer overrun when decoding corrupt or truncated data */ ++ cc -= 2; + while (rc-- && i < npixels) + tp[i++] |= b; + } else { /* non-run */ +@@ -346,6 +363,7 @@ LogLuvDecode32(TIFF* tif, uint8* op, tmsize_t occ, uint16 s) + while (--cc && rc-- && i < npixels) + tp[i++] |= (uint32)*bp++ << shft; + } ++ } + if (i != npixels) { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFErrorExt(tif->tif_clientdata, module, +@@ -413,6 +431,7 @@ LogLuvDecodeTile(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + static int + LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + { ++ static const char module[] = "LogL16Encode"; + LogLuvState* sp = EncoderState(tif); + int shft; + tmsize_t i; +@@ -433,7 +452,11 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + tp = (int16*) bp; + else { + tp = (int16*) sp->tbuf; +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + (*sp->tfunc)(sp, bp, npixels); + } + /* compress each byte string */ +@@ -506,6 +529,7 @@ LogL16Encode(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + static int + LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + { ++ static const char module[] = "LogLuvEncode24"; + LogLuvState* sp = EncoderState(tif); + tmsize_t i; + tmsize_t npixels; +@@ -521,7 +545,11 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + tp = (uint32*) bp; + else { + tp = (uint32*) sp->tbuf; +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + (*sp->tfunc)(sp, bp, npixels); + } + /* write out encoded pixels */ +@@ -553,6 +581,7 @@ LogLuvEncode24(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + static int + LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + { ++ static const char module[] = "LogLuvEncode32"; + LogLuvState* sp = EncoderState(tif); + int shft; + tmsize_t i; +@@ -574,7 +603,11 @@ LogLuvEncode32(TIFF* tif, uint8* bp, tmsize_t cc, uint16 s) + tp = (uint32*) bp; + else { + tp = (uint32*) sp->tbuf; +- assert(sp->tbuflen >= npixels); ++ if(sp->tbuflen < npixels) { ++ TIFFErrorExt(tif->tif_clientdata, module, ++ "Translation buffer too short"); ++ return (0); ++ } + (*sp->tfunc)(sp, bp, npixels); + } + /* compress each byte string */ From 825682d2cb1a2c4c002565436a748e28cc67456d Mon Sep 17 00:00:00 2001 From: tez Date: Tue, 22 Mar 2016 21:51:38 +0000 Subject: [PATCH 0364/2457] Fix for CVE-2015-8781, CVE-2015-8782, CVE-2015-8783 in tiff from: https://github.com/vadz/libtiff/commit/aaab5c3c9d2a2c6984f23ccbc79702610439bc65.diff --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 6adcd2fa0a56f..dee98d5243667 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1271 2016/03/22 19:39:12 tez Exp $ +$NetBSD: CHANGES-2016,v 1.1272 2016/03/22 21:51:38 tez Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1669,3 +1669,4 @@ Changes to the packages collection and infrastructure in 2016: Updated filesystems/glusterfs to 3.7.9 [manu 2016-03-22] Updated www/contao35 to 3.5.9 [taca 2016-03-22] Updated devel/pcre to 8.38nb2 [tez 2016-03-22] + Updated graphics/tiff to 4.0.6nb1 [tez 2016-03-22] From 322228e110e9906f4d8dce9c5ab4787efdc024e4 Mon Sep 17 00:00:00 2001 From: khorben Date: Tue, 22 Mar 2016 22:09:32 +0000 Subject: [PATCH 0365/2457] Register missing dependency on curses Found with an unprivileged bootstrap on NetBSD/amd64 (--prefer-pkgsrc yes) --- chat/telepathy-logger/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chat/telepathy-logger/Makefile b/chat/telepathy-logger/Makefile index 8ec42cf11fd9f..1f45352e3c57e 100644 --- a/chat/telepathy-logger/Makefile +++ b/chat/telepathy-logger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2015/12/05 21:25:30 adam Exp $ +# $NetBSD: Makefile,v 1.31 2016/03/22 22:09:32 khorben Exp $ DISTNAME= telepathy-logger-0.2.7 PKGREVISION= 16 @@ -29,6 +29,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 33 34 35 # not yet ported as of 0.2.7 .include "../../devel/glib2/schemas.mk" .include "../../devel/GConf/buildlink3.mk" .include "../../lang/python/application.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../chat/telepathy-glib/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" From b646b1c6d6137371b3ac1b54eba6e4e64523ccf1 Mon Sep 17 00:00:00 2001 From: khorben Date: Tue, 22 Mar 2016 22:51:13 +0000 Subject: [PATCH 0366/2457] Register missing dependency on curses Found with an unprivileged bootstrap on NetBSD/amd64 (--prefer-pkgsrc yes) --- print/cups15/Makefile | 3 ++- print/cups15/buildlink3.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/print/cups15/Makefile b/print/cups15/Makefile index 51f28a9fc7a5d..8677597509d6f 100644 --- a/print/cups15/Makefile +++ b/print/cups15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2016/03/05 11:27:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.12 2016/03/22 22:51:13 khorben Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -192,6 +192,7 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../print/libpaper/buildlink3.mk" diff --git a/print/cups15/buildlink3.mk b/print/cups15/buildlink3.mk index 0e0ef63c5289e..e9950a2d4ee06 100644 --- a/print/cups15/buildlink3.mk +++ b/print/cups15/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2016/03/05 11:27:53 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2016/03/22 23:04:15 khorben Exp $ BUILDLINK_TREE+= cups @@ -23,6 +23,7 @@ pkgbase := cups .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .endif # CUPS_BUILDLINK3_MK From dcea30116bd708fffb91d44bd7f10a0362e9e1b7 Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 22 Mar 2016 23:24:10 +0000 Subject: [PATCH 0367/2457] Drop setuid for bin/minicom, bump PKGREVISION setuid bin/minicom makes zmodem support with comms/lrzsz unusable. --- comms/minicom/Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index b1b352985e865..530e19cb16e2a 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.67 2015/11/25 12:48:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.68 2016/03/22 23:24:10 ryoon Exp $ DISTNAME= minicom-2.7 +PKGREVISION= 1 CATEGORIES= comms MASTER_SITES= http://alioth.debian.org/frs/download.php/file/3977/ @@ -22,14 +23,6 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} PKG_SYSCONFSUBDIR= minicom EGDIR= ${PREFIX}/share/examples/minicom -PKG_GROUPS= ${DIALER_GROUP} -PKG_USERS= ${UUCP_USER}:${UUCP_GROUP} -PKG_GROUPS_VARS+= DIALER_GROUP UUCP_GROUP -PKG_USERS_VARS= UUCP_USER - -SPECIAL_PERMS= ${PREFIX}/bin/minicom ${UUCP_USER} ${DIALER_GROUP} 4555 -OWN_DIRS_PERMS= ${PKG_SYSCONFDIR} ${UUCP_USER} ${DIALER_GROUP} 0755 - SUBST_CLASSES+= minicom SUBST_MESSAGE.minicom= Fixing hardcoded paths. SUBST_STAGE.minicom= post-patch From 04bc28c5ebfb78cc9da000916e2894f576349634 Mon Sep 17 00:00:00 2001 From: ryoon Date: Tue, 22 Mar 2016 23:24:39 +0000 Subject: [PATCH 0368/2457] Updated comms/minicom to 2.7nb1 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index dee98d5243667..3f84b1b87245b 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1272 2016/03/22 21:51:38 tez Exp $ +$NetBSD: CHANGES-2016,v 1.1273 2016/03/22 23:24:39 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1670,3 +1670,4 @@ Changes to the packages collection and infrastructure in 2016: Updated www/contao35 to 3.5.9 [taca 2016-03-22] Updated devel/pcre to 8.38nb2 [tez 2016-03-22] Updated graphics/tiff to 4.0.6nb1 [tez 2016-03-22] + Updated comms/minicom to 2.7nb1 [ryoon 2016-03-22] From 69d76ccaae780b838571ed2b24e823be5fd10c1f Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 23 Mar 2016 10:02:22 +0000 Subject: [PATCH 0369/2457] Handle non-standard man directory. --- net/libcmis/PLIST | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/libcmis/PLIST b/net/libcmis/PLIST index b01f1770a5c39..72271f272c344 100644 --- a/net/libcmis/PLIST +++ b/net/libcmis/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2015/02/04 17:52:26 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/23 10:02:22 jperkin Exp $ bin/cmis-client include/libcmis-0.5/libcmis/allowable-actions.hxx include/libcmis-0.5/libcmis/document.hxx @@ -36,4 +36,4 @@ lib/libcmis-0.5.la lib/libcmis-c-0.5.la lib/pkgconfig/libcmis-0.5.pc lib/pkgconfig/libcmis-c-0.5.pc -man/manx/cmis-client.xml +${PKGMANDIR}/manx/cmis-client.xml From a1ff85aaacc64c74e243ee5812fe44fd46c8d6f4 Mon Sep 17 00:00:00 2001 From: markd Date: Wed, 23 Mar 2016 10:04:49 +0000 Subject: [PATCH 0370/2457] Build with recent cmake. --- multimedia/kmplayer/distinfo | 5 +++-- multimedia/kmplayer/patches/patch-CMakeLists.txt | 11 +++++++++-- .../kmplayer/patches/patch-src_CMakeLists.txt | 15 +++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 multimedia/kmplayer/patches/patch-src_CMakeLists.txt diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo index 8b16ed5af5321..3a80039b66fb8 100644 --- a/multimedia/kmplayer/distinfo +++ b/multimedia/kmplayer/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.25 2015/12/23 12:41:47 joerg Exp $ +$NetBSD: distinfo,v 1.26 2016/03/23 10:04:49 markd Exp $ SHA1 (kmplayer-0.11.3d.tar.bz2) = f43651d4252cf6d878b5b014c1e5e9b18b2e31c4 RMD160 (kmplayer-0.11.3d.tar.bz2) = 39cf21c28c176697632d60b8f2993e78a9e3dd0f SHA512 (kmplayer-0.11.3d.tar.bz2) = c2f0fa1864eecd9a0bf3039639aad41bc36bc6ff8742a8e9714c6df72dd4ee63f80c36036a0582ee8464b48ce22eb96814600ddb199c61fda0b87cfd4c457797 Size (kmplayer-0.11.3d.tar.bz2) = 573173 bytes -SHA1 (patch-CMakeLists.txt) = ded076fd17755cbd7c4b72f6e5eb6948f3a9d6d6 +SHA1 (patch-CMakeLists.txt) = e2dc0ffbddfc72c0c395056c66a26bc1555b2958 SHA1 (patch-aa) = 85d6f4f17a2c8afff505298f62b3105979a9e9f1 SHA1 (patch-ab) = 975524f4ef0163d47c452f16ab98016acebead09 +SHA1 (patch-src_CMakeLists.txt) = cafeb1b1869455068880443d767e0101906990d3 SHA1 (patch-src_kmplayershared.h) = b314dc90f44fc5154dcfcb4fa889008d78b59980 diff --git a/multimedia/kmplayer/patches/patch-CMakeLists.txt b/multimedia/kmplayer/patches/patch-CMakeLists.txt index 0fd6005f15af2..e941fc7621cd1 100644 --- a/multimedia/kmplayer/patches/patch-CMakeLists.txt +++ b/multimedia/kmplayer/patches/patch-CMakeLists.txt @@ -1,8 +1,15 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2015/12/23 12:41:47 joerg Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2016/03/23 10:04:49 markd Exp $ + +Build with recent cmake --- CMakeLists.txt.orig 2015-12-22 17:31:21.000000000 +0000 +++ CMakeLists.txt -@@ -57,6 +57,7 @@ if(NOT WIN32) +@@ -1,3 +1,4 @@ ++cmake_minimum_required(VERSION 2.8.9) + project(kmplayer) + + cmake_policy(VERSION 2.6) +@@ -57,6 +58,7 @@ if(NOT WIN32) endif(NOT WIN32) diff --git a/multimedia/kmplayer/patches/patch-src_CMakeLists.txt b/multimedia/kmplayer/patches/patch-src_CMakeLists.txt new file mode 100644 index 0000000000000..4fa0f98acd397 --- /dev/null +++ b/multimedia/kmplayer/patches/patch-src_CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-src_CMakeLists.txt,v 1.1 2016/03/23 10:04:49 markd Exp $ + +Build with recent cmake + +--- src/CMakeLists.txt.orig 2012-06-10 12:35:46.000000000 +0000 ++++ src/CMakeLists.txt +@@ -13,7 +13,7 @@ IF (KMPLAYER_WITH_CAIRO) + MESSAGE("have cairo cflags:${optionalCFlags} ldflags:${optionalLinkFlags}") + endif (KMPLAYER_WITH_CAIRO) + +-add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT -DKMPLAYER_VERSION_STRING=\\"${KMPLAYER_VERSION_STRING}\\") ++add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT -DKMPLAYER_VERSION_STRING="\\\"${KMPLAYER_VERSION_STRING}\\\"") + + ADD_DEFINITIONS(${CAIROCFlags}) + From 860e4b43abd8a315724ce9952c2a7ebe9f78a02e Mon Sep 17 00:00:00 2001 From: khorben Date: Wed, 23 Mar 2016 10:29:44 +0000 Subject: [PATCH 0371/2457] Remove unused patch --- x11/deforaos-notes/patches/patch-tools_Makefile | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 x11/deforaos-notes/patches/patch-tools_Makefile diff --git a/x11/deforaos-notes/patches/patch-tools_Makefile b/x11/deforaos-notes/patches/patch-tools_Makefile deleted file mode 100644 index 754630995561d..0000000000000 --- a/x11/deforaos-notes/patches/patch-tools_Makefile +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-tools_Makefile,v 1.1 2015/09/01 00:28:03 khorben Exp $ - -Fix build with LDFLAGS set. - ---- tools/Makefile.orig 2015-08-31 00:01:33.000000000 +0000 -+++ tools/Makefile -@@ -6,8 +6,8 @@ LIBDIR = $(PREFIX)/lib - CC = cc - CPPFLAGSF= - CPPFLAGS= --CFLAGSF = `pkg-config --cflags libDesktop Mailer` --CFLAGS = -W -Wall -g -O2 -pedantic -fPIC -D_FORTIFY_SOURCE=2 -fstack-protector-all -+CFLAGSF = `pkg-config --cflags libDesktop Mailer` -fPIC -+CFLAGS = -W -Wall -g -O2 -pedantic -D_FORTIFY_SOURCE=2 -fstack-protector-all - LDFLAGSF= `pkg-config --libs libDesktop` - AR = ar - RANLIB = ranlib From b6a0aa764bd956317803ff450d4d8bbb6129a679 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 23 Mar 2016 11:50:01 +0000 Subject: [PATCH 0372/2457] Move handling for PKG_SUPPORTED_OPTIONS and PKG_SUGGESTED_OPTIONS as OPSYSVARS to bsd.options.mk as they affect tests against PKG_OPTIONS before bsd.pkg.mk is parsed. Approved for commit during the freeze by agc@. --- mk/bsd.options.mk | 12 +++++++++++- mk/bsd.pkg.mk | 3 +-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index be9552f944038..b6f6571d64cbb 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.71 2013/06/07 00:41:39 obache Exp $ +# $NetBSD: bsd.options.mk,v 1.72 2016/03/23 11:50:01 jperkin Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -178,6 +178,16 @@ PKG_SUPPORTED_OPTIONS?= # none PKG_FAIL_REASON+= "[bsd.options.mk] The package has no options, but includes this file." .endif +# Handle OPSYSVARS here for package options as we need to test PKG_OPTIONS +# in options.mk and cannot wait for lazy evaluation from bsd.pkg.mk. +.for _var_ in PKG_SUPPORTED_OPTIONS PKG_SUGGESTED_OPTIONS +. if defined(${_var_}.${OPSYS}) +${_var_}+= ${${_var_}.${OPSYS}} +. elif defined(${_var_}.*) +${_var_}+= ${${_var_}.*} +. endif +.endfor + # # create map of option to group and add group options to PKG_SUPPORTED_OPTIONS # diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 89458c8048287..5d18d980e464b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.2017 2016/02/26 11:38:37 jperkin Exp $ +# $NetBSD: bsd.pkg.mk,v 1.2018 2016/03/23 11:50:01 jperkin Exp $ # # This file is in the public domain. # @@ -142,7 +142,6 @@ OPSYSVARS+= CFLAGS CXXFLAGS CPPFLAGS LDFLAGS LIBS OPSYSVARS+= CMAKE_ARGS CONFIGURE_ARGS CONFIGURE_ENV OPSYSVARS+= BUILDLINK_TRANSFORM SUBST_CLASSES OPSYSVARS+= BUILD_TARGET MAKE_ENV MAKE_FLAGS USE_TOOLS -OPSYSVARS+= PKG_SUPPORTED_OPTIONS PKG_SUGGESTED_OPTIONS .for _var_ in ${OPSYSVARS:O} . if defined(${_var_}.${OPSYS}) ${_var_}+= ${${_var_}.${OPSYS}} From b4f3e6692475099b3577e63f548211d8d6ccb7ef Mon Sep 17 00:00:00 2001 From: khorben Date: Wed, 23 Mar 2016 11:51:39 +0000 Subject: [PATCH 0373/2457] Register dependency on wget Some HPLIP utilities (like hp-plugin) want to download files from the network using wget (or fallback on curl). HPLIP also supports URLLib but defaults to either wget or curl. Bump PKGREVISION as this modifies the resulting package. --- print/hplip/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 0c27528997387..111889b64d6d6 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2016/03/05 11:29:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.50 2016/03/23 11:51:39 khorben Exp $ DISTNAME= hplip-3.16.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hplip/} @@ -12,6 +12,8 @@ LICENSE= gnu-gpl-v2 AND mit AND modified-bsd CONFLICTS+= hpijs-[0-9]* +DEPENDS+= wget-[0-9]*:../../net/wget + FILES_SUBST+= CUPS_USER=${CUPS_USER} FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} From 5aa26520639eef0d3ecb285c9901cc9cc5f733c1 Mon Sep 17 00:00:00 2001 From: khorben Date: Wed, 23 Mar 2016 12:12:01 +0000 Subject: [PATCH 0374/2457] Fix build with custom CFLAGS --- x11/deforaos-keyboard/distinfo | 3 ++- .../patches/patch-src_widget_Makefile | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 x11/deforaos-keyboard/patches/patch-src_widget_Makefile diff --git a/x11/deforaos-keyboard/distinfo b/x11/deforaos-keyboard/distinfo index a1541e7b3869b..bf9f4a6486433 100644 --- a/x11/deforaos-keyboard/distinfo +++ b/x11/deforaos-keyboard/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2016/03/12 02:22:08 khorben Exp $ +$NetBSD: distinfo,v 1.5 2016/03/23 12:12:01 khorben Exp $ SHA1 (Keyboard-0.3.0.tar.gz) = 5f8a3d9d32594046e5a6856e0b696edf67ed6c92 RMD160 (Keyboard-0.3.0.tar.gz) = f9578c491a1ee3c1abb8f7c5318491fadca5db1f SHA512 (Keyboard-0.3.0.tar.gz) = d0289193f130324473482ee8e20e253ec3633bb612f8ed9e447b6aaf03910bbad50c14d504c194fc56cc0ff57f4167bda6ee2ed550aa3c277ae4da5c8b8aafbc Size (Keyboard-0.3.0.tar.gz) = 31145 bytes +SHA1 (patch-src_widget_Makefile) = 63fe9744d541d280858debd0b7251326fffc41a4 diff --git a/x11/deforaos-keyboard/patches/patch-src_widget_Makefile b/x11/deforaos-keyboard/patches/patch-src_widget_Makefile new file mode 100644 index 0000000000000..6c7697fc6093c --- /dev/null +++ b/x11/deforaos-keyboard/patches/patch-src_widget_Makefile @@ -0,0 +1,17 @@ +$NetBSD: patch-src_widget_Makefile,v 1.1 2016/03/23 12:12:01 khorben Exp $ + +Fix build with custom CFLAGS + +--- src/widget/Makefile.orig 2016-03-12 01:32:44.000000000 +0000 ++++ src/widget/Makefile +@@ -6,8 +6,8 @@ LIBDIR = $(PREFIX)/lib + CC = cc + CPPFLAGSF= + CPPFLAGS= +-CFLAGSF = -W `pkg-config --cflags libDesktop x11` +-CFLAGS = -Wall -g -O2 -fPIC -pedantic ++CFLAGSF = -W `pkg-config --cflags libDesktop x11` -fPIC ++CFLAGS = -Wall -g -O2 -pedantic + LDFLAGSF= `pkg-config --libs libDesktop x11` -lXtst -lintl + EXEEXT = + AR = ar From 42a5c949e0a9ba135719b813f87d43da5a149ae0 Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 23 Mar 2016 12:40:00 +0000 Subject: [PATCH 0375/2457] Update to 1.4.1 * Update HOMEPAGE and MASTER_SITES Changelog: Version 1.4.1 [2015-09-24] --------------------------- - Test suite added - Bugfix: The tarball contains HACKING and README again - Bugfix: The zsh completion completes options as first argument correctly - Bugfix: Exit status is set as advertised - Bugfix: Spurious null bytes removed from output - Bugfix: Skipping of some matches in certain conditions fixed. - Bugfix: Empty matches don't trigger a loop Version 1.4.0 [2015-08-14] --------------------------- - PCRE support (by Julius Plenz) - Fixed string search - Ability to pass multiple passwords - Option to change the colon as prefix separator - Optional warning about PDFs that contain no searchable text - New option from grep: +--only-matching+ - New option from grep: +--null+ - Bugfix: Correctly print unicode characters - Installation: New configure flag +--without-libpcre+ - Installation: New configure flag +--disable-doc+ to disable manpage generation with asciidoc - Installation: pdfgrep now requires c++11 --- textproc/pdfgrep/Makefile | 12 ++++++------ textproc/pdfgrep/PLIST | 4 +++- textproc/pdfgrep/distinfo | 10 +++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile index 7dc0f9f8379e0..d562d02484b2c 100644 --- a/textproc/pdfgrep/Makefile +++ b/textproc/pdfgrep/Makefile @@ -1,20 +1,20 @@ -# $NetBSD: Makefile,v 1.22 2016/01/27 10:31:32 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2016/03/23 12:40:00 ryoon Exp $ # -DISTNAME= pdfgrep-1.3.1 -PKGREVISION= 5 +DISTNAME= pdfgrep-1.4.1 CATEGORIES= textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pdfgrep/} +MASTER_SITES= https://pdfgrep.org/download/ MAINTAINER= ryoon@NetBSD.org -HOMEPAGE= http://pdfgrep.sourceforge.net/ +HOMEPAGE= https://pdfgrep.org/ COMMENT= Pdfgrep is a tool to search text in PDF files LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes USE_LANGUAGES= c++ c -USE_TOOLS+= pkg-config +USE_TOOLS+= gmake pkg-config +.include "../../devel/pcre/buildlink3.mk" .include "../../print/poppler-includes/buildlink3.mk" .include "../../print/poppler-cpp/buildlink3.mk" .include "../../print/poppler/buildlink3.mk" diff --git a/textproc/pdfgrep/PLIST b/textproc/pdfgrep/PLIST index 3596122b04656..cf575b5c516b1 100644 --- a/textproc/pdfgrep/PLIST +++ b/textproc/pdfgrep/PLIST @@ -1,3 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/28 22:00:13 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/23 12:40:00 ryoon Exp $ bin/pdfgrep man/man1/pdfgrep.1 +share/bash-completion/completions/pdfgrep +share/zsh/site-functions/_pdfgrep diff --git a/textproc/pdfgrep/distinfo b/textproc/pdfgrep/distinfo index 2cec50ebfcdf3..17eeab62915ff 100644 --- a/textproc/pdfgrep/distinfo +++ b/textproc/pdfgrep/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:00:00 agc Exp $ +$NetBSD: distinfo,v 1.5 2016/03/23 12:40:00 ryoon Exp $ -SHA1 (pdfgrep-1.3.1.tar.gz) = 8d15760af0803ccea32760d5f68abe4224169639 -RMD160 (pdfgrep-1.3.1.tar.gz) = abc9215049534d27eeaea35d7c854a47e74db01f -SHA512 (pdfgrep-1.3.1.tar.gz) = 7a13016a8cf4f8a7387940d7e3862a1fb83f3aa6240084f835e92e958836dff0788db2ae39f35db25d679a2857ddf0b9bcbd7b1aacb10c2a16c3165d56f4efcf -Size (pdfgrep-1.3.1.tar.gz) = 111653 bytes +SHA1 (pdfgrep-1.4.1.tar.gz) = 47fa7b4b399f451c5131f4106812b6e03f959123 +RMD160 (pdfgrep-1.4.1.tar.gz) = 4bea454f503b7035e99efc3e36cbfd79e28b2a57 +SHA512 (pdfgrep-1.4.1.tar.gz) = 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735 +Size (pdfgrep-1.4.1.tar.gz) = 151926 bytes From d1ea7a35fabd92fa823d8e99b9e7f85d03541958 Mon Sep 17 00:00:00 2001 From: ryoon Date: Wed, 23 Mar 2016 12:40:23 +0000 Subject: [PATCH 0376/2457] Updated textproc/pdfgrep to 1.4.1 --- doc/CHANGES-2016 | 3 ++- doc/TODO | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 3f84b1b87245b..bc431c9c87ab1 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1273 2016/03/22 23:24:39 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1274 2016/03/23 12:40:23 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1671,3 +1671,4 @@ Changes to the packages collection and infrastructure in 2016: Updated devel/pcre to 8.38nb2 [tez 2016-03-22] Updated graphics/tiff to 4.0.6nb1 [tez 2016-03-22] Updated comms/minicom to 2.7nb1 [ryoon 2016-03-22] + Updated textproc/pdfgrep to 1.4.1 [ryoon 2016-03-23] diff --git a/doc/TODO b/doc/TODO index 2276a984b7689..d042622a7c439 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15608 2016/03/21 11:40:59 ryoon Exp $ +$NetBSD: TODO,v 1.15609 2016/03/23 12:40:23 ryoon Exp $ Suggested new packages ====================== @@ -1565,7 +1565,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o pciutils-3.4.0 o pcmanfm-0.5.2 [pkg/42451] o pcsc-tools-1.4.25 - o pdfgrep-1.4.1 o pdmenu-1.2.87 o pear-Console_Table-1.3.0 o pear-DB-1.9.2 From 24f05102f467de1fbee4929e8d90dae008e058e6 Mon Sep 17 00:00:00 2001 From: gdt Date: Wed, 23 Mar 2016 12:55:18 +0000 Subject: [PATCH 0377/2457] Fix netbsd-5 build by defining shlib methods Very surprisingly, postfix's build hard-codes shared library behavior in a giant case statement not only per OS but per version, essentially open-coding libtool while not being complete. This commit copies the netbsd-6 flags to netbsd-5, as a minimal change during the freeze to let this build on netbsd-5 (where it then works fine). --- mail/postfix/distinfo | 4 ++-- mail/postfix/patches/patch-ai | 30 +++++++++++++++++++++++------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index affce9776611e..0100d099faeb5 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.162 2015/11/03 23:27:17 agc Exp $ +$NetBSD: distinfo,v 1.163 2016/03/23 12:55:18 gdt Exp $ SHA1 (postfix-3.0.2.tar.gz) = 9d75ca3c207441a38a79a2c8ceaa398c2b9cdc4e RMD160 (postfix-3.0.2.tar.gz) = aba1e9decc1aa9aa0c0b68f2bb7f0432b75fabdf @@ -6,5 +6,5 @@ SHA512 (postfix-3.0.2.tar.gz) = b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4 Size (postfix-3.0.2.tar.gz) = 4239235 bytes SHA1 (patch-aa) = f2c418a2fd34da7325ea2823ddd14043768f0111 SHA1 (patch-ag) = e3d818cd75225c5b50960659827c6e27767cbd58 -SHA1 (patch-ai) = d515202c3bba755067bcb057714cb21453d15d75 +SHA1 (patch-ai) = 17b29cceadba3055ae198e1802a786468ecc9eff SHA1 (patch-src_dns_dns__lookup.c) = 9c26686e5abd9aee36f042440e5f6a6ffca3df4a diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai index fb1916b24f2b6..a6346857fa66b 100644 --- a/mail/postfix/patches/patch-ai +++ b/mail/postfix/patches/patch-ai @@ -1,10 +1,26 @@ -$NetBSD: patch-ai,v 1.34 2015/09/07 09:47:01 fhajny Exp $ +$NetBSD: patch-ai,v 1.35 2016/03/23 12:55:18 gdt Exp $ -Make this pkgsrc friendly. +1) Add shlib definitions for NetBSD 5; the build system must be +hard-coded per OS per version. Not yet reported upstream. + +2) Make this pkgsrc friendly. --- makedefs.orig 2015-07-19 14:24:25.000000000 +0000 +++ makedefs -@@ -372,13 +372,6 @@ case "$SYSTEM.$RELEASE" in +@@ -292,6 +292,12 @@ case "$SYSTEM.$RELEASE" in + NetBSD.4*) SYSTYPE=NETBSD4 + ;; + NetBSD.5*) SYSTYPE=NETBSD5 ++ : ${SHLIB_SUFFIX=.so} ++ : ${SHLIB_CFLAGS=-fPIC} ++ : ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'} ++ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} ++ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} ++ : ${PLUGIN_LD="${CC-gcc} -shared"} + ;; + NetBSD.6*) SYSTYPE=NETBSD6 + : ${SHLIB_SUFFIX=.so} +@@ -372,13 +378,6 @@ case "$SYSTEM.$RELEASE" in esac ;; ULTRIX.4*) SYSTYPE=ULTRIX4 @@ -18,7 +34,7 @@ Make this pkgsrc friendly. for l in syslog resolv; do if [ -f /usr/local/lib/lib$l.a ]; then SYSLIBS="$SYSLIBS -l$l" -@@ -416,33 +409,8 @@ case "$SYSTEM.$RELEASE" in +@@ -416,33 +415,8 @@ case "$SYSTEM.$RELEASE" in esac;; # Tested with RedHat 3.03 on 20020729. Linux.1*) SYSTYPE=LINUX1 @@ -52,7 +68,7 @@ Make this pkgsrc friendly. for name in nsl resolv $GDBM_LIBS do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -503,25 +471,6 @@ EOF +@@ -503,25 +477,6 @@ EOF : ${PLUGIN_LD="${CC-gcc} -shared"} ;; Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR @@ -78,7 +94,7 @@ Make this pkgsrc friendly. for name in nsl resolv do for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/* -@@ -542,24 +491,6 @@ EOF +@@ -542,24 +497,6 @@ EOF ;; GNU.0*|GNU/kFreeBSD.[567]*) SYSTYPE=GNU0 @@ -103,7 +119,7 @@ Make this pkgsrc friendly. for name in nsl resolv do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -590,25 +521,13 @@ EOF +@@ -590,25 +527,13 @@ EOF HP-UX.A.09.*) SYSTYPE=HPUX9 SYSLIBS=-ldbm CCARGS="$CCARGS -DMISSING_USLEEP" From 9615af37eec1f03233fd7d50f7cdc42fec4a8b27 Mon Sep 17 00:00:00 2001 From: mef Date: Wed, 23 Mar 2016 13:37:20 +0000 Subject: [PATCH 0378/2457] If math/gsl is already installed, packaging become different. So add as prerequisite (buildlink3). Thanks Dave Tyson for the report at pkgsrc-users@. --- ham/gnuradio-fec/Makefile | 4 +++- ham/gnuradio-fec/PLIST | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ham/gnuradio-fec/Makefile b/ham/gnuradio-fec/Makefile index 372c91fd08142..f51cc5f94f1d5 100644 --- a/ham/gnuradio-fec/Makefile +++ b/ham/gnuradio-fec/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2015/09/01 04:14:54 mef Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/23 13:37:20 mef Exp $ PKGNAME= gnuradio-fec-${VERSION} +PKGREVISION= 1 COMMENT= Forward Error Correction blocks, utilities, & examples of GNU Radio .include "../../ham/gnuradio-core/Makefile.common" @@ -9,4 +10,5 @@ COMMENT= Forward Error Correction blocks, utilities, & examples of GNU Radio CMAKE_ARGS+= -DENABLE_DEFAULT=OFF CMAKE_ARGS+= -DENABLE_GR_FEC=ON +.include "../../math/gsl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-fec/PLIST b/ham/gnuradio-fec/PLIST index ff7e34f49e30c..9bf17197484a2 100644 --- a/ham/gnuradio-fec/PLIST +++ b/ham/gnuradio-fec/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2016/03/07 13:14:31 mef Exp $ +@comment $NetBSD: PLIST,v 1.6 2016/03/23 13:37:20 mef Exp $ bin/polar_channel_construction include/gnuradio/fec/api.h include/gnuradio/fec/async_decoder.h @@ -16,10 +16,16 @@ include/gnuradio/fec/dummy_decoder.h include/gnuradio/fec/dummy_encoder.h include/gnuradio/fec/encode_ccsds_27_bb.h include/gnuradio/fec/encoder.h +include/gnuradio/fec/fec_mtrx.h include/gnuradio/fec/generic_decoder.h include/gnuradio/fec/generic_encoder.h +include/gnuradio/fec/ldpc_G_matrix.h +include/gnuradio/fec/ldpc_H_matrix.h +include/gnuradio/fec/ldpc_bit_flip_decoder.h include/gnuradio/fec/ldpc_decoder.h include/gnuradio/fec/ldpc_encoder.h +include/gnuradio/fec/ldpc_gen_mtrx_encoder.h +include/gnuradio/fec/ldpc_par_mtrx_encoder.h include/gnuradio/fec/polar_common.h include/gnuradio/fec/polar_decoder_common.h include/gnuradio/fec/polar_decoder_sc.h From 96610691e65bb206c4babfc674681d17e77e03e0 Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 23 Mar 2016 14:21:03 +0000 Subject: [PATCH 0379/2457] Shoebill is an all-new, BSD-licensed Macintosh II emulator designed from the ground up with the singular goal of running A/UX. --- emulators/Makefile | 3 +- emulators/shoebill/DESCR | 21 +++++++++++ emulators/shoebill/Makefile | 36 ++++++++++++++++++ emulators/shoebill/PLIST | 4 ++ emulators/shoebill/distinfo | 8 ++++ emulators/shoebill/files/shoebill.usage | 37 +++++++++++++++++++ .../patches/patch-sdl-gui_lin_build.sh | 24 ++++++++++++ .../shoebill/patches/patch-sdl-gui_sdl.c | 15 ++++++++ 8 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 emulators/shoebill/DESCR create mode 100644 emulators/shoebill/Makefile create mode 100644 emulators/shoebill/PLIST create mode 100644 emulators/shoebill/distinfo create mode 100644 emulators/shoebill/files/shoebill.usage create mode 100644 emulators/shoebill/patches/patch-sdl-gui_lin_build.sh create mode 100644 emulators/shoebill/patches/patch-sdl-gui_sdl.c diff --git a/emulators/Makefile b/emulators/Makefile index 73340abbfc907..8e41656e610aa 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.242 2016/01/17 20:47:34 wiz Exp $ +# $NetBSD: Makefile,v 1.243 2016/03/23 14:22:14 hauke Exp $ # COMMENT= Emulators for other operating systems @@ -128,6 +128,7 @@ SUBDIR+= qemu0 SUBDIR+= raine SUBDIR+= realboy SUBDIR+= retroarch +SUBDIR+= shoestring SUBDIR+= simh SUBDIR+= simulavr SUBDIR+= ski diff --git a/emulators/shoebill/DESCR b/emulators/shoebill/DESCR new file mode 100644 index 0000000000000..dbe61507556bf --- /dev/null +++ b/emulators/shoebill/DESCR @@ -0,0 +1,21 @@ +Shoebill is an all-new, BSD-licensed Macintosh II emulator designed +from the ground up with the singular goal of running A/UX, first +presented on +. + +Shoebill requires a Macintosh II, IIx or IIcx ROM, e.g. from +, and a disk image with +A/UX installed. + +Shoebill is different from other Macintosh emulators in how it +boots. Instead of booting directly into the Macintosh ROM, Shoebill +implements a bootloader and boots directly into A/UX +itself. Traditionally, A/UX is booted by first booting Mac OS, and +then running SASH/launch to mount the A/UX root partition, run fsck if +necessary, load the unix kernel, and then boot it. SASH provides the +ability to manipulate the A/UX filesystem while actually running in +regular Mac OS. + +Shoebill cannot boot into regular Mac OS, although that's a future +goal. Instead, it replicates the functionality of Apple's bootloader, +and boots directly into A/UX. diff --git a/emulators/shoebill/Makefile b/emulators/shoebill/Makefile new file mode 100644 index 0000000000000..96304e9e6cd4a --- /dev/null +++ b/emulators/shoebill/Makefile @@ -0,0 +1,36 @@ +# $NetBSD: Makefile,v 1.1 2016/03/23 14:21:03 hauke Exp $ + +GITHUB_PROJECT= shoebill +DISTNAME= 0.0.5 +PKGNAME= ${GITHUB_PROJECT}-${DISTNAME} +CATEGORIES= emulators +MASTER_SITES= ${MASTER_SITE_GITHUB:=pruten/} +DIST_SUBDIR= ${GITHUB_PROJECT} + +MAINTAINER= hauke@NetBSD.org +HOMEPAGE= ${MASTER_SITE_GITHUB:=pruten/shoebill/} +COMMENT= Macintosh II emulator that runs A/UX +LICENSE= 2-clause-bsd + +# Missing long double math functions +NOT_FOR_PLATFORM= NetBSD-[0-6]*-* + +USE_TOOLS+= perl + +WRKSRC= ${WRKDIR}/${PKGNAME} + +DOCDIR= share/doc/shoebill +INSTALLATION_DIRS= bin ${DOCDIR} + +do-build: + ( cd ${WRKSRC}/sdl-gui && \ + ${ENV} CC=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \ + ${SH} ./lin_build.sh ) + +do-install: + ${INSTALL_DATA} files/shoebill.usage ${DESTDIR}${PREFIX}/${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/sdl-gui/shoebill ${DESTDIR}${PREFIX}/bin + +.include "../../devel/SDL2/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/emulators/shoebill/PLIST b/emulators/shoebill/PLIST new file mode 100644 index 0000000000000..21b91a533dd44 --- /dev/null +++ b/emulators/shoebill/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1 2016/03/23 14:21:03 hauke Exp $ +bin/shoebill +share/doc/shoebill/README.md +share/doc/shoebill/shoebill.usage diff --git a/emulators/shoebill/distinfo b/emulators/shoebill/distinfo new file mode 100644 index 0000000000000..7eca73e71bc87 --- /dev/null +++ b/emulators/shoebill/distinfo @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1 2016/03/23 14:21:03 hauke Exp $ + +SHA1 (shoebill/0.0.5.tar.gz) = 40b9ae839bbb9d065ca7d36363b1b4660d780010 +RMD160 (shoebill/0.0.5.tar.gz) = 20143081d2418d6961f86626e3d994b2feda8a4b +SHA512 (shoebill/0.0.5.tar.gz) = cf8d7945943d6d7a505c233b5c99371f5d37d5d60dd5beeeadbe442ef43b9980e96d51f193d69a03eb58a0a2b13103b4dba311a53c939b633b20753a8c19a772 +Size (shoebill/0.0.5.tar.gz) = 253877 bytes +SHA1 (patch-sdl-gui_lin_build.sh) = 024efbe3dbec708148bc205c01cddff4fd6d74e1 +SHA1 (patch-sdl-gui_sdl.c) = ee433b37104dcccc700d1d08b97807689ed8da67 diff --git a/emulators/shoebill/files/shoebill.usage b/emulators/shoebill/files/shoebill.usage new file mode 100644 index 0000000000000..b692b875f87a6 --- /dev/null +++ b/emulators/shoebill/files/shoebill.usage @@ -0,0 +1,37 @@ +Shoebill v0.0.4 - http://github.com/pruten/shoebill - Peter Rutenbar (c) 2014 + +Arguments have the form name=value. + +rom= +Specifies the path to a Macintosh II ROM. +E.g. rom=/home/foo/macii.rom + +disk0..disk6= + +Specifies the path to a disk image for the given SCSI ID. Shoebill +will always boot from disk0, so make sure disk0 points to a bootable +A/UX image. E.g. disk0=/home/foo/aux3.img disk1=/blah.img + +ram= +E.g. ram=16 + +height= +Specifies the height of the screen in pixels. + +width= +Specifies the width of the screen in pixels. + +pram-path= +Defaults to ~/.shoebill_pram + +verbose=<1 or 0> +Whether to boot A/UX in verbose mode. Best to leave it at default (1). + +unix-path= +Path to the kernel file on the root disk image. Best to leave it at +default (/unix). + + +Example: + +./shoebill disk0=/aux3.img rom=/macii.rom width=1024 height=768 ram=64 diff --git a/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh b/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh new file mode 100644 index 0000000000000..085e18df4aedc --- /dev/null +++ b/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh @@ -0,0 +1,24 @@ +$NetBSD: patch-sdl-gui_lin_build.sh,v 1.1 2016/03/23 14:21:03 hauke Exp $ + +Make build parameters settable from pkg Makefile + +--- sdl-gui/lin_build.sh.orig 2015-09-14 02:11:18.000000000 +0000 ++++ sdl-gui/lin_build.sh +@@ -1,6 +1,7 @@ +-#!/bin/bash ++#!/bin/sh + +-CC=gcc ++CC=${CC:-"gcc"} ++CFLAGS=${CFLAGS:-"-O2"} + + files="" + for i in adb fpu mc68851 mem via floppy core_api cpu dis; do +@@ -17,6 +18,6 @@ $CC -O1 ../core/decoder_gen.c -o decoder + ./decoder_gen dis . + + +-cmd="$CC -O3 -ggdb -flto $files sdl.c -lpthread -lm -lSDL2 -lGL -o shoebill" ++cmd="$CC ${CFLAGS} -ggdb -flto $files sdl.c -lpthread -lm -lSDL2 -lGL ${LDFLAGS} -o shoebill" + echo $cmd + $cmd diff --git a/emulators/shoebill/patches/patch-sdl-gui_sdl.c b/emulators/shoebill/patches/patch-sdl-gui_sdl.c new file mode 100644 index 0000000000000..f4f77fc736f8b --- /dev/null +++ b/emulators/shoebill/patches/patch-sdl-gui_sdl.c @@ -0,0 +1,15 @@ +$NetBSD: patch-sdl-gui_sdl.c,v 1.1 2016/03/23 14:21:03 hauke Exp $ + +Fix #include path + +--- sdl-gui/sdl.c.orig 2015-09-14 02:11:18.000000000 +0000 ++++ sdl-gui/sdl.c +@@ -220,7 +220,7 @@ struct { + #if !((defined WIN32) || (defined _WIN64)) + #include + #include +-#include ++#include + #endif + + static char* _get_home_dir (const char *terminal_element) From 79b233eb7b21e600d843e3fddee003e3ca075f55 Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 23 Mar 2016 14:23:18 +0000 Subject: [PATCH 0380/2457] Correct a brain-o --- emulators/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emulators/Makefile b/emulators/Makefile index 8e41656e610aa..89be0b305b88e 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.243 2016/03/23 14:22:14 hauke Exp $ +# $NetBSD: Makefile,v 1.244 2016/03/23 14:23:18 hauke Exp $ # COMMENT= Emulators for other operating systems @@ -128,7 +128,7 @@ SUBDIR+= qemu0 SUBDIR+= raine SUBDIR+= realboy SUBDIR+= retroarch -SUBDIR+= shoestring +SUBDIR+= shoebill SUBDIR+= simh SUBDIR+= simulavr SUBDIR+= ski From 71fda84f3a2dc2cd01151653cfe25095c923df3e Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 23 Mar 2016 14:23:55 +0000 Subject: [PATCH 0381/2457] Added emulators/shoebill version 0.0.5 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index bc431c9c87ab1..5d194ccd05856 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1274 2016/03/23 12:40:23 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1275 2016/03/23 14:23:55 hauke Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1672,3 +1672,4 @@ Changes to the packages collection and infrastructure in 2016: Updated graphics/tiff to 4.0.6nb1 [tez 2016-03-22] Updated comms/minicom to 2.7nb1 [ryoon 2016-03-22] Updated textproc/pdfgrep to 1.4.1 [ryoon 2016-03-23] + Added emulators/shoebill version 0.0.5 [hauke 2016-03-23] From 039736cec5e3e3be3f4e396f98b7f713fcea25e2 Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 23 Mar 2016 14:44:37 +0000 Subject: [PATCH 0382/2457] Estract with gnu tar Replace perl interpreter path --- emulators/shoebill/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/emulators/shoebill/Makefile b/emulators/shoebill/Makefile index 96304e9e6cd4a..883a17c72a042 100644 --- a/emulators/shoebill/Makefile +++ b/emulators/shoebill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/03/23 14:21:03 hauke Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/23 14:44:37 hauke Exp $ GITHUB_PROJECT= shoebill DISTNAME= 0.0.5 @@ -15,7 +15,10 @@ LICENSE= 2-clause-bsd # Missing long double math functions NOT_FOR_PLATFORM= NetBSD-[0-6]*-* -USE_TOOLS+= perl +USE_TOOLS+= perl gtar +EXTRACT_USING= gtar + +REPLACE_PERL+= core/macro.pl WRKSRC= ${WRKDIR}/${PKGNAME} From 1c09cfcba695a22323a98b95787c4dc02f9f729d Mon Sep 17 00:00:00 2001 From: bouyer Date: Wed, 23 Mar 2016 14:54:39 +0000 Subject: [PATCH 0383/2457] Fix patches, pointed out by Joerg --- geography/opencpn/distinfo | 5 ++--- .../patches/patch-src_texcmp_squish_squish.cpp | 12 ------------ 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 geography/opencpn/patches/patch-src_texcmp_squish_squish.cpp diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo index bc55b3be81af8..5617699a5242d 100644 --- a/geography/opencpn/distinfo +++ b/geography/opencpn/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.5 2016/03/14 11:01:06 bouyer Exp $ +$NetBSD: distinfo,v 1.6 2016/03/23 14:54:39 bouyer Exp $ SHA1 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 39baa5f89ded9a5c62824e6e1445dbfc4f168578 RMD160 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = d344b9caffe40dabcad1d9ac148ce54d75f1573c SHA512 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 3ea2136ab777f711aeaa66f34722b3b091af91104ff60303b61c587f95354826afae6dbc8f6a9228357399ae36e96a34098596c0a278d2184ce59283c88f4051 Size (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 42779485 bytes -SHA1 (patch-CMakeLists.txt) = 472b73f0e337d49d94b1cfb892962247d4e1959f +SHA1 (patch-CMakeLists.txt) = 124a5f3836cf57b61c1452a5ded65dc7b16a4c69 SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 9d6ade1c32f7d52b53848a2e382a4838d0240530 SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = f96234755ccdb0cf4d890b44c3983a71700e6de7 @@ -17,4 +17,3 @@ SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 SHA1 (patch-src_glu_libtess_sweep.c) = 68e3e69239d8bdce353bcad0f5606be5b447b5a7 SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040 -SHA1 (patch-src_texcmp_squish_squish.cpp) = 3a70d4da7a3d6b54cac122a3e80a35b46a91af19 diff --git a/geography/opencpn/patches/patch-src_texcmp_squish_squish.cpp b/geography/opencpn/patches/patch-src_texcmp_squish_squish.cpp deleted file mode 100644 index e15ba1d40bede..0000000000000 --- a/geography/opencpn/patches/patch-src_texcmp_squish_squish.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_texcmp_squish_squish.cpp,v 1.1 2015/03/31 15:41:14 joerg Exp $ - ---- src/texcmp/squish/squish.cpp.orig 2015-03-27 17:03:21.000000000 +0000 -+++ src/texcmp/squish/squish.cpp -@@ -23,6 +23,7 @@ - - -------------------------------------------------------------------------- */ - -+#include - #include - #include "colourset.h" - #include "maths.h" From d7fccbd31c9b7a09c6f2829b2dadfed1053e34d1 Mon Sep 17 00:00:00 2001 From: mef Date: Wed, 23 Mar 2016 14:56:07 +0000 Subject: [PATCH 0384/2457] Forgot to update PLIST when 1.3.8 to 1.3.9 update, thanks joerg@ --- devel/cmockery2/PLIST | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/devel/cmockery2/PLIST b/devel/cmockery2/PLIST index 6de6ae7e12d53..9a34b0d397419 100644 --- a/devel/cmockery2/PLIST +++ b/devel/cmockery2/PLIST @@ -1,12 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2014/08/07 11:18:04 manu Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/23 14:56:07 mef Exp $ include/cmockery/cmockery.h include/cmockery/cmockery_override.h include/cmockery/pbc.h lib/libcmockery.la lib/pkgconfig/cmockery2.pc -share/doc/cmockery2-1.3.8/AUTHORS -share/doc/cmockery2-1.3.8/COPYING -share/doc/cmockery2-1.3.8/ChangeLog -share/doc/cmockery2-1.3.8/coverage.md -share/doc/cmockery2-1.3.8/index.html -share/doc/cmockery2-1.3.8/usage.md +share/doc/cmockery2-${PKGVERSION}/AUTHORS +share/doc/cmockery2-${PKGVERSION}/COPYING +share/doc/cmockery2-${PKGVERSION}/ChangeLog +share/doc/cmockery2-${PKGVERSION}/coverage.md +share/doc/cmockery2-${PKGVERSION}/index.html +share/doc/cmockery2-${PKGVERSION}/usage.md From daa76901d2c88742a1db58252387857284d755de Mon Sep 17 00:00:00 2001 From: tnn Date: Wed, 23 Mar 2016 14:58:10 +0000 Subject: [PATCH 0385/2457] Update to yEd-3.15.0.1 since 3.15 is unfetchable. Changes unknown. PR pkg/50970 --- editors/yed/Makefile | 4 ++-- editors/yed/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/editors/yed/Makefile b/editors/yed/Makefile index 31028e5da5243..c89a16a45adb9 100644 --- a/editors/yed/Makefile +++ b/editors/yed/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2016/03/09 20:43:38 tnn Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/23 14:58:10 tnn Exp $ -DISTNAME= yEd-3.15 +DISTNAME= yEd-3.15.0.1 PKGNAME= ${DISTNAME:C:E:e:} CATEGORIES= editors MASTER_SITES= http://www.yworks.com/products/yed/demo/ diff --git a/editors/yed/distinfo b/editors/yed/distinfo index 42ae0992d6022..9eb198c8fbbb8 100644 --- a/editors/yed/distinfo +++ b/editors/yed/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2016/03/09 20:43:38 tnn Exp $ +$NetBSD: distinfo,v 1.3 2016/03/23 14:58:10 tnn Exp $ -SHA1 (yEd-3.15.zip) = 4648480610a53a213486125ef7c8e7bf11298dea -RMD160 (yEd-3.15.zip) = d38bfa2831e5d4d0500d7805b94a02771b70d8c1 -SHA512 (yEd-3.15.zip) = 232817caf356b1b47e98df32c6d807b6954940c3994d3dc7870da39132bb8d8d85bdbf180932dcb59eb993a5aa1eeefce471ae771141059019e656bf1c1c182b -Size (yEd-3.15.zip) = 29754644 bytes +SHA1 (yEd-3.15.0.1.zip) = e41932d69e737f02908572d8bca32977790e50ff +RMD160 (yEd-3.15.0.1.zip) = 48a8dcfee8832523e82ccd0c2743238f6a80730a +SHA512 (yEd-3.15.0.1.zip) = f7ba4d4c24335578e41ddb1fb663c21be7d2ff6d8813460dfb716f92f062e68692d588288800646f13250bd7493221a5e52dde96d3ff1f88cbe4bb8ad90976d7 +Size (yEd-3.15.0.1.zip) = 29747674 bytes From f114d3b1258b9c36ef8c0a2fc709eefb5b121250 Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 23 Mar 2016 15:10:46 +0000 Subject: [PATCH 0386/2457] Set debug options in package Makefile --- emulators/shoebill/Makefile | 5 ++++- emulators/shoebill/distinfo | 4 ++-- emulators/shoebill/patches/patch-sdl-gui_lin_build.sh | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/emulators/shoebill/Makefile b/emulators/shoebill/Makefile index 883a17c72a042..6a197a39afbec 100644 --- a/emulators/shoebill/Makefile +++ b/emulators/shoebill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/03/23 14:44:37 hauke Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/23 15:10:46 hauke Exp $ GITHUB_PROJECT= shoebill DISTNAME= 0.0.5 @@ -25,6 +25,9 @@ WRKSRC= ${WRKDIR}/${PKGNAME} DOCDIR= share/doc/shoebill INSTALLATION_DIRS= bin ${DOCDIR} +CFLAGS+= -g3 +INSTALL_UNSTRIPPED= yes + do-build: ( cd ${WRKSRC}/sdl-gui && \ ${ENV} CC=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \ diff --git a/emulators/shoebill/distinfo b/emulators/shoebill/distinfo index 7eca73e71bc87..e27fb6a81eebc 100644 --- a/emulators/shoebill/distinfo +++ b/emulators/shoebill/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1 2016/03/23 14:21:03 hauke Exp $ +$NetBSD: distinfo,v 1.2 2016/03/23 15:10:46 hauke Exp $ SHA1 (shoebill/0.0.5.tar.gz) = 40b9ae839bbb9d065ca7d36363b1b4660d780010 RMD160 (shoebill/0.0.5.tar.gz) = 20143081d2418d6961f86626e3d994b2feda8a4b SHA512 (shoebill/0.0.5.tar.gz) = cf8d7945943d6d7a505c233b5c99371f5d37d5d60dd5beeeadbe442ef43b9980e96d51f193d69a03eb58a0a2b13103b4dba311a53c939b633b20753a8c19a772 Size (shoebill/0.0.5.tar.gz) = 253877 bytes -SHA1 (patch-sdl-gui_lin_build.sh) = 024efbe3dbec708148bc205c01cddff4fd6d74e1 +SHA1 (patch-sdl-gui_lin_build.sh) = 5e5a87ef66e5df2d8f816b440b315f107603d0bd SHA1 (patch-sdl-gui_sdl.c) = ee433b37104dcccc700d1d08b97807689ed8da67 diff --git a/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh b/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh index 085e18df4aedc..db21736cb7f3d 100644 --- a/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh +++ b/emulators/shoebill/patches/patch-sdl-gui_lin_build.sh @@ -1,4 +1,4 @@ -$NetBSD: patch-sdl-gui_lin_build.sh,v 1.1 2016/03/23 14:21:03 hauke Exp $ +$NetBSD: patch-sdl-gui_lin_build.sh,v 1.2 2016/03/23 15:10:46 hauke Exp $ Make build parameters settable from pkg Makefile @@ -19,6 +19,6 @@ Make build parameters settable from pkg Makefile -cmd="$CC -O3 -ggdb -flto $files sdl.c -lpthread -lm -lSDL2 -lGL -o shoebill" -+cmd="$CC ${CFLAGS} -ggdb -flto $files sdl.c -lpthread -lm -lSDL2 -lGL ${LDFLAGS} -o shoebill" ++cmd="$CC ${CFLAGS} -flto $files sdl.c -lpthread -lm -lSDL2 -lGL ${LDFLAGS} -o shoebill" echo $cmd $cmd From ee1f19c967d451814e76a86301b088e3067cbb77 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 23 Mar 2016 15:40:36 +0000 Subject: [PATCH 0387/2457] Fix install on Darwin which doesn't use PolicyKit. --- sysutils/baloo/Makefile | 9 ++++++++- sysutils/baloo/PLIST | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sysutils/baloo/Makefile b/sysutils/baloo/Makefile index 66e4b303cad96..1d9f6c09a83d6 100644 --- a/sysutils/baloo/Makefile +++ b/sysutils/baloo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/03/05 11:29:28 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/23 15:40:36 jperkin Exp $ DISTNAME= baloo-${_KDE_VERSION} PKGREVISION= 3 @@ -12,6 +12,13 @@ USE_TOOLS+= gmake .include "../../meta-pkgs/kde4/kde4.mk" +.include "../../mk/bsd.prefs.mk" + +PLIST_VARS+= polkit +.if ${OPSYS} != "Darwin" +PLIST.polkit= yes +.endif + .include "../../devel/qjson/buildlink3.mk" .include "../../mail/akonadi/buildlink3.mk" .include "../../misc/kdepimlibs4/buildlink3.mk" diff --git a/sysutils/baloo/PLIST b/sysutils/baloo/PLIST index b9119fd3eb141..6def5484e7175 100644 --- a/sysutils/baloo/PLIST +++ b/sysutils/baloo/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2014/11/13 11:05:43 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/23 15:40:36 jperkin Exp $ bin/akonadi_baloo_indexer bin/baloo_file bin/baloo_file_cleaner @@ -62,7 +62,7 @@ lib/libbalooqueryparser.so.${PKGVERSION} lib/libbalooxapian.so lib/libbalooxapian.so.4 lib/libbalooxapian.so.${PKGVERSION} -share/PolicyKit/policy/org.kde.baloo.filewatch.policy +${PLIST.polkit}share/PolicyKit/policy/org.kde.baloo.filewatch.policy share/akonadi/agents/akonadibalooindexingagent.desktop share/dbus-1/interfaces/org.kde.baloo.file.indexer.xml share/dbus-1/system-services/org.kde.baloo.filewatch.service From 8c6589a78facfdaedfb1c67f109841718f69a9e0 Mon Sep 17 00:00:00 2001 From: darcy Date: Wed, 23 Mar 2016 16:30:12 +0000 Subject: [PATCH 0388/2457] The distribution had the wrong tar file. Fixed checksums for correct one. Bumped PKGREVISION in case anyone already built the wrong one. --- databases/py-postgresql/Makefile | 3 ++- databases/py-postgresql/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index a14178c48967f..68c21b0468b14 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.77 2016/03/20 22:01:22 darcy Exp $ +# $NetBSD: Makefile,v 1.78 2016/03/23 16:30:12 darcy Exp $ DISTNAME= PyGreSQL-5.0 PKGNAME= ${PYPKGPREFIX}-postgresql-5.0 +PKGREVISION= 1 CATEGORIES= databases python MASTER_SITES= http://pygresql.org/files/ diff --git a/databases/py-postgresql/distinfo b/databases/py-postgresql/distinfo index 3643b66f51c49..bb989fc20dddd 100644 --- a/databases/py-postgresql/distinfo +++ b/databases/py-postgresql/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.23 2016/03/20 22:01:22 darcy Exp $ +$NetBSD: distinfo,v 1.24 2016/03/23 16:30:12 darcy Exp $ -SHA1 (PyGreSQL-5.0.tar.gz) = d3d38fd67c8f6ea20c416160ff1c7aac9f3f2626 -RMD160 (PyGreSQL-5.0.tar.gz) = c6e82a87a13049bdecd4d1292660c28f99aadbfc -SHA512 (PyGreSQL-5.0.tar.gz) = 6363c8891c005ae7a35202f1176f96a9278bd700cee5bea2d6b140e249577eb8dbcc00fda51c6bacdcfebabcbbaa7fb9677608c49ec77dc77e030350bf602268 -Size (PyGreSQL-5.0.tar.gz) = 633822 bytes +SHA1 (PyGreSQL-5.0.tar.gz) = ffcd791b22b3adcbc9f03a2b3eac7de269b72d2d +RMD160 (PyGreSQL-5.0.tar.gz) = bf64ffbd5055d792d3515ea07ffb631f60fe5ffb +SHA512 (PyGreSQL-5.0.tar.gz) = cdf1ed78f9bc604c202ddd72286160856954e27ce5fba60379fbd1e82597785f65b53e8b3310199cdaa925ad75bd01f7b54778153d1fa8ed8049fd4e401ebb88 +Size (PyGreSQL-5.0.tar.gz) = 633868 bytes From 7e441cf1bf6efac1f868b008b29862ffe81b9984 Mon Sep 17 00:00:00 2001 From: gdt Date: Wed, 23 Mar 2016 16:36:53 +0000 Subject: [PATCH 0389/2457] Exclude NetBSD 1-5 from using go-pkglint (Surely more systems should be using pkgint4, as it's obvious that being i386 and no SunOS is not sufficient. However, this is a ~minimal fix for NetBSD 5.) --- pkgtools/pkglint/select.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgtools/pkglint/select.mk b/pkgtools/pkglint/select.mk index 218ec098d89ef..56bc9577908fb 100644 --- a/pkgtools/pkglint/select.mk +++ b/pkgtools/pkglint/select.mk @@ -1,4 +1,4 @@ -# $NetBSD: select.mk,v 1.3 2016/02/02 08:00:10 rillig Exp $ +# $NetBSD: select.mk,v 1.4 2016/03/23 16:36:53 gdt Exp $ # # Selects the proper version of pkglint, depending on whether the # platform supports the Go programming language. @@ -7,7 +7,8 @@ .include "../../mk/bsd.fast.prefs.mk" # See lang/go/version.mk -.if ${MACHINE_ARCH:Ni386:Nx86_64:Nevbarm} || ${MACHINE_PLATFORM:MSunOS-*-i386} +# While it's wrong in the above, go14 does not build on NetBSD 5. +.if ${MACHINE_ARCH:Ni386:Nx86_64:Nevbarm} || ${MACHINE_PLATFORM:MSunOS-*-i386} || ${MACHINE_PLATFORM:MNetBSD-[1-5]*-*} DEPENDS+= pkglint4>=4.82<5:../../pkgtools/pkglint4 .else DEPENDS+= pkglint>=5:../../pkgtools/pkglint From fb9b99c12440ab2f4b5b74058ef261e24f069a49 Mon Sep 17 00:00:00 2001 From: khorben Date: Wed, 23 Mar 2016 17:26:05 +0000 Subject: [PATCH 0390/2457] Register missing dependency on curses Found with an unprivileged bootstrap on NetBSD/amd64 (--prefer-pkgsrc yes) --- x11/qt5-qtwebkit/Makefile | 3 ++- x11/qt5-qtwebkit/buildlink3.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/x11/qt5-qtwebkit/Makefile b/x11/qt5-qtwebkit/Makefile index c5147c432e843..615e1b4622e96 100644 --- a/x11/qt5-qtwebkit/Makefile +++ b/x11/qt5-qtwebkit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2016/03/05 11:28:01 jperkin Exp $ +# $NetBSD: Makefile,v 1.33 2016/03/23 17:26:05 khorben Exp $ DISTNAME= qtwebkit-opensource-src-${QTVERSION} PKGNAME= qt5-qtwebkit-${QTVERSION} @@ -37,6 +37,7 @@ post-install: .include "../../devel/libexecinfo/buildlink3.mk" .endif .include "../../graphics/libwebp/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .if ${OPSYS} != "Darwin" diff --git a/x11/qt5-qtwebkit/buildlink3.mk b/x11/qt5-qtwebkit/buildlink3.mk index 466816d416b11..b1d3fea5f76cc 100644 --- a/x11/qt5-qtwebkit/buildlink3.mk +++ b/x11/qt5-qtwebkit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2016/03/05 11:28:01 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2016/03/23 17:26:05 khorben Exp $ BUILDLINK_TREE+= qt5-qtwebkit @@ -15,6 +15,7 @@ BUILDLINK_LIBDIRS.qt5-qtwebkit+= qt5/plugins .include "../../databases/sqlite3/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .if ${OPSYS} != "Darwin" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" From efc706373d524a607b6dc76191a27902ce3c2cb3 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 23 Mar 2016 19:35:48 +0000 Subject: [PATCH 0391/2457] Add Darwin to ONLY_FOR_PLATFORM, builds fine on Mavericks at least. --- sysutils/pciutils/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile index 361e6e57ca672..7b3a6a939f404 100644 --- a/sysutils/pciutils/Makefile +++ b/sysutils/pciutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2016/02/26 10:24:13 jperkin Exp $ +# $NetBSD: Makefile,v 1.28 2016/03/23 19:35:48 jperkin Exp $ DISTNAME= pciutils-3.4.1 PKGREVISION= 1 @@ -12,7 +12,7 @@ COMMENT= PCI bus manipulation utility similar to NetBSD pcictl(8) LICENSE= gnu-gpl-v2 MAKE_JOBS_SAFE= no -ONLY_FOR_PLATFORM= AIX-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* +ONLY_FOR_PLATFORM= AIX-*-* Darwin-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* ONLY_FOR_PLATFORM+= DragonFly-*-* OpenBSD-*-* SunOS-5.11-* Haiku-*-* INSTALL_TARGET= install install-lib From 9d12e98bd8c152216a328cdad43f0f929e305acc Mon Sep 17 00:00:00 2001 From: nros Date: Wed, 23 Mar 2016 21:22:18 +0000 Subject: [PATCH 0392/2457] Explicity disable manual generation in claws-mail. The manual is generated if docbook2* is found on the system. We do not have these in pkgsrc. They might be found somewhere else on the system and the install step will then break due to broken PLIST. Disabling the manual fixes the install step on such systems. --- mail/claws-mail/Makefile.common | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mail/claws-mail/Makefile.common b/mail/claws-mail/Makefile.common index 801162f749ce0..99cc8e1c6170d 100644 --- a/mail/claws-mail/Makefile.common +++ b/mail/claws-mail/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2015/12/13 11:12:56 markd Exp $ +# $NetBSD: Makefile.common,v 1.17 2016/03/23 21:22:18 nros Exp $ # used by mail/claws-mail/plugins.mk @@ -27,6 +27,7 @@ CONFIGURE_ENV+= ac_cv_path_GNOME_CONFIG="no" CONFIGURE_ARGS+= --enable-enchant CONFIGURE_ARGS+= --enable-nls CONFIGURE_ARGS+= --enable-compface +CONFIGURE_ARGS+= --disable-manual CONFIGURE_ARGS+= --disable-pgpcore-plugin CONFIGURE_ARGS+= --disable-pgpmime-plugin CONFIGURE_ARGS+= --disable-pgpinline-plugin From 47f63e063f28f3106f1f32af54bf3bc54e4f3d08 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 23 Mar 2016 21:51:25 +0000 Subject: [PATCH 0393/2457] Set DIST_SUBDIR. The previous commit replaced the distfile with a new one with the same name. In pkgsrc, we have rules for that; apply them. --- databases/py-postgresql/Makefile | 5 +++-- databases/py-postgresql/distinfo | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index 68c21b0468b14..6dcdd01ee5bdc 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.78 2016/03/23 16:30:12 darcy Exp $ +# $NetBSD: Makefile,v 1.79 2016/03/23 21:51:25 wiz Exp $ DISTNAME= PyGreSQL-5.0 PKGNAME= ${PYPKGPREFIX}-postgresql-5.0 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= databases python MASTER_SITES= http://pygresql.org/files/ +DIST_SUBDIR= py-postgresql-5.0-20160323 OWNER= darcy@NetBSD.org HOMEPAGE= http://www.PyGreSQL.org/ diff --git a/databases/py-postgresql/distinfo b/databases/py-postgresql/distinfo index bb989fc20dddd..7261d96a4dae6 100644 --- a/databases/py-postgresql/distinfo +++ b/databases/py-postgresql/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.24 2016/03/23 16:30:12 darcy Exp $ +$NetBSD: distinfo,v 1.25 2016/03/23 21:51:25 wiz Exp $ -SHA1 (PyGreSQL-5.0.tar.gz) = ffcd791b22b3adcbc9f03a2b3eac7de269b72d2d -RMD160 (PyGreSQL-5.0.tar.gz) = bf64ffbd5055d792d3515ea07ffb631f60fe5ffb -SHA512 (PyGreSQL-5.0.tar.gz) = cdf1ed78f9bc604c202ddd72286160856954e27ce5fba60379fbd1e82597785f65b53e8b3310199cdaa925ad75bd01f7b54778153d1fa8ed8049fd4e401ebb88 -Size (PyGreSQL-5.0.tar.gz) = 633868 bytes +SHA1 (py-postgresql-5.0-20160323/PyGreSQL-5.0.tar.gz) = ffcd791b22b3adcbc9f03a2b3eac7de269b72d2d +RMD160 (py-postgresql-5.0-20160323/PyGreSQL-5.0.tar.gz) = bf64ffbd5055d792d3515ea07ffb631f60fe5ffb +SHA512 (py-postgresql-5.0-20160323/PyGreSQL-5.0.tar.gz) = cdf1ed78f9bc604c202ddd72286160856954e27ce5fba60379fbd1e82597785f65b53e8b3310199cdaa925ad75bd01f7b54778153d1fa8ed8049fd4e401ebb88 +Size (py-postgresql-5.0-20160323/PyGreSQL-5.0.tar.gz) = 633868 bytes From 9228026fd63878caf2fcaa42607e67e5d475c5a2 Mon Sep 17 00:00:00 2001 From: ryoon Date: Thu, 24 Mar 2016 03:32:37 +0000 Subject: [PATCH 0394/2457] Change default GNUPG to 2.0, Bump PKGREVISION --- mail/seamonkey-enigmail/Makefile | 3 ++- mail/thunderbird-enigmail/Makefile | 3 ++- mail/thunderbird-enigmail/options.mk | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mail/seamonkey-enigmail/Makefile b/mail/seamonkey-enigmail/Makefile index 86621f35ffe19..51ac443e8a343 100644 --- a/mail/seamonkey-enigmail/Makefile +++ b/mail/seamonkey-enigmail/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2016/03/07 11:49:43 ryoon Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/24 03:32:37 ryoon Exp $ .include "../../mail/thunderbird-enigmail/Makefile.common" PKGNAME= seamonkey-${DISTNAME} +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= GnuPG support for www/seamonkey diff --git a/mail/thunderbird-enigmail/Makefile b/mail/thunderbird-enigmail/Makefile index 77d8f2272695d..0b5c5cd2244dc 100644 --- a/mail/thunderbird-enigmail/Makefile +++ b/mail/thunderbird-enigmail/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2016/03/07 11:49:43 ryoon Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/24 03:32:37 ryoon Exp $ .include "Makefile.common" PKGNAME= thunderbird-${DISTNAME} +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= GnuPG support for mail/thunderbird diff --git a/mail/thunderbird-enigmail/options.mk b/mail/thunderbird-enigmail/options.mk index 0370cc7a78fdb..969fad0010981 100644 --- a/mail/thunderbird-enigmail/options.mk +++ b/mail/thunderbird-enigmail/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.1 2016/03/07 11:49:43 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2016/03/24 03:32:37 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.enigmail PKG_OPTIONS_REQUIRED_GROUPS= gnupg PKG_OPTIONS_GROUP.gnupg= gnupg2 gnupg21 -PKG_SUGGESTED_OPTIONS= gnupg21 +PKG_SUGGESTED_OPTIONS= gnupg2 .include "../../mk/bsd.options.mk" From 01a538a1a7265e5f10637f66ad9fa91247467315 Mon Sep 17 00:00:00 2001 From: ryoon Date: Thu, 24 Mar 2016 03:33:36 +0000 Subject: [PATCH 0395/2457] Updated mail/thunderbird-enigmail to 1.9.1nb1 Updated mail/seamonkey-enigmail to 1.9.1nb1 --- doc/CHANGES-2016 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 5d194ccd05856..1d55da247ae4c 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1275 2016/03/23 14:23:55 hauke Exp $ +$NetBSD: CHANGES-2016,v 1.1276 2016/03/24 03:33:36 ryoon Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1673,3 +1673,5 @@ Changes to the packages collection and infrastructure in 2016: Updated comms/minicom to 2.7nb1 [ryoon 2016-03-22] Updated textproc/pdfgrep to 1.4.1 [ryoon 2016-03-23] Added emulators/shoebill version 0.0.5 [hauke 2016-03-23] + Updated mail/thunderbird-enigmail to 1.9.1nb1 [ryoon 2016-03-24] + Updated mail/seamonkey-enigmail to 1.9.1nb1 [ryoon 2016-03-24] From 0ae82657a56f43c03db1220c78bae87729820fdd Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 24 Mar 2016 07:46:52 +0000 Subject: [PATCH 0396/2457] + autoconf-archive-2016.03.20, ddrescue-1.21, p5-DateTime-1.2600, p5-Package-DeprecationManager-0.16, p5-Socket6-0.27. --- doc/TODO | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/TODO b/doc/TODO index d042622a7c439..1da96630a10af 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15609 2016/03/23 12:40:23 ryoon Exp $ +$NetBSD: TODO,v 1.15610 2016/03/24 07:46:52 wiz Exp $ Suggested new packages ====================== @@ -461,7 +461,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o audacious-plugins-3.7.1 o audacity-2.1.1 o augeas-1.4.0 - o autoconf-archive-2015.09.25 + o autoconf-archive-2016.03.20 o autoconvert-0.3.16 o autogen-5.18.7 o avant-window-navigator-0.4.2 @@ -602,7 +602,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o dbus-python-common-1.2.4 o dd_rescue-1.46 o dd_rhelp-0.3.0 - o ddrescue-1.20 + o ddrescue-1.21 o dega-1.12 o dejagnu-1.5.3 o delegate-9.9.13 @@ -1319,6 +1319,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-Data-Peek-0.45 o p5-Data-SimplePassword-0.11 o p5-Date-Extract-0.05 + o p5-DateTime-1.2600 o p5-DateTime-TimeZone-1.96 o p5-Devel-PatchPerl-1.40 o p5-Devel-Pragma-0.62 @@ -1436,6 +1437,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-POE-Component-Client-DNS-1.054 o p5-POE-Component-Server-SimpleHTTP-2.22 o p5-PPIx-EditorTools-0.19 + o p5-Package-DeprecationManager-0.16 o p5-PadWalker-2.2 o p5-Padre-1.00 o p5-Padre-Plugin-Autoformat-1.22 @@ -1481,7 +1483,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o p5-Sereal-Decoder-3.014 o p5-Sereal-Encoder-3.014 o p5-Smart-Comments-1.06 - o p5-Socket6-0.26 + o p5-Socket6-0.27 o p5-Software-License-0.103011 o p5-Sort-Versions-1.62 o p5-Spreadsheet-Read-0.63 From 7c209f543119e3f9973c132a2fc38ca0ef10ac73 Mon Sep 17 00:00:00 2001 From: youri Date: Thu, 24 Mar 2016 10:53:16 +0000 Subject: [PATCH 0397/2457] Update to 7.16, read changelog at: https://github.com/n-t-roff/sc/blob/master/CHANGES --- math/sc/Makefile | 25 +++++++++++++++---------- math/sc/PLIST | 6 +++--- math/sc/distinfo | 16 ++++++---------- math/sc/patches/patch-Makefile | 15 +++++++++++++++ 4 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 math/sc/patches/patch-Makefile diff --git a/math/sc/Makefile b/math/sc/Makefile index 97fefa92c69cf..af9351e62808c 100644 --- a/math/sc/Makefile +++ b/math/sc/Makefile @@ -1,18 +1,23 @@ -# $NetBSD: Makefile,v 1.18 2015/08/18 07:31:12 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2016/03/24 10:53:16 youri Exp $ -DISTNAME= sc-6.21 -PKGREVISION= 3 -CATEGORIES= math -MASTER_SITES= ftp://gatekeeper.dec.com/pub/misc/ -EXTRACT_SUFX= .tar.Z +DISTNAME= sc-7.16_1.0.1 +CATEGORIES= math +MASTER_SITES= ${MASTER_SITE_GITHUB:=n-t-roff/} -MAINTAINER= eric@fox.phoenix.az.us +MAINTAINER= carsten.kunze@arcor.de +HOMEPAGE= https://github.com/n-t-roff/sc COMMENT= Curses-based spreadsheet program +LICENSE= public-domain + +MAKE_JOBS_SAFE= no +HAS_CONFIGURE= yes -WRKSRC= ${WRKDIR} USE_TOOLS+= yacc -MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 -INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man1 + +MAKE_FLAGS= prefix=${DESTDIR}${PREFIX} \ + MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 \ + DOBACKUPS= +INSTALLATION_DIRS= bin lib ${PKGMANDIR}/man1 share/${name} .include "../../mk/curses.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/sc/PLIST b/math/sc/PLIST index e47b9b9576ce1..7b237b545f3cb 100644 --- a/math/sc/PLIST +++ b/math/sc/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:05:49 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/24 10:53:16 youri Exp $ +bin/psc bin/sc bin/scqref -bin/psc -man/man1/sc.1 man/man1/psc.1 +man/man1/sc.1 share/sc/tutorial.sc diff --git a/math/sc/distinfo b/math/sc/distinfo index ecd13913e1f88..5f03da23ef535 100644 --- a/math/sc/distinfo +++ b/math/sc/distinfo @@ -1,11 +1,7 @@ -$NetBSD: distinfo,v 1.9 2015/11/03 23:33:44 agc Exp $ +$NetBSD: distinfo,v 1.10 2016/03/24 10:53:16 youri Exp $ -SHA1 (sc-6.21.tar.Z) = 80d8972bcd1b5adcbc00345b6866954603dadf31 -RMD160 (sc-6.21.tar.Z) = 24abfaea2e5ef644394efd5e13ad1850280abbd6 -SHA512 (sc-6.21.tar.Z) = 5c82e2cbc6e87101e12c2307e619f8154f5a11b07eacb4b5794ca4e649b5f9497b72114684190cfc249acd1bfcc4c0b1515a81ad4227d044d8adce41bbe2d4d2 -Size (sc-6.21.tar.Z) = 180360 bytes -SHA1 (patch-aa) = 24cb53e798d3b923ff370b29d8de5bbb9e4127b2 -SHA1 (patch-ab) = 2055f81bbabaa2752ed6dc18ce66ca857b9654f4 -SHA1 (patch-ac) = 1b3628ae0bf881c8c3e9886210d23d63207f912f -SHA1 (patch-ad) = e579f8e29ebba4d653e83741a829262c2b7d8d2b -SHA1 (patch-sc.h) = c432ea8d2f7a99c30f32d8bb0468e29aaa3f27c8 +SHA1 (sc-7.16_1.0.1.tar.gz) = 969f57067e1fe4f1548919d2bb0523c129e4af1b +RMD160 (sc-7.16_1.0.1.tar.gz) = 5a6322fe30df7b9da20deb8373170403d07e740e +SHA512 (sc-7.16_1.0.1.tar.gz) = e780543b3a46abc91c2dcd8e30a07f3dc46937bf71fc28f5aef87a2072d8b601f5931363874ccba70a8aa0a81afd748434a1822868e38917217ee56e79b74c0c +Size (sc-7.16_1.0.1.tar.gz) = 214534 bytes +SHA1 (patch-Makefile) = fd3dc25eeb413ff6cc4b5a1edbbbaf332e571814 diff --git a/math/sc/patches/patch-Makefile b/math/sc/patches/patch-Makefile new file mode 100644 index 0000000000000..0ededc6238a65 --- /dev/null +++ b/math/sc/patches/patch-Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-Makefile,v 1.1 2016/03/24 10:53:17 youri Exp $ + +Install doc file in share instead of lib + +--- Makefile.in.orig 2016-03-23 17:51:29.000000000 +0100 ++++ Makefile.in 2016-03-24 11:04:24.197693519 +0100 +@@ -32,7 +32,7 @@ + + # This is where the library file (tutorial) goes. + #LIBDIR=/usr/local/share/$(name) # reno +-LIBDIR=${prefix}/lib/$(name) ++LIBDIR=${prefix}/share/$(name) + LIBRARY=-DLIBDIR=\"${LIBDIR}\" + + # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up From 60721a060a32bdc98d9a4e416cd46727d1cc7acc Mon Sep 17 00:00:00 2001 From: youri Date: Thu, 24 Mar 2016 10:54:44 +0000 Subject: [PATCH 0398/2457] Update math/sc to 7.16, thanks Carten Kunze! --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 1d55da247ae4c..20015d8b00275 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1276 2016/03/24 03:33:36 ryoon Exp $ +$NetBSD: CHANGES-2016,v 1.1277 2016/03/24 10:54:44 youri Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1675,3 +1675,4 @@ Changes to the packages collection and infrastructure in 2016: Added emulators/shoebill version 0.0.5 [hauke 2016-03-23] Updated mail/thunderbird-enigmail to 1.9.1nb1 [ryoon 2016-03-24] Updated mail/seamonkey-enigmail to 1.9.1nb1 [ryoon 2016-03-24] + Updated math/sc to 7.16 [youri 2016-03-24] From 97489080ef4ae0563315a91d082c71f8349de74a Mon Sep 17 00:00:00 2001 From: youri Date: Thu, 24 Mar 2016 10:56:20 +0000 Subject: [PATCH 0399/2457] Remove unneeded patch files. --- math/sc/patches/patch-aa | 206 ------------------------------------- math/sc/patches/patch-ab | 18 ---- math/sc/patches/patch-ac | 55 ---------- math/sc/patches/patch-ad | 40 ------- math/sc/patches/patch-sc.h | 15 --- 5 files changed, 334 deletions(-) delete mode 100644 math/sc/patches/patch-aa delete mode 100644 math/sc/patches/patch-ab delete mode 100644 math/sc/patches/patch-ac delete mode 100644 math/sc/patches/patch-ad delete mode 100644 math/sc/patches/patch-sc.h diff --git a/math/sc/patches/patch-aa b/math/sc/patches/patch-aa deleted file mode 100644 index 8d678ebfd6525..0000000000000 --- a/math/sc/patches/patch-aa +++ /dev/null @@ -1,206 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2009/12/12 20:22:01 asau Exp $ - ---- Makefile.orig 1992-05-11 22:43:33.000000000 +0400 -+++ Makefile 2009-12-12 23:19:38.000000000 +0300 -@@ -18,18 +18,18 @@ - - # This is where the install step puts it. - #EXDIR=/site/bin --EXDIR=/usr/local/bin -+EXDIR=${PREFIX}/bin - - # This is where the man page goes. --#MANDIR=/usr/local/src/man/man1 # reno --#MANEXT=1 # reno --MANDIR=/usr/man/manl --MANEXT=l -+MANDIR=${PREFIX}/man/man1 # reno -+MANEXT=1 # reno -+#MANDIR=/usr/man/manl -+#MANEXT=l - MANMODE=644 - - # This is where the library file (tutorial) goes. - #LIBDIR=/usr/local/share/$(name) # reno --LIBDIR=/usr/local/lib/$(name) -+LIBDIR=${PREFIX}/share/$(name) - - # Set SIMPLE for lex.c if you don't want arrow keys or lex.c blows up - SIMPLE= -@@ -47,8 +47,8 @@ - - # Set INTERNATIONAL if you need 8 bit characters. You should - # not set this if you are running 5.3.0. I think it is OK in 5.3.1. --#INTERNATIONAL=-DINTERNATIONAL --INTERNATIONAL= -+INTERNATIONAL=-DINTERNATIONAL -+#INTERNATIONAL= - - # Set SIGVOID if signal routines are type void. - # use: SIGVOID=-DSIGVOID for: -@@ -67,30 +67,30 @@ - # Set RINT= on/with (they have rint): - # SunOS 4.0.3c compiler - # BSD4.4 (reno) --#RINT= --RINT=-DRINT -+RINT= -+#RINT=-DRINT - - # Set RE_COMP if you have the re_comp/re_exec regular expression routines - # (most BSD based systems do). --#RE_COMP=-DRE_COMP --RE_COMP= -+RE_COMP=-DRE_COMP -+#RE_COMP= - - # Set REGCMP if you have the regcmp/regex regular expression routines - # (most System V based systems do) --REGCMP=-DREGCMP -+#REGCMP=-DREGCMP - #REGCMP= - - # This is the name of a pager like "more". - # "pg" may be appropriate for SYSV. --DFLT_PAGER=-DDFLT_PAGER=\"less\" --#DFLT_PAGER=-DDFLT_PAGER=\"more\" # generic && reno -+#DFLT_PAGER=-DDFLT_PAGER=\"less\" -+DFLT_PAGER=-DDFLT_PAGER=\"more\" # generic && reno - - # this is the name to save back ups in - SAVE=-DSAVENAME=\"$(NAME).SAVE\" - - # path to crypt, do not define if you don't have crypt - # most systems --CRYPT=-DCRYPT_PATH=\"/bin/crypt\" -+#CRYPT=-DCRYPT_PATH=\"/bin/crypt\" - # BSD - #CRYPT=-DCRYPT_PATH=\"/usr/bin/crypt\" - # other people? -@@ -133,8 +133,8 @@ - # noticing the rows become 2, 3, 40, 41, 42... (etc). - # Known systems/terminfos w/ curses problems: - # {Esix Rev. D+, AT&T SysV3.2.1}:at386-m,xterm, HP-UX7.0:(not sure) --IDLOKISBAD=-DIDLOKBAD --#IDLOKISBAD= -+#IDLOKISBAD=-DIDLOKBAD -+IDLOKISBAD= - - # If you don't have idlok() in your curses define NOIDLOK - NO_IDLOK= -@@ -149,17 +149,17 @@ - # IF you have problems w/ your yacc try bison, Berkeley yacc, or - # some other yacc. Some systems don't allow you to - # increase the number of terminals (mostly AT&T), SCO's does though. --#YACC=yacc -+YACC=yacc - # NOTE: Do not use with bison 1.16! Get a new version.... --YACC=bison -y -+#YACC=bison -y - - # MS-DOS needs y_tab instead of the normal y.tab - #YTAB=y_tab - YTAB=y.tab - - # Command to use to make temporary copies of some source files. --LN=ln --#LN=ln -s -+#LN=ln -+LN=ln -s - #LN=cp - - #### SYSTEM DEFINES #### -@@ -178,11 +178,11 @@ - #CFLAGS= -DSYSV2 -g -pipe -traditional - - # Use this for system V.3 --CFLAGS= -DSYSV3 -O --LDFLAGS= -s -+#CFLAGS= -O -DSYSV3 -+#LDFLAGS= -s - #CFLAGS= -DSYSV3 -g - #LDFLAGS= -g --LIB=-lm -lcurses -lPW -+LIB= - # with gcc also use: - #CC=gcc - #CFLAGS= -DSYSV3 -O -pipe -traditional -@@ -221,9 +221,9 @@ - #CFLAGS= -O -DBSD42 -pipe - - # Use this for BSD 4.3 --#CFLAGS= -O -DBSD43 -+CFLAGS += -DBSD43 - #LDFLAGS= --#LIB=-lm -lcurses -ltermcap -+LIB=-lm -lcurses -ltermcap -lcompat - - # Use this for SunOS 4.X if you have the System V package installed. - # This will link with the System V curses which is preferable to the -@@ -440,36 +440,36 @@ - p$(name).man: p$(name).1 - nroff -man p$(name).1 > p$(name).man - --install: $(EXDIR)/$(name) $(EXDIR)/$(name)qref $(EXDIR)/p$(name) \ -- $(LIBDIR)/tutorial \ -- $(MANDIR)/$(name).$(MANEXT) $(MANDIR)/p$(name).$(MANEXT) -- --$(EXDIR)/$(name): $(name) -- cp $(name) $(EXDIR) -- strip $(EXDIR)/$(name) -- --$(EXDIR)/$(name)qref: $(name)qref -- cp $(name)qref $(EXDIR) -- strip $(EXDIR)/$(name)qref -- --$(EXDIR)/p$(name): p$(name) -- cp p$(name) $(EXDIR) -- strip $(EXDIR)/p$(name) -- --$(LIBDIR)/tutorial: tutorial.sc $(LIBDIR) -- cp tutorial.sc $(LIBDIR)/tutorial.$(name) -- chmod $(MANMODE) $(LIBDIR)/tutorial.$(name) -- --$(LIBDIR): -- mkdir $(LIBDIR) -- --$(MANDIR)/$(name).$(MANEXT): $(name).1 -- cp $(name).1 $(MANDIR)/$(name).$(MANEXT) -- chmod $(MANMODE) $(MANDIR)/$(name).$(MANEXT) -- --$(MANDIR)/p$(name).$(MANEXT): p$(name).1 -- cp p$(name).1 $(MANDIR)/p$(name).$(MANEXT) -- chmod $(MANMODE) $(MANDIR)/p$(name).$(MANEXT) -+install: $(DESTDIR)$(EXDIR)/$(name) $(DESTDIR)$(EXDIR)/$(name)qref $(DESTDIR)$(EXDIR)/p$(name) \ -+ $(DESTDIR)$(LIBDIR)/tutorial \ -+ $(DESTDIR)$(MANDIR)/$(name).$(MANEXT) $(DESTDIR)$(MANDIR)/p$(name).$(MANEXT) -+ -+$(DESTDIR)$(EXDIR)/$(name): $(name) -+ cp $(name) $(DESTDIR)$(EXDIR) -+ strip $(DESTDIR)$(EXDIR)/$(name) -+ -+$(DESTDIR)$(EXDIR)/$(name)qref: $(name)qref -+ cp $(name)qref $(DESTDIR)$(EXDIR) -+ strip $(DESTDIR)$(EXDIR)/$(name)qref -+ -+$(DESTDIR)$(EXDIR)/p$(name): p$(name) -+ cp p$(name) $(DESTDIR)$(EXDIR) -+ strip $(DESTDIR)$(EXDIR)/p$(name) -+ -+$(DESTDIR)$(LIBDIR)/tutorial: tutorial.sc $(DESTDIR)$(LIBDIR) -+ cp tutorial.sc $(DESTDIR)$(LIBDIR)/tutorial.$(name) -+ chmod $(MANMODE) $(DESTDIR)$(LIBDIR)/tutorial.$(name) -+ -+$(DESTDIR)$(LIBDIR): -+ mkdir $(DESTDIR)$(LIBDIR) -+ -+$(DESTDIR)$(MANDIR)/$(name).$(MANEXT): $(name).1 -+ cp $(name).1 $(DESTDIR)$(MANDIR)/$(name).$(MANEXT) -+ chmod $(MANMODE) $(DESTDIR)$(MANDIR)/$(name).$(MANEXT) -+ -+$(DESTDIR)$(MANDIR)/p$(name).$(MANEXT): p$(name).1 -+ cp p$(name).1 $(DESTDIR)$(MANDIR)/p$(name).$(MANEXT) -+ chmod $(MANMODE) $(DESTDIR)$(MANDIR)/p$(name).$(MANEXT) - - diffs: ${SRC} - for i in ${DOCS} ${SRC} ;\ diff --git a/math/sc/patches/patch-ab b/math/sc/patches/patch-ab deleted file mode 100644 index f63ef2ebab1b2..0000000000000 --- a/math/sc/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2000/01/12 20:30:34 wiz Exp $ - ---- lex.c.orig Mon May 11 20:43:36 1992 -+++ lex.c Thu Jul 30 20:26:51 1998 -@@ -384,11 +384,11 @@ - ctl('z'), 0 - }; - --void -+int - charout(c) - int c; - { -- (void)putchar(c); -+ return putchar(c); - } - - void diff --git a/math/sc/patches/patch-ac b/math/sc/patches/patch-ac deleted file mode 100644 index 34b2731271583..0000000000000 --- a/math/sc/patches/patch-ac +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2006/12/11 14:52:04 obache Exp $ - ---- interp.c.orig 1992-05-11 18:43:36.000000000 +0000 -+++ interp.c -@@ -21,13 +21,13 @@ - #include - #endif /* IEEE_MATH */ - -+#include - #include - #include - #include - #include - #include - --extern int errno; /* set by math functions */ - #ifdef BSD42 - #include - #include -@@ -476,7 +476,7 @@ double - dodts(mo, day, yr) - int mo, day, yr; - { -- long trial; -+ time_t trial; - register struct tm *tp; - register int i; - register long jdate; -@@ -484,7 +484,7 @@ int mo, day, yr; - mdays[1] = 28 + (yr%4 == 0); - - if (mo < 1 || mo > 12 || day < 1 || day > mdays[--mo] || -- yr > 1999 || yr < 1970) { -+ yr > 2035 || yr < 1970) { - error("@dts: invalid argument"); - cellerror = CELLERROR; - return(0.0); -@@ -551,15 +551,13 @@ dotime(which, when) - int which; - double when; - { -- long time(); -- - static long t_cache; - static struct tm tm_cache; - struct tm *tp; -- long tloc; -+ time_t tloc; - - if (which == NOW) -- return (double)time((long *)0); -+ return (double)time(NULL); - - tloc = (long)when; - diff --git a/math/sc/patches/patch-ad b/math/sc/patches/patch-ad deleted file mode 100644 index 014fac1d58ef9..0000000000000 --- a/math/sc/patches/patch-ad +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2006/09/29 15:55:27 he Exp $ - ---- cmds.c.orig 1992-05-11 20:43:34.000000000 +0200 -+++ cmds.c -@@ -28,6 +28,7 @@ - #include "sc.h" - #include - #include -+#include - - #ifdef SYSV3 - extern void exit(); -@@ -39,8 +40,6 @@ void openrow(); - void syncref(); - void unspecial(); - --extern int errno; -- - /* a linked list of free [struct ent]'s, uses .next as the pointer */ - extern struct ent *freeents; - -@@ -700,12 +699,18 @@ int r0, c0, rn, cn; - int fieldlen, nextcol; - register row, col; - register struct ent **pp; -+ char fnbuf[PATH_MAX]; - - if ((strcmp(fname, curfile) == 0) && - !yn_ask("Confirm that you want to destroy the data base: (y,n)")) { - return; - } - -+ if (*fname == '\0') { -+ snprintf(fnbuf, sizeof fnbuf, "%s.asc", curfile); -+ fname = fnbuf; -+ } -+ - if (!pline && (pline = scxmalloc((unsigned)(FBUFLEN * - ++fbufs_allocated))) == (char *)NULL) - { error("Malloc failed in printfile()"); diff --git a/math/sc/patches/patch-sc.h b/math/sc/patches/patch-sc.h deleted file mode 100644 index 0f54b65d361d1..0000000000000 --- a/math/sc/patches/patch-sc.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-sc.h,v 1.1 2015/01/09 14:30:22 joerg Exp $ - ---- sc.h.orig 2015-01-09 12:50:27.000000000 +0000 -+++ sc.h -@@ -418,9 +418,4 @@ extern int collimit; - - #endif - --#if defined(BSD42) || defined(BSD43) && !defined(ultrix) --#define memcpy(dest, source, len) bcopy(source, dest, (unsigned int)len); --#define memset(dest, zero, len) bzero((dest), (unsigned int)(len)); --#else --#include --#endif -+#include From 81507d168234de23dc697a30fc6e22a64c7c106d Mon Sep 17 00:00:00 2001 From: ryoon Date: Thu, 24 Mar 2016 13:28:49 +0000 Subject: [PATCH 0400/2457] Fix clang build under FreeBSD 10.2 Do not detect the compiler as GCC. --- devel/ncurses/Makefile.common | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common index ca484a3973365..2fc8e0a796ca8 100644 --- a/devel/ncurses/Makefile.common +++ b/devel/ncurses/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2016/02/25 12:12:48 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.33 2016/03/24 13:28:49 ryoon Exp $ # # used by devel/ncurses/Makefile # used by devel/ncursesw/Makefile @@ -61,6 +61,12 @@ CONFIGURE_ARGS+= --without-manpage-tbl .include "../../mk/compiler.mk" +# Fix build under FreeBSD 10.2 +.if !empty(PKGSRC_COMPILER:Mclang) +CONFIGURE_ENV+= ac_cv_c_compiler_gnu=no +CONFIGURE_ENV+= ac_cv_cxx_compiler_gnu=no +.endif + .if ${OPSYS} == "SunOS" CONFIGURE_ARGS+= --disable-const TERMINFO_SRC= ${WRKSRC}/misc/terminfo.src From f2bb0d36764d3f1ba40f0e6347bc5007f91da017 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 24 Mar 2016 13:36:52 +0000 Subject: [PATCH 0401/2457] If MIN() is undefined, just define one instead of including utility.h on SunOS, which presumes a version of eti.h that has some extras over what is provided in ncurses/eti.h, causing unnecessary build errors. --- net/vino/distinfo | 3 ++- .../patches/patch-server_miniupnp_miniwget.c | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 net/vino/patches/patch-server_miniupnp_miniwget.c diff --git a/net/vino/distinfo b/net/vino/distinfo index 32dc00c97a3a9..d9a3611842906 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2015/11/04 00:35:43 agc Exp $ +$NetBSD: distinfo,v 1.14 2016/03/24 13:36:52 richard Exp $ SHA1 (vino-2.32.2.tar.bz2) = e457d1c5705607c3cd18b7e6fbb8776b7483c733 RMD160 (vino-2.32.2.tar.bz2) = 1de0923ef33a73dd6a9c4e761291728c552708e8 @@ -7,3 +7,4 @@ Size (vino-2.32.2.tar.bz2) = 856440 bytes SHA1 (patch-aa) = d240f809769fee144ce0a6057327107ade82ef6c SHA1 (patch-ab) = 0c09812fc98bced9938a0460305c7dbcbed40ad3 SHA1 (patch-ad) = 0e1b226e8c5ac5f9e3d3c7270b9a19a2314ef737 +SHA1 (patch-server_miniupnp_miniwget.c) = 6612c1a16d955c0e60546209d0e2f47546a976ff diff --git a/net/vino/patches/patch-server_miniupnp_miniwget.c b/net/vino/patches/patch-server_miniupnp_miniwget.c new file mode 100644 index 0000000000000..49ad54ffc520f --- /dev/null +++ b/net/vino/patches/patch-server_miniupnp_miniwget.c @@ -0,0 +1,20 @@ +$NetBSD: patch-server_miniupnp_miniwget.c,v 1.1 2016/03/24 13:36:52 richard Exp $ + +If MIN() is undefined, just define one instead of including utility.h +on SunOS, which presumes a version of eti.h that has some extras over +what is provided in ncurses/eti.h, causing unnecessary build errors. + +--- server/miniupnp/miniwget.c.orig 2011-02-23 20:29:05.000000000 +0000 ++++ server/miniupnp/miniwget.c +@@ -26,9 +26,8 @@ + #include + #define closesocket close + #endif +-/* for MIN() macro : */ +-#if defined(__sun) || defined(sun) +-#include ++#ifndef MIN ++#define MIN(x, y) ((x) < (y) ? (x) : (y)) + #endif + + /* miniwget2() : From d5753d9bae3815a044e3e9033734ae7fd086a1d6 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 24 Mar 2016 13:45:57 +0000 Subject: [PATCH 0402/2457] Update py-rsa to 3.4. Fixes a security vulnerability. No proper changelog found, which I find even more astonishing for security software... --- security/py-rsa/Makefile | 4 ++-- security/py-rsa/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile index 7480440a703a4..091e5037b8ad3 100644 --- a/security/py-rsa/Makefile +++ b/security/py-rsa/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2016/01/05 10:26:43 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/24 13:45:57 wiz Exp $ -DISTNAME= rsa-3.2.3 +DISTNAME= rsa-3.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= security python MASTER_SITES= ${MASTER_SITE_PYPI:=r/rsa/} diff --git a/security/py-rsa/distinfo b/security/py-rsa/distinfo index 6725a6964ab99..dc395dea01c51 100644 --- a/security/py-rsa/distinfo +++ b/security/py-rsa/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2016/01/05 10:26:43 wiz Exp $ +$NetBSD: distinfo,v 1.4 2016/03/24 13:45:57 wiz Exp $ -SHA1 (rsa-3.2.3.tar.gz) = 4ef92bff4214c399dffae3226f7e9b5fc31b8ce5 -RMD160 (rsa-3.2.3.tar.gz) = a03442820487566d8a246e079dd07dc7536ea7c7 -SHA512 (rsa-3.2.3.tar.gz) = 52b33e0278e6e1fed64b1cdebed29f7caa31fae733c2d5875e6cba5a045aaa829616799d8de84fdb63c546780dbdafcabf1f85f25930b8e663861151479ef7e2 -Size (rsa-3.2.3.tar.gz) = 35628 bytes +SHA1 (rsa-3.4.tar.gz) = dd16725179354d21307ebc251b23382b77b711c1 +RMD160 (rsa-3.4.tar.gz) = 9466ecc5fcccc1e6e464a1cef40ef58e1862a6b9 +SHA512 (rsa-3.4.tar.gz) = 7f24736704981b9a1c380f8650640fb102de6db98910bb452f72d14feefef4dbcb2811c100abb8db70f5eea0f9770a17aeda609f955db3118ffcfd38d62c7753 +Size (rsa-3.4.tar.gz) = 36186 bytes From d8f9d6c8c4ba9fc4b37b23277a5e9b6e4ff8f309 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 24 Mar 2016 13:46:07 +0000 Subject: [PATCH 0403/2457] Updated security/py-rsa to 3.4 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index 20015d8b00275..cdb109c26a4fe 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1277 2016/03/24 10:54:44 youri Exp $ +$NetBSD: CHANGES-2016,v 1.1278 2016/03/24 13:46:07 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1676,3 +1676,4 @@ Changes to the packages collection and infrastructure in 2016: Updated mail/thunderbird-enigmail to 1.9.1nb1 [ryoon 2016-03-24] Updated mail/seamonkey-enigmail to 1.9.1nb1 [ryoon 2016-03-24] Updated math/sc to 7.16 [youri 2016-03-24] + Updated security/py-rsa to 3.4 [wiz 2016-03-24] From 50f26715dc1548c8d4c2525b6311cb9693e5a348 Mon Sep 17 00:00:00 2001 From: khorben Date: Thu, 24 Mar 2016 15:21:10 +0000 Subject: [PATCH 0404/2457] Avoid a "bad substitution" error in the configure script This fixes building emulators/qemu on netbsd-7 (amd64). On a related note, it may also make sense to include security/nettle/buildlink3.mk to the build. --- emulators/qemu/distinfo | 4 ++-- emulators/qemu/patches/patch-configure | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 545846e4307bd..1930f7605fb03 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.113 2016/03/06 19:41:24 dbj Exp $ +$NetBSD: distinfo,v 1.114 2016/03/24 15:21:10 khorben Exp $ SHA1 (qemu-2.5.0.tar.bz2) = ed6c02a267f9edf98058743f0f76a25743a0dfe7 RMD160 (qemu-2.5.0.tar.bz2) = 51007a50ddbeae1ba2c986e0cb0b110efeae2dc9 SHA512 (qemu-2.5.0.tar.bz2) = 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 Size (qemu-2.5.0.tar.bz2) = 25464996 bytes SHA1 (patch-Makefile.objs) = 81274d0dde593a8379428df1f974d6c50a65dd92 -SHA1 (patch-configure) = c15a44d127d7bdd82285d0b81b710cef7ad81e83 +SHA1 (patch-configure) = 668aff0a22a5800993645a4b40899e7694803ee6 SHA1 (patch-default-configs_pci.mak) = 09567d0d56cdee3d72ae93c0609dee7ca749ef18 SHA1 (patch-ef) = 6e57de87f91067e8a9a1388c91133a31b3582b3a SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50 diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure index ea02a62e7f715..e711bddb01f70 100644 --- a/emulators/qemu/patches/patch-configure +++ b/emulators/qemu/patches/patch-configure @@ -1,7 +1,8 @@ -$NetBSD: patch-configure,v 1.11 2016/03/06 19:41:24 dbj Exp $ +$NetBSD: patch-configure,v 1.12 2016/03/24 15:21:10 khorben Exp $ Don't use gld on SunOS add check for shm_open +avoid bad substitution --- configure.orig 2015-12-16 22:04:48.000000000 +0000 +++ configure @@ -66,6 +67,15 @@ add check for shm_open fi fi if test "$softmmu" = yes ; then +@@ -4758,7 +4785,7 @@ echo "GTK GL support $gtk_gl" + echo "GNUTLS support $gnutls" + echo "GNUTLS hash $gnutls_hash" + echo "libgcrypt $gcrypt" +-echo "nettle $nettle ${nettle+($nettle_version)}" ++echo "nettle $nettle ($nettle_version)" + echo "libtasn1 $tasn1" + echo "VTE support $vte" + echo "curses support $curses" @@ -5049,6 +5076,9 @@ fi if test "$fallocate_zero_range" = "yes" ; then echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak From a262b4186288d996abe9d1d53fededcd3e3905fb Mon Sep 17 00:00:00 2001 From: taca Date: Thu, 24 Mar 2016 16:28:59 +0000 Subject: [PATCH 0405/2457] Try to fix build error by recent OpenSSL change on NetBSD, reported as PR pkg/50971. --- lang/ruby18-base/distinfo | 4 +- lang/ruby18-base/patches/patch-dq | 41 +++++++++++-------- lang/ruby21-base/distinfo | 3 +- .../patches/patch-ext_openssl_ossl__ssl.c | 15 +++++++ lang/ruby22-base/distinfo | 3 +- .../patches/patch-ext_openssl_ossl__ssl.c | 15 +++++++ lang/ruby23-base/distinfo | 3 +- .../patches/patch-ext_openssl_ossl__ssl.c | 15 +++++++ 8 files changed, 76 insertions(+), 23 deletions(-) create mode 100644 lang/ruby21-base/patches/patch-ext_openssl_ossl__ssl.c create mode 100644 lang/ruby22-base/patches/patch-ext_openssl_ossl__ssl.c create mode 100644 lang/ruby23-base/patches/patch-ext_openssl_ossl__ssl.c diff --git a/lang/ruby18-base/distinfo b/lang/ruby18-base/distinfo index c32fc7bf0acf4..77053b6a1abc2 100644 --- a/lang/ruby18-base/distinfo +++ b/lang/ruby18-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.64 2016/02/22 12:53:32 jperkin Exp $ +$NetBSD: distinfo,v 1.65 2016/03/24 16:30:11 taca Exp $ SHA1 (ruby-1.8.7-p374.tar.bz2) = cf82b6cbeed8e389705aa6b66c2a8141626705c3 RMD160 (ruby-1.8.7-p374.tar.bz2) = 314efaa961c80c9294202c6e40dec0e38865ed94 @@ -18,7 +18,7 @@ SHA1 (patch-dl) = 0a5010f57e0f21170530fd4f940e66608c6d9630 SHA1 (patch-dn) = 3cd429fcd4f48ad0ab784058a4ac8672f6ae17db SHA1 (patch-do) = d2b190074647a591106797922e2ec907f6b3efde SHA1 (patch-dp) = ebdc27a84c24d3373769250bf4b7052058f89d9b -SHA1 (patch-dq) = 24f4f2785d939559e85e5a42638092eea935e324 +SHA1 (patch-dq) = 00ea4682b13ce3689def163c8ccda8a597a280fb SHA1 (patch-dr) = ed734e802f2d1cb59c2b49952d646849c9226d1e SHA1 (patch-ds) = e60434cb299d070289a3c80765187e4058a65f99 SHA1 (patch-dt) = 59c09f6ea19cc02a1d8ca92a99eed7f8c30a5f10 diff --git a/lang/ruby18-base/patches/patch-dq b/lang/ruby18-base/patches/patch-dq index 4210a0763fa0e..36d7094f97f85 100644 --- a/lang/ruby18-base/patches/patch-dq +++ b/lang/ruby18-base/patches/patch-dq @@ -1,4 +1,4 @@ -$NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ +$NetBSD: patch-dq,v 1.4 2016/03/24 16:30:11 taca Exp $ * r18172: suppress warnings. * r20494: (ossl_ssl_read_nonblock): OpenSSL::SSL::SSLSocket should implement @@ -11,7 +11,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ * Constify (some cases are depends on OpenSSL's version). * Only enable SSLv3 methods if library provides support. ---- ext/openssl/ossl_ssl.c.orig Wed Feb 8 06:09:40 2012 +--- ext/openssl/ossl_ssl.c.orig 2012-02-08 06:09:40.000000000 +0000 +++ ext/openssl/ossl_ssl.c @@ -26,6 +26,12 @@ # define TO_SOCKET(s) s @@ -26,7 +26,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ VALUE mSSL; VALUE eSSLError; VALUE cSSLContext; -@@ -69,6 +75,9 @@ static const char *ossl_sslctx_attrs[] = { +@@ -69,6 +75,9 @@ static const char *ossl_sslctx_attrs[] = "verify_callback", "options", "cert_store", "extra_chain_cert", "client_cert_cb", "tmp_dh_callback", "session_id_context", "session_get_cb", "session_new_cb", "session_remove_cb", @@ -36,7 +36,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ }; #define ossl_ssl_get_io(o) rb_iv_get((o),"@io") -@@ -86,7 +95,12 @@ static const char *ossl_sslctx_attrs[] = { +@@ -86,7 +95,12 @@ static const char *ossl_sslctx_attrs[] = #define ossl_ssl_set_tmp_dh(o,v) rb_iv_set((o),"@tmp_dh",(v)) static const char *ossl_ssl_attr_readers[] = { "io", "context", }; @@ -50,7 +50,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ ID ID_callback_state; -@@ -95,7 +109,7 @@ ID ID_callback_state; +@@ -95,21 +109,24 @@ ID ID_callback_state; */ struct { const char *name; @@ -59,7 +59,12 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ } ossl_ssl_method_tab[] = { #define OSSL_SSL_METHOD_ENTRY(name) { #name, name##_method } OSSL_SSL_METHOD_ENTRY(TLSv1), -@@ -107,9 +121,12 @@ struct { + OSSL_SSL_METHOD_ENTRY(TLSv1_server), + OSSL_SSL_METHOD_ENTRY(TLSv1_client), +-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ ++#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ + defined(HAVE_SSLV2_CLIENT_METHOD) + OSSL_SSL_METHOD_ENTRY(SSLv2), OSSL_SSL_METHOD_ENTRY(SSLv2_server), OSSL_SSL_METHOD_ENTRY(SSLv2_client), #endif @@ -81,7 +86,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ const char *s; int i; -@@ -299,7 +316,7 @@ ossl_ssl_verify_callback(int preverify_ok, X509_STORE_ +@@ -299,7 +316,7 @@ ossl_ssl_verify_callback(int preverify_o static VALUE ossl_call_session_get_cb(VALUE ary) { @@ -90,7 +95,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ Check_Type(ary, T_ARRAY); ssl_obj = rb_ary_entry(ary, 0); -@@ -327,7 +344,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *bu +@@ -327,7 +344,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, uns ssl_obj = (VALUE)ptr; ary = rb_ary_new2(2); rb_ary_push(ary, ssl_obj); @@ -99,7 +104,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ ret_obj = rb_protect((VALUE(*)_((VALUE)))ossl_call_session_get_cb, ary, &state); if (state) { -@@ -346,7 +363,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *bu +@@ -346,7 +363,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, uns static VALUE ossl_call_session_new_cb(VALUE ary) { @@ -108,7 +113,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ Check_Type(ary, T_ARRAY); ssl_obj = rb_ary_entry(ary, 0); -@@ -389,10 +406,11 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess +@@ -389,10 +406,11 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL return RTEST(ret_obj) ? 1 : 0; } @@ -129,7 +134,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ static void ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess) -@@ -448,6 +467,66 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE i, VALUE arg) +@@ -448,6 +467,66 @@ ossl_sslctx_add_extra_chain_cert_i(VALUE return i; } @@ -249,7 +254,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher)); } return ary; -@@ -821,7 +909,6 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALU +@@ -821,7 +909,6 @@ ossl_sslctx_flush_sessions(int argc, VAL VALUE arg1; SSL_CTX *ctx; time_t tm = 0; @@ -257,7 +262,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ rb_scan_args(argc, argv, "01", &arg1); -@@ -895,6 +982,8 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self) +@@ -895,6 +982,8 @@ ossl_ssl_initialize(int argc, VALUE *arg ossl_sslctx_setup(ctx); rb_call_super(0, 0); @@ -290,7 +295,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ io = ossl_ssl_get_io(self); GetOpenFile(io, fptr); rb_io_check_readable(fptr); -@@ -953,7 +1052,15 @@ ossl_start_ssl(VALUE self, int (*func)(), const char * +@@ -953,7 +1052,15 @@ ossl_start_ssl(VALUE self, int (*func)() Data_Get_Struct(self, SSL, ssl); GetOpenFile(ossl_ssl_get_io(self), fptr); for(;;){ @@ -307,7 +312,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ switch((ret2 = ssl_get_error(ssl, ret))){ case SSL_ERROR_WANT_WRITE: rb_io_wait_writable(FPTR_TO_FD(fptr)); -@@ -969,10 +1076,6 @@ ossl_start_ssl(VALUE self, int (*func)(), const char * +@@ -969,10 +1076,6 @@ ossl_start_ssl(VALUE self, int (*func)() } } @@ -391,7 +396,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ SSL *ssl; int ilen, nread = 0; VALUE len, str; -@@ -1027,12 +1196,11 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self) +@@ -1027,12 +1196,11 @@ ossl_ssl_read(int argc, VALUE *argv, VAL Data_Get_Struct(self, SSL, ssl); GetOpenFile(ossl_ssl_get_io(self), fptr); @@ -406,7 +411,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ case SSL_ERROR_NONE: goto end; case SSL_ERROR_ZERO_RETURN: -@@ -1041,7 +1209,7 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self) +@@ -1041,7 +1209,7 @@ ossl_ssl_read(int argc, VALUE *argv, VAL rb_io_wait_writable(FPTR_TO_FD(fptr)); continue; case SSL_ERROR_WANT_READ: @@ -415,7 +420,7 @@ $NetBSD: patch-dq,v 1.3 2015/10/14 18:33:08 sevan Exp $ continue; case SSL_ERROR_SYSCALL: if(ERR_peek_error() == 0 && nread == 0) rb_eof_error(); -@@ -1052,9 +1220,8 @@ ossl_ssl_read(int argc, VALUE *argv, VALUE self) +@@ -1052,9 +1220,8 @@ ossl_ssl_read(int argc, VALUE *argv, VAL } } else { diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo index 23d3e0dda0e17..682e30087dc5b 100644 --- a/lang/ruby21-base/distinfo +++ b/lang/ruby21-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.23 2015/12/16 16:03:12 taca Exp $ +$NetBSD: distinfo,v 1.24 2016/03/24 16:29:50 taca Exp $ SHA1 (ruby-2.1.8.tar.bz2) = 0284eaf42ac76a641abd5cd4b6bd933abeb9934e RMD160 (ruby-2.1.8.tar.bz2) = 3ab77f712adf6dfa270b9cebeab0863d31f5f694 @@ -8,6 +8,7 @@ SHA1 (patch-configure) = 7f1f6d2dc7d32c96d6ae65562a9bc6d50d2b79dd SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4 SHA1 (patch-ext_dbm_extconf.rb) = 08520edd956e17cb6cc80b6ee2c77af77a834bd2 +SHA1 (patch-ext_openssl_ossl__ssl.c) = d6aa1a2036597e7b51411d6eed9501f6a264c26c SHA1 (patch-ext_tk_lib_tk_autoload.rb) = e8bcb93feae90fd46531a412f6c963a6d5d2c132 SHA1 (patch-ext_tk_lib_tk_fontchooser.rb) = cb0155332e5f519ada386fae770cd2f879527323 SHA1 (patch-ext_tk_lib_tk_tk__mac.rb) = 24b9f282558200780adbf93e71edd1aa52d1c82b diff --git a/lang/ruby21-base/patches/patch-ext_openssl_ossl__ssl.c b/lang/ruby21-base/patches/patch-ext_openssl_ossl__ssl.c new file mode 100644 index 0000000000000..fd280282cefd8 --- /dev/null +++ b/lang/ruby21-base/patches/patch-ext_openssl_ossl__ssl.c @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_openssl_ossl__ssl.c,v 1.1 2016/03/24 16:29:50 taca Exp $ + +Utilize OPENSSL_NO_SSL2. + +--- ext/openssl/ossl_ssl.c.orig 2015-11-18 11:34:19.000000000 +0000 ++++ ext/openssl/ossl_ssl.c +@@ -128,7 +128,7 @@ struct { + OSSL_SSL_METHOD_ENTRY(TLSv1_1_server), + OSSL_SSL_METHOD_ENTRY(TLSv1_1_client), + #endif +-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ ++#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ + defined(HAVE_SSLV2_CLIENT_METHOD) + OSSL_SSL_METHOD_ENTRY(SSLv2), + OSSL_SSL_METHOD_ENTRY(SSLv2_server), diff --git a/lang/ruby22-base/distinfo b/lang/ruby22-base/distinfo index 7892933df7440..365d96b0c069e 100644 --- a/lang/ruby22-base/distinfo +++ b/lang/ruby22-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2016/03/17 07:53:46 wiz Exp $ +$NetBSD: distinfo,v 1.14 2016/03/24 16:28:59 taca Exp $ SHA1 (ruby-2.2.4.tar.bz2) = 6132840a859dbf2ac1498ba313021f299a870038 RMD160 (ruby-2.2.4.tar.bz2) = 012fa73d430db36e5b807cd677a961d6e2700758 @@ -8,6 +8,7 @@ SHA1 (patch-configure) = 8abbc486b8cf30bb789ef58d1cb289191dcd1af6 SHA1 (patch-eval.c) = a1e86d4ed1729398393e83d519e991259c6163de SHA1 (patch-eval__error.c) = cc313587bb24e16e4702f784b30e64618ae3f5a4 SHA1 (patch-ext_dbm_extconf.rb) = ee932265052613d458375ad1a760a09fefb9d959 +SHA1 (patch-ext_openssl_ossl__ssl.c) = e887a5576959921da116a5cee629c25610169593 SHA1 (patch-ext_socket_option.c) = 8759eabfe884a891fd6adab6921418a1ab56d21f SHA1 (patch-lib_mkmf.rb) = f86f1ae5a1053a0643545a2c11c9fd2bbd5a289d SHA1 (patch-lib_rdoc_ri_driver.rb) = 5bdd3ed6f50a2ea79f643c6bebd7ad0063e79051 diff --git a/lang/ruby22-base/patches/patch-ext_openssl_ossl__ssl.c b/lang/ruby22-base/patches/patch-ext_openssl_ossl__ssl.c new file mode 100644 index 0000000000000..297283ed52439 --- /dev/null +++ b/lang/ruby22-base/patches/patch-ext_openssl_ossl__ssl.c @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_openssl_ossl__ssl.c,v 1.1 2016/03/24 16:28:59 taca Exp $ + +Utilize OPENSSL_NO_SSL2. + +--- ext/openssl/ossl_ssl.c.orig 2015-11-27 21:24:30.000000000 +0000 ++++ ext/openssl/ossl_ssl.c +@@ -132,7 +132,7 @@ static const struct { + OSSL_SSL_METHOD_ENTRY(TLSv1_1_server), + OSSL_SSL_METHOD_ENTRY(TLSv1_1_client), + #endif +-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ ++#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ + defined(HAVE_SSLV2_CLIENT_METHOD) + OSSL_SSL_METHOD_ENTRY(SSLv2), + OSSL_SSL_METHOD_ENTRY(SSLv2_server), diff --git a/lang/ruby23-base/distinfo b/lang/ruby23-base/distinfo index 00e882dec5c5c..667e6527c7603 100644 --- a/lang/ruby23-base/distinfo +++ b/lang/ruby23-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2016/03/17 07:55:43 wiz Exp $ +$NetBSD: distinfo,v 1.3 2016/03/24 16:29:24 taca Exp $ SHA1 (ruby-2.3.0.tar.bz2) = 6c8a832d49d22755ea8c45b6d53faf2ccc6d6ac9 RMD160 (ruby-2.3.0.tar.bz2) = 4e9066b169b1b00435ba154069416e14457fe22e @@ -8,6 +8,7 @@ SHA1 (patch-configure) = ccddb80f90f75a09dc7d802d1ddad6255ba13ffa SHA1 (patch-eval.c) = 16e6eadca15c95ac3e2291a2003cb0fc606eafeb SHA1 (patch-eval__error.c) = 8ed04dec5c3c0bf4d9ca8516888b331676f7c957 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b +SHA1 (patch-ext_openssl_ossl__ssl.c) = 24e794aae278da6204e29212d9e2add0b0119ea4 SHA1 (patch-ext_socket_option.c) = 210753a7db6ab7b8c459765f1ec656948da86e28 SHA1 (patch-lib_mkmf.rb) = d01302bac014ec1d72bbf19df64bc2c93c07ec5e SHA1 (patch-lib_rdoc_ri_driver.rb) = bdbe04aa1dd1719d901233b16bcb318172a42b6c diff --git a/lang/ruby23-base/patches/patch-ext_openssl_ossl__ssl.c b/lang/ruby23-base/patches/patch-ext_openssl_ossl__ssl.c new file mode 100644 index 0000000000000..9d1c8fbb3ba3a --- /dev/null +++ b/lang/ruby23-base/patches/patch-ext_openssl_ossl__ssl.c @@ -0,0 +1,15 @@ +$NetBSD: patch-ext_openssl_ossl__ssl.c,v 1.1 2016/03/24 16:29:24 taca Exp $ + +Utilize OPENSSL_NO_SSL2. + +--- ext/openssl/ossl_ssl.c.orig 2015-12-13 01:29:44.000000000 +0000 ++++ ext/openssl/ossl_ssl.c +@@ -102,7 +102,7 @@ static const struct { + OSSL_SSL_METHOD_ENTRY(TLSv1_1_server), + OSSL_SSL_METHOD_ENTRY(TLSv1_1_client), + #endif +-#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ ++#if !defined(OPENSSL_NO_SSL2) && defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \ + defined(HAVE_SSLV2_CLIENT_METHOD) + OSSL_SSL_METHOD_ENTRY(SSLv2), + OSSL_SSL_METHOD_ENTRY(SSLv2_server), From 2407d63cbb877ddfcc27c3efbe7bca8e8cb1870e Mon Sep 17 00:00:00 2001 From: khorben Date: Thu, 24 Mar 2016 16:46:04 +0000 Subject: [PATCH 0406/2457] Register missing dependency on curses Found with an unprivileged bootstrap on NetBSD/amd64 (--prefer-pkgsrc yes) --- mail/balsa/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index cac83da76d335..babf8103c44e2 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.119 2016/03/05 11:28:45 jperkin Exp $ +# $NetBSD: Makefile,v 1.120 2016/03/24 16:46:04 khorben Exp $ DISTNAME= balsa-2.4.14 PKGREVISION= 16 @@ -40,6 +40,7 @@ CONF_FILES= ${EGDIR}/balsa.soundlist ${PKG_SYSCONFDIR}/sound/events/balsa.soundl .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mail/gmime24/buildlink3.mk" .include "../../mail/libesmtp/buildlink3.mk" +.include "../../mk/curses.buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../security/gpgme/buildlink3.mk" .include "../../sysutils/libnotify/buildlink3.mk" From eb8956a14ea8820af186d42709b94c8d16448ede Mon Sep 17 00:00:00 2001 From: tnn Date: Thu, 24 Mar 2016 17:05:04 +0000 Subject: [PATCH 0407/2457] Update to yEd-3.15.0.2 since yEd-3.15.0.1 is now unfetchable. (sigh ...) --- editors/yed/Makefile | 4 ++-- editors/yed/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/editors/yed/Makefile b/editors/yed/Makefile index c89a16a45adb9..9e34876ef5659 100644 --- a/editors/yed/Makefile +++ b/editors/yed/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2016/03/23 14:58:10 tnn Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/24 17:05:04 tnn Exp $ -DISTNAME= yEd-3.15.0.1 +DISTNAME= yEd-3.15.0.2 PKGNAME= ${DISTNAME:C:E:e:} CATEGORIES= editors MASTER_SITES= http://www.yworks.com/products/yed/demo/ diff --git a/editors/yed/distinfo b/editors/yed/distinfo index 9eb198c8fbbb8..87a3fe48441dd 100644 --- a/editors/yed/distinfo +++ b/editors/yed/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2016/03/23 14:58:10 tnn Exp $ +$NetBSD: distinfo,v 1.4 2016/03/24 17:05:04 tnn Exp $ -SHA1 (yEd-3.15.0.1.zip) = e41932d69e737f02908572d8bca32977790e50ff -RMD160 (yEd-3.15.0.1.zip) = 48a8dcfee8832523e82ccd0c2743238f6a80730a -SHA512 (yEd-3.15.0.1.zip) = f7ba4d4c24335578e41ddb1fb663c21be7d2ff6d8813460dfb716f92f062e68692d588288800646f13250bd7493221a5e52dde96d3ff1f88cbe4bb8ad90976d7 -Size (yEd-3.15.0.1.zip) = 29747674 bytes +SHA1 (yEd-3.15.0.2.zip) = c53097177c1f81d6d7bc74d9727556e562244468 +RMD160 (yEd-3.15.0.2.zip) = 69839f8718f2780ef74514c2e88c1e9d14e90979 +SHA512 (yEd-3.15.0.2.zip) = 534efaad0393c5173ab1a7ca6ad5d6f93390aef5caa47e1aa3499d6e4f6db19b9b576323835d726e0d882022f84ad62cc99124bef3b595ec848f54d6e4dbaff4 +Size (yEd-3.15.0.2.zip) = 29762976 bytes From 1b9c726a3f97a77816b23c331947d567faef61b2 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 24 Mar 2016 20:31:02 +0000 Subject: [PATCH 0408/2457] Update graphite2 to 1.3.7, provided by coypu in wip. Security update. Changelog doesn't mention them though?! 1.3.7 . Bug fixes . Start to deprecate SegCache. This will be going away in a later release. 1.3.6 . Bug fixes --- graphics/graphite2/Makefile | 4 ++-- graphics/graphite2/distinfo | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/graphite2/Makefile b/graphics/graphite2/Makefile index 1f041703f6559..026e85ea833a5 100644 --- a/graphics/graphite2/Makefile +++ b/graphics/graphite2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2016/01/26 13:56:23 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/24 20:31:02 wiz Exp $ -DISTNAME= graphite2-1.3.5 +DISTNAME= graphite2-1.3.7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=silgraphite/} EXTRACT_SUFX= .tgz diff --git a/graphics/graphite2/distinfo b/graphics/graphite2/distinfo index 4ac441e9905b3..4e7303630e433 100644 --- a/graphics/graphite2/distinfo +++ b/graphics/graphite2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2016/02/07 01:05:11 ryoon Exp $ +$NetBSD: distinfo,v 1.7 2016/03/24 20:31:02 wiz Exp $ -SHA1 (graphite2-1.3.5.tgz) = 044f65d5b4ade3169f5fcd75a25f047c81f5d33e -RMD160 (graphite2-1.3.5.tgz) = 49c0c9d919a23ab215402d082670083b7cfba61e -SHA512 (graphite2-1.3.5.tgz) = 70e85ff44d63dcca6beb55aa68966888453610c4ec1fca0d0986910a8f396ad64fd0b9f393270fd403c93e7e5d45cdc134c3965f47761cd40cd659b92b8abcec -Size (graphite2-1.3.5.tgz) = 3880214 bytes +SHA1 (graphite2-1.3.7.tgz) = 83fde60cca7ce82d3b90b335a6e6ea719d15ffec +RMD160 (graphite2-1.3.7.tgz) = a4fe7f52d67e126c20678863309aaf2b85a7ddf7 +SHA512 (graphite2-1.3.7.tgz) = 163ac1455003398690b173f2ce56509bba1ae1e480585635888e3b061fef1ff8493c86f4647efde65ea10cd82b4048fcc8e882ea56811a8169956ad27bd10b8f +Size (graphite2-1.3.7.tgz) = 3883666 bytes SHA1 (patch-src_CMakeLists.txt) = 4751d4cb699a368b9b612a18c45176346e29968b From 79a1aa1e4662a094886d2609f7a6dc89340a1bdf Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 24 Mar 2016 20:31:12 +0000 Subject: [PATCH 0409/2457] Updated graphics/graphite2 to 1.3.7 --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index cdb109c26a4fe..a884e1850d678 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1278 2016/03/24 13:46:07 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1279 2016/03/24 20:31:12 wiz Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1677,3 +1677,4 @@ Changes to the packages collection and infrastructure in 2016: Updated mail/seamonkey-enigmail to 1.9.1nb1 [ryoon 2016-03-24] Updated math/sc to 7.16 [youri 2016-03-24] Updated security/py-rsa to 3.4 [wiz 2016-03-24] + Updated graphics/graphite2 to 1.3.7 [wiz 2016-03-24] From 07d377e52e9739adace5eada886174ca5c9843c1 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 24 Mar 2016 20:34:39 +0000 Subject: [PATCH 0410/2457] + gnutls-3.4.10 [wip]. --- doc/TODO | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/TODO b/doc/TODO index 1da96630a10af..2fb89c44fe356 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15610 2016/03/24 07:46:52 wiz Exp $ +$NetBSD: TODO,v 1.15611 2016/03/24 20:34:39 wiz Exp $ Suggested new packages ====================== @@ -836,6 +836,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o gnustep-gui-0.24.1 o gnustep-make-2.6.7 o gnustep-objc-1.8 + o gnutls-3.4.10 [wip] o goaccess-0.12 o gob-2.0.19 o gobby-0.5.0 From 9ec5c1e11ea42f9643f6df81e754c8e3cb82666d Mon Sep 17 00:00:00 2001 From: bsiegert Date: Thu, 24 Mar 2016 20:58:10 +0000 Subject: [PATCH 0411/2457] libressl-2.3.6 gummi-0.6.6 remove duplicate samba-4.3.6 entry --- doc/TODO | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/TODO b/doc/TODO index 2fb89c44fe356..f61bc28068969 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15611 2016/03/24 20:34:39 wiz Exp $ +$NetBSD: TODO,v 1.15612 2016/03/24 20:58:10 bsiegert Exp $ Suggested new packages ====================== @@ -874,6 +874,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o gtodo-applet-0.16.2 o guile-gnome-2.16.4 o guile-gtk-2.1 + o gummi-0.6.6 [fixes CVE-2015-7758] o gvfs-1.22.0 o gworkspace-0.9.3 o gxine-0.99.9 @@ -1079,7 +1080,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o libpgm-5.2.122 o libprelude-1.2.5 o libquantum-1.1.0 [pkg/43728, development release] - o libressl-2.3.2 + o libressl-2.3.3 o libstree-0.4.2 o libtar-1.2.20 o libtcl-nothread-8.5.1 @@ -1808,7 +1809,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o sabayon-2.30.1 [GNOME 2.30] o sablecc-3.7 o samba-4.3.6 - o samba4-4.3.5 o sarg-2.2.5 o scew-1.1.7 o scilab-5.5.2 From 8c06da798bd0fb9a3d346fd93ca6f6e65d1552c1 Mon Sep 17 00:00:00 2001 From: mef Date: Fri, 25 Mar 2016 14:21:03 +0000 Subject: [PATCH 0412/2457] If math/gsl is already installed, packaging becomes different. So add as prerequisite (buildlink3). Thanks Dave Tyson for the report at pkgsrc-users@. PKGREVISION++. Those two depends on gnuradio-fec, so the same situation as it. (PLIST of these two are NOT affected, but actuall installation PLIST will be different because of gnuradio-fec is also installed with those). --- ham/gnuradio-atsc/Makefile | 4 +++- ham/gnuradio-dtv/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ham/gnuradio-atsc/Makefile b/ham/gnuradio-atsc/Makefile index 5c2c740c2c0c5..6ee8c46a6f0b8 100644 --- a/ham/gnuradio-atsc/Makefile +++ b/ham/gnuradio-atsc/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2015/09/01 04:14:54 mef Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/25 14:21:03 mef Exp $ PKGNAME= gnuradio-atsc-${VERSION} +PKGREVISION= 1 COMMENT= Advanced Television Systems Committee, ATSC module of GNU Radio .include "../../ham/gnuradio-core/Makefile.common" @@ -13,4 +14,5 @@ CMAKE_ARGS+= -DENABLE_GR_FEC=ON DEPENDS+= gnuradio-fec-[0-9]*:../../ham/gnuradio-fec PLIST_MINUS+= fec +.include "../../math/gsl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-dtv/Makefile b/ham/gnuradio-dtv/Makefile index ea46a646029f9..3ef40902b0e2f 100644 --- a/ham/gnuradio-dtv/Makefile +++ b/ham/gnuradio-dtv/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2015/09/01 04:14:54 mef Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/25 14:21:03 mef Exp $ PKGNAME= gnuradio-dtv-${VERSION} +PKGREVISION= 1 COMMENT= Various digital television standards of GNU Radio .include "../../ham/gnuradio-core/Makefile.common" @@ -12,5 +13,6 @@ CMAKE_ARGS+= -DENABLE_GR_FEC=True PLIST_MINUS+= fec .include "../../ham/gnuradio-fec/buildlink3.mk" +.include "../../math/gsl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" From 5baca8e0b2031f8669ad3389ec295c1111454d72 Mon Sep 17 00:00:00 2001 From: taca Date: Fri, 25 Mar 2016 16:03:46 +0000 Subject: [PATCH 0413/2457] Update contao41 to 4.1.2, a leaf package. ### 4.1.2 (2016-03-22) * Handle derived classes in the exception converter (see #462). * Prevent the autofocus attribute from being added multiple times (see contao/core#8281). * Respect the SSL settings of the root page when generating sitemaps (see contao/core#8270). * Read from the temporary file if it has not been closed yet (see contao/core#8269). * Always use HTTPS if the target server supports SSL connections (see contao/core#8183). * Adjust the meta wizard field length to the column length (see contao/core#8277). * Correctly handle custom mime icon paths (see contao/core#8275). * Show the 404 error page if an unpublished article is requested (see contao/core#8264). * Correctly count the URLs when rebuilding the search index (see contao/core#8262). * Ensure that every image has a width and height attribute (see contao/core#8162). * Set the correct mime type when embedding SVG images (see contao/core#8245). * Handle the "float_left" and "float_right" classes in the back end (see contao/core#8239). * Consider the fallback language if a page alias is ambiguous (see contao/core#8142). * Fix the error 403/404 redirect (see contao/website#74). --- www/contao41/Makefile | 4 ++-- www/contao41/PLIST | 20 ++++++++++++++++++-- www/contao41/distinfo | 10 +++++----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/www/contao41/Makefile b/www/contao41/Makefile index 35f294d6741fa..631e4dfb08851 100644 --- a/www/contao41/Makefile +++ b/www/contao41/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/03/05 06:18:11 taca Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/25 16:03:46 taca Exp $ # DISTNAME= contao-${CT_PKGVER} @@ -24,7 +24,7 @@ DEPENDS+= ${PHP_PKG_PREFIX}-curl>=5.4.0:../../www/php-curl DEPENDS+= ${PHP_PKG_PREFIX}-zlib>=5.4.0:../../archivers/php-zlib DEPENDS+= bash>=4.0:../../shells/bash -CT_VERSION= 4.1.1 +CT_VERSION= 4.1.2 USE_TOOLS= bash pax NO_BUILD= yes diff --git a/www/contao41/PLIST b/www/contao41/PLIST index 4d70421acfc5d..4a8e875e50aea 100644 --- a/www/contao41/PLIST +++ b/www/contao41/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2016/03/05 06:18:11 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/25 16:03:46 taca Exp $ ${CT_WEBDIR}/CHANGELOG.md ${CT_WEBDIR}/README.md ${CT_WEBDIR}/app/AppCache.php @@ -2521,6 +2521,14 @@ ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/fr/tl_news ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/fr/tl_news_feed.xlf ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/fr/tl_user.xlf ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/fr/tl_user_group.xlf +${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/ja/default.xlf +${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/ja/modules.xlf +${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/ja/tl_module.xlf +${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/ja/tl_news.xlf +${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/ja/tl_news_archive.xlf +${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/ja/tl_news_feed.xlf +${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/ja/tl_user.xlf +${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/ja/tl_user_group.xlf ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/nl/default.xlf ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/nl/modules.xlf ${CT_WEBDIR}/vendor/contao/news-bundle/src/Resources/contao/languages/nl/tl_module.xlf @@ -2610,6 +2618,15 @@ ${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/fr/t ${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/fr/tl_newsletter_recipients.xlf ${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/fr/tl_user.xlf ${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/fr/tl_user_group.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/default.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/modules.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/tl_member.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/tl_module.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/tl_newsletter.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/tl_newsletter_channel.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/tl_newsletter_recipients.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/tl_user.xlf +${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/ja/tl_user_group.xlf ${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/nl/default.xlf ${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/nl/modules.xlf ${CT_WEBDIR}/vendor/contao/newsletter-bundle/src/Resources/contao/languages/nl/tl_member.xlf @@ -4071,7 +4088,6 @@ ${CT_WEBDIR}/vendor/symfony/monolog-bundle/composer.json ${CT_WEBDIR}/vendor/symfony/monolog-bundle/phpunit.xml.dist ${CT_WEBDIR}/vendor/symfony/polyfill-apcu/LICENSE ${CT_WEBDIR}/vendor/symfony/polyfill-apcu/README.md -${CT_WEBDIR}/vendor/symfony/polyfill-apcu/Resources/stubs/APCUIterator.php ${CT_WEBDIR}/vendor/symfony/polyfill-apcu/bootstrap.php ${CT_WEBDIR}/vendor/symfony/polyfill-apcu/composer.json ${CT_WEBDIR}/vendor/symfony/polyfill-intl-icu/LICENSE diff --git a/www/contao41/distinfo b/www/contao41/distinfo index 479aec04271c7..8d316359a891b 100644 --- a/www/contao41/distinfo +++ b/www/contao41/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2016/03/05 06:18:11 taca Exp $ +$NetBSD: distinfo,v 1.3 2016/03/25 16:03:46 taca Exp $ -SHA1 (contao-4.1.1.tar.gz) = 25233e54d48881fa46a2e95f5742831deabd907e -RMD160 (contao-4.1.1.tar.gz) = b83d0d0cae463cb237cce328fadfaaa9b9df8172 -SHA512 (contao-4.1.1.tar.gz) = fab2edee2d8e9da519f5b404438b3d9505e0e26f8235d8d55cb9001e263eae283a2e31f50521327742ba84450cba7a70d6e8f8c9c072bc665d059a0f9fe2c97b -Size (contao-4.1.1.tar.gz) = 14417565 bytes +SHA1 (contao-4.1.2.tar.gz) = ac15cade066031706049bbdaf84627356742a801 +RMD160 (contao-4.1.2.tar.gz) = 461f245d893d6ec26d5ec6049966410f37f581db +SHA512 (contao-4.1.2.tar.gz) = f86291f38f4acd7acf42e6583802711bbf59140f9a4663d7f6cb97189dea31c2d9fc5fc4d8d57937a60ed84f6972dcdab1d6d212422df470744ac3ac00e465de +Size (contao-4.1.2.tar.gz) = 14434591 bytes From 9d14b036b4baa85921bde81429f832305eea1b7c Mon Sep 17 00:00:00 2001 From: taca Date: Fri, 25 Mar 2016 16:04:18 +0000 Subject: [PATCH 0414/2457] Note update of www/contao41 package to 4.1.2. --- doc/CHANGES-2016 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGES-2016 b/doc/CHANGES-2016 index a884e1850d678..662616730a7e1 100644 --- a/doc/CHANGES-2016 +++ b/doc/CHANGES-2016 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2016,v 1.1279 2016/03/24 20:31:12 wiz Exp $ +$NetBSD: CHANGES-2016,v 1.1280 2016/03/25 16:04:18 taca Exp $ Changes to the packages collection and infrastructure in 2016: @@ -1678,3 +1678,4 @@ Changes to the packages collection and infrastructure in 2016: Updated math/sc to 7.16 [youri 2016-03-24] Updated security/py-rsa to 3.4 [wiz 2016-03-24] Updated graphics/graphite2 to 1.3.7 [wiz 2016-03-24] + Updated www/contao41 to 4.1.2 [taca 2016-03-25] From 46ef4d031237e9801823107a00338d09acb22b9a Mon Sep 17 00:00:00 2001 From: richard Date: Fri, 25 Mar 2016 16:50:00 +0000 Subject: [PATCH 0415/2457] remove obsoleted patch from libplist --- .../libplist/patches/patch-src_Dictionary.cpp | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 textproc/libplist/patches/patch-src_Dictionary.cpp diff --git a/textproc/libplist/patches/patch-src_Dictionary.cpp b/textproc/libplist/patches/patch-src_Dictionary.cpp deleted file mode 100644 index 17fb6d5f7a18f..0000000000000 --- a/textproc/libplist/patches/patch-src_Dictionary.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_Dictionary.cpp,v 1.1 2013/05/29 13:20:22 joerg Exp $ - -What is the intention here? - ---- src/Dictionary.cpp.orig 2013-04-28 13:27:28.000000000 +0000 -+++ src/Dictionary.cpp -@@ -151,7 +151,7 @@ Dictionary::iterator Dictionary::Insert( - _map[key] = clone; - return _map.find(key); - } -- return iterator(NULL); -+ return _map.end(); - } - - void Dictionary::Remove(Node* node) From 8a3db798a7558569bdc802bb529705e6ec2930b3 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:02:26 +0000 Subject: [PATCH 0416/2457] Avoid using the linker directly, otherwise rpath flags might not stick. Regen configure explicitly. Bump revision. --- x11/tk-Tix/Makefile | 9 +- x11/tk-Tix/distinfo | 5 +- x11/tk-Tix/patches/patch-aa | 44 +- x11/tk-Tix/patches/patch-ac | 13641 ---------------------------------- 4 files changed, 49 insertions(+), 13650 deletions(-) delete mode 100644 x11/tk-Tix/patches/patch-ac diff --git a/x11/tk-Tix/Makefile b/x11/tk-Tix/Makefile index 618843032043a..a53c5b7b8a9b9 100644 --- a/x11/tk-Tix/Makefile +++ b/x11/tk-Tix/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.25 2015/12/29 04:54:39 dholland Exp $ +# $NetBSD: Makefile,v 1.26 2016/03/25 21:02:26 joerg Exp $ # DISTNAME= Tix${TIX_VERSION}-src TIX_VERSION= 8.4.3 PKGNAME= tk-Tix-${TIX_VERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 tcl tk MASTER_SITES= http://downloads.sourceforge.net/project/tix/tix/8.4.3/ @@ -32,10 +32,13 @@ INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} TEST_TARGET= test INSTALLATION_DIRS+= ${PKGMANDIR}/mann INSTALLATION_DIRS+= lib/Tix${TIX_VERSION}/docs -USE_TOOLS+= tar +USE_TOOLS+= tar autoconf CPPFLAGS+= -DUSE_INTERP_RESULT +pre-configure: + cd ${WRKSRC} && aclocal && autoconf + post-install: for f in ${WRKSRC}/man/*.n; do \ ${INSTALL_DATA} -m 444 $$f \ diff --git a/x11/tk-Tix/distinfo b/x11/tk-Tix/distinfo index de6bb4f059edc..e46c8e9691b47 100644 --- a/x11/tk-Tix/distinfo +++ b/x11/tk-Tix/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.8 2015/11/04 03:28:55 agc Exp $ +$NetBSD: distinfo,v 1.9 2016/03/25 21:02:26 joerg Exp $ SHA1 (Tix8.4.3-src.tar.gz) = 285d2f19f907ebad002ee0266f56be620d44f174 RMD160 (Tix8.4.3-src.tar.gz) = 99249c4d7a19fcb8c27f11ab1b3ef6102911409d SHA512 (Tix8.4.3-src.tar.gz) = f13217dad0f52c0b706d2fb8ee0886942db64be0325e5d0d51801dbf9a92a7919c743c1445b76dbfa98815817685205e238e2d63f9366a8745ace1e1e9a01852 Size (Tix8.4.3-src.tar.gz) = 1831503 bytes -SHA1 (patch-aa) = e644a415e2b090f964d63a5c4b7a31b4f728c8d0 -SHA1 (patch-ac) = 975a5580145548130fa90b070407f25b3b1e046c +SHA1 (patch-aa) = 13a02a88a7fae048d0227b9029a56665f06025e7 SHA1 (patch-ad) = 9da45fba9abf8c2030dee1f8692aab3b26ce54b8 SHA1 (patch-ae) = fb92066c335536ff7acdfc2e9836c7cad9f6cd7b diff --git a/x11/tk-Tix/patches/patch-aa b/x11/tk-Tix/patches/patch-aa index 06c9f96105d15..cf3f7a1aaa4ff 100644 --- a/x11/tk-Tix/patches/patch-aa +++ b/x11/tk-Tix/patches/patch-aa @@ -1,12 +1,29 @@ -$NetBSD: patch-aa,v 1.5 2012/09/03 11:13:29 marino Exp $ +$NetBSD: patch-aa,v 1.6 2016/03/25 21:02:26 joerg Exp $ IF AC_PATH_X fails, also look for /usr/X11R7. +Don't use ld directly, use the compiler. Additionally, also specify run-path to the X libraries. Add DragonFly support. --- tclconfig/tcl.m4.orig 2007-02-21 22:09:05.000000000 +0000 +++ tclconfig/tcl.m4 -@@ -1592,7 +1592,7 @@ dnl AC_CHECK_TOOL(AR, ar) +@@ -1536,13 +1536,13 @@ dnl AC_CHECK_TOOL(AR, ar) + NetBSD-*|FreeBSD-[[1-2]].*) + # NetBSD/SPARC needs -fPIC, -fpic will not do. + SHLIB_CFLAGS="-fPIC" +- SHLIB_LD="ld -Bshareable -x" ++ SHLIB_LD="${CC} -shared" + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' +- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' ++ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' + AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ + AC_EGREP_CPP(yes, [ + #ifdef __ELF__ +@@ -1592,17 +1592,17 @@ dnl AC_CHECK_TOOL(AR, ar) UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' TCL_LIB_VERSIONS_OK=nodots ;; @@ -14,7 +31,19 @@ Add DragonFly support. + FreeBSD-*|DragonFly-*) # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" +- SHLIB_LD="ld -Bshareable -x" ++ SHLIB_LD="${CC} -shared" + SHLIB_LD_LIBS='${LIBS}' + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" + DL_LIBS="" + LDFLAGS="$LDFLAGS -export-dynamic" + CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' +- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' ++ LD_SEARCH_FLAGS='-Wl,rpath,${LIB_RUNTIME_DIR}' + if test "${TCL_THREADS}" = "1" ; then + # The -pthread needs to go in the CFLAGS, not LIBS + LIBS=`echo $LIBS | sed s/-pthread//` @@ -1610,7 +1610,7 @@ dnl AC_CHECK_TOOL(AR, ar) LDFLAGS="$LDFLAGS -pthread" fi @@ -24,6 +53,15 @@ Add DragonFly support. # FreeBSD-3 doesn't handle version numbers with dots. UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' +@@ -1781,7 +1781,7 @@ dnl AC_CHECK_TOOL(AR, ar) + # QNX RTP + # This may work for all QNX, but it was only reported for v6. + SHLIB_CFLAGS="-fPIC" +- SHLIB_LD="ld -Bshareable -x" ++ SHLIB_LD="${CC} -shared" + SHLIB_LD_LIBS="" + SHLIB_SUFFIX=".so" + DL_OBJS="tclLoadDl.o" @@ -2313,7 +2313,7 @@ AC_DEFUN([TEA_PATH_UNIX_X], [ found_xincludes="no" AC_TRY_CPP([#include ], found_xincludes="yes", found_xincludes="no") diff --git a/x11/tk-Tix/patches/patch-ac b/x11/tk-Tix/patches/patch-ac deleted file mode 100644 index 320228238e543..0000000000000 --- a/x11/tk-Tix/patches/patch-ac +++ /dev/null @@ -1,13641 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2012/09/03 11:13:29 marino Exp $ - -Regenerated version after touching tclconfig/tcl.m4. - ---- configure.orig 2008-02-28 04:35:01.000000000 +0000 -+++ configure -@@ -1,81 +1,423 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59 for Tix 8.4.3. -+# Generated by GNU Autoconf 2.68 for Tix 8.4.3. -+# -+# -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -+# Foundation, Inc. -+# - # --# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' - fi - -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } -+fi -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ # We cannot yet assume a decent shell, so we have to provide a -+ # neutralization value for shells without unset; and this also -+ # works around shells that cannot unset nonexistent variables. -+ # Preserve -v and -x to the replacement shell. -+ BASH_ENV=/dev/null -+ ENV=/dev/null -+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+ export CONFIG_SHELL -+ case $- in # (((( -+ *v*x* | *x*v* ) as_opts=-vx ;; -+ *v* ) as_opts=-v ;; -+ *x* ) as_opts=-x ;; -+ * ) as_opts= ;; -+ esac -+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS -+ -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -- --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +425,107 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +534,25 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+test -n "$DJDIR" || exec 7<&0 &1 - - # Name of the host. --# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME='Tix' -@@ -270,50 +560,209 @@ PACKAGE_TARNAME='tix' - PACKAGE_VERSION='8.4.3' - PACKAGE_STRING='Tix 8.4.3' - PACKAGE_BUGREPORT='' -+PACKAGE_URL='' - - # Factoring default headers for most tests. - ac_includes_default="\ - #include --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include - # include - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include - # endif - # include - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include --#else --# if HAVE_STDINT_H --# include --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include -+#endif -+#ifdef HAVE_UNISTD_H - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CYGPATH EXEEXT PKG_LIB_FILE PKG_STUB_LIB_FILE PKG_STUB_SOURCES PKG_STUB_OBJECTS PKG_TCL_SOURCES PKG_HEADERS PKG_INCLUDES PKG_LIBS PKG_CFLAGS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_LIBS TCL_DEFS TCL_EXTRA_CFLAGS TCL_LD_FLAGS TCL_SHLIB_LD_LIBS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_LIBS TK_XINCLUDES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB EGREP MATH_LIBS PKG_SOURCES PKG_OBJECTS TCL_TOP_DIR_NATIVE TCL_GENERIC_DIR_NATIVE TCL_UNIX_DIR_NATIVE TCL_WIN_DIR_NATIVE TCL_BMAP_DIR_NATIVE TCL_TOOL_DIR_NATIVE TCL_PLATFORM_DIR_NATIVE TCL_INCLUDES TK_TOP_DIR_NATIVE TK_UNIX_DIR_NATIVE TK_WIN_DIR_NATIVE TK_GENERIC_DIR_NATIVE TK_XLIB_DIR_NATIVE TK_PLATFORM_DIR_NATIVE TK_INCLUDES CLEANFILES TCL_THREADS SHARED_BUILD AR CELIB_DIR LIBOBJS DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS LD_LIBRARY_PATH_VAR TCL_DBGX CFLAGS_DEFAULT LDFLAGS_DEFAULT MAKE_LIB MAKE_SHARED_LIB MAKE_STATIC_LIB MAKE_STUB_LIB RANLIB_STUB TCLSH_PROG WISH_PROG LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+WISH_PROG -+TCLSH_PROG -+RANLIB_STUB -+MAKE_STUB_LIB -+MAKE_STATIC_LIB -+MAKE_SHARED_LIB -+MAKE_LIB -+LDFLAGS_DEFAULT -+CFLAGS_DEFAULT -+TCL_DBGX -+LD_LIBRARY_PATH_VAR -+SHLIB_CFLAGS -+SHLIB_LD_LIBS -+SHLIB_LD -+STLIB_LD -+CFLAGS_WARNING -+CFLAGS_OPTIMIZE -+CFLAGS_DEBUG -+DL_LIBS -+LIBOBJS -+CELIB_DIR -+AR -+SHARED_BUILD -+TCL_THREADS -+CLEANFILES -+XMKMF -+TK_INCLUDES -+TK_PLATFORM_DIR_NATIVE -+TK_XLIB_DIR_NATIVE -+TK_GENERIC_DIR_NATIVE -+TK_WIN_DIR_NATIVE -+TK_UNIX_DIR_NATIVE -+TK_TOP_DIR_NATIVE -+TCL_INCLUDES -+TCL_PLATFORM_DIR_NATIVE -+TCL_TOOL_DIR_NATIVE -+TCL_BMAP_DIR_NATIVE -+TCL_WIN_DIR_NATIVE -+TCL_UNIX_DIR_NATIVE -+TCL_GENERIC_DIR_NATIVE -+TCL_TOP_DIR_NATIVE -+PKG_OBJECTS -+PKG_SOURCES -+MATH_LIBS -+EGREP -+GREP -+RANLIB -+SET_MAKE -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+CPP -+OBJEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+TK_XINCLUDES -+TK_LIBS -+TK_STUB_LIB_SPEC -+TK_STUB_LIB_FLAG -+TK_STUB_LIB_FILE -+TK_LIB_SPEC -+TK_LIB_FLAG -+TK_LIB_FILE -+TK_SRC_DIR -+TK_BIN_DIR -+TK_VERSION -+TCL_SHLIB_LD_LIBS -+TCL_LD_FLAGS -+TCL_EXTRA_CFLAGS -+TCL_DEFS -+TCL_LIBS -+TCL_STUB_LIB_SPEC -+TCL_STUB_LIB_FLAG -+TCL_STUB_LIB_FILE -+TCL_LIB_SPEC -+TCL_LIB_FLAG -+TCL_LIB_FILE -+TCL_SRC_DIR -+TCL_BIN_DIR -+TCL_VERSION -+PKG_CFLAGS -+PKG_LIBS -+PKG_INCLUDES -+PKG_HEADERS -+PKG_TCL_SOURCES -+PKG_STUB_OBJECTS -+PKG_STUB_SOURCES -+PKG_STUB_LIB_FILE -+PKG_LIB_FILE -+EXEEXT -+CYGPATH -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+with_tcl -+with_tk -+with_x -+enable_threads -+enable_shared -+enable_64bit -+enable_64bit_vis -+enable_wince -+with_celib -+enable_load -+enable_symbols -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CPP -+XMKMF' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -336,34 +785,49 @@ x_libraries=NONE - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *=) ac_optarg= ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -385,33 +849,59 @@ do - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -438,6 +928,12 @@ do - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -462,13 +958,16 @@ do - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -533,6 +1032,16 @@ do - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -583,26 +1092,36 @@ do - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error $? "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -622,27 +1141,26 @@ do - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error $? "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information" - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" - ;; - - esac -@@ -650,31 +1168,36 @@ done - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error $? "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; - esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -688,8 +1211,8 @@ target=$target_alias - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -- If a cross compiler is detected then cross compile mode will be used." >&2 -+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. -+ If a cross compiler is detected then cross compile mode will be used" >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -@@ -701,74 +1224,72 @@ test -n "$host_alias" && ac_tool_prefix= - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error $? "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error $? "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi --fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -791,20 +1312,17 @@ Configuration: - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit -- -q, --quiet, --silent do not print \`checking...' messages -+ -q, --quiet, --silent do not print \`checking ...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -814,18 +1332,25 @@ for instance \`--prefix=\$HOME'. - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/tix] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -843,6 +1368,7 @@ if test -n "$ac_init_help"; then - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-threads build with threads -@@ -868,164 +1394,487 @@ Some influential environment variables: - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory -- CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have -- headers in a nonstandard directory -+ LIBS libraries to pass to the linker, e.g. -l -+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if -+ you have headers in a nonstandard directory - CPP C preprocessor -+ XMKMF Path to xmkmf, Makefile generator for X Window System - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF - Tix configure 8.4.3 --generated by GNU Autoconf 2.59 -+generated by GNU Autoconf 2.68 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. - --It was created by Tix $as_me 8.4.3, which was --generated by GNU Autoconf 2.59. Invocation command line was -- -- $ $0 $@ -- --_ACEOF -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () - { --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval - --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+} # ac_fn_c_try_compile - --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } > conftest.i && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_cpp -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --_ASUNAME -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval - --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+} # ac_fn_c_try_run - --} >&5 -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - --cat >&5 <<_ACEOF -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_try_link LINENO -+# ----------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ as_fn_set_status $ac_retval -+ -+} # ac_fn_c_try_link -+ -+# ac_fn_c_check_func LINENO FUNC VAR -+# ---------------------------------- -+# Tests whether FUNC exists, setting the cache variable VAR accordingly -+ac_fn_c_check_func () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case declares $2. -+ For example, HP-UX 11i declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (); below. -+ Prefer to if __STDC__ is defined, since -+ exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include -+#else -+# include -+#endif -+ -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main () -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_func -+ -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if eval \${$3+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.i conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if eval \${$3+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -+ -+} # ac_fn_c_check_header_mongrel -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by Tix $as_me 8.4.3, which was -+generated by GNU Autoconf 2.68. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF - - - ## ----------- ## -@@ -1043,7 +1892,6 @@ _ACEOF - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1054,13 +1902,13 @@ do - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1076,104 +1924,115 @@ do - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - -- cat <<\_ASBOX --## ---------------- ## -+ $as_echo "## ---------------- ## - ## Cache variables. ## --## ---------------- ## --_ASBOX -+## ---------------- ##" - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - -- cat <<\_ASBOX --## ----------------- ## -+ $as_echo "## ----------------- ## - ## Output variables. ## --## ----------------- ## --_ASBOX -+## ----------------- ##" - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then -- cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## --_ASBOX -+ $as_echo "## ------------------- ## -+## File substitutions. ## -+## ------------------- ##" - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then -- cat <<\_ASBOX --## ----------- ## -+ $as_echo "## ----------- ## - ## confdefs.h. ## --## ----------- ## --_ASBOX -+## ----------- ##" - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1181,112 +2040,137 @@ cat >>confdefs.h <<_ACEOF - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ # We do not want a PATH search for config.site. -+ case $CONFIG_SITE in #(( -+ -*) ac_site_file1=./$CONFIG_SITE;; -+ */*) ac_site_file1=$CONFIG_SITE;; -+ *) ac_site_file1=./$CONFIG_SITE;; -+ esac -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -- if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue -+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 -- . "$ac_site_file" -+ . "$ac_site_file" \ -+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "failed to load site script $ac_site_file -+See \`config.log' for more details" "$LINENO" 5; } - fi - done - - if test -r "$cache_file"; then -- # Some versions of bash will fail to source /dev/null (special -- # files actually), so we avoid doing that. -- if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ # Some versions of bash will fail to source /dev/null (special files -+ # actually), so we avoid doing that. DJGPP emulates it as a regular file. -+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } --fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -+fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1296,31 +2180,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - #-------------------------------------------------------------------- - # Call TEA_INIT as the first TEA_ macro to set up initial vars. - # This will define a ${TEA_PLATFORM} variable == "unix" or "windows" -@@ -1332,36 +2191,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - # are compatible with. - TEA_VERSION="3.6" - -- echo "$as_me:$LINENO: checking for correct TEA configuration" >&5 --echo $ECHO_N "checking for correct TEA configuration... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct TEA configuration" >&5 -+$as_echo_n "checking for correct TEA configuration... " >&6; } - if test x"${PACKAGE_NAME}" = x ; then -- { { echo "$as_me:$LINENO: error: --The PACKAGE_NAME variable must be defined by your TEA configure.in" >&5 --echo "$as_me: error: --The PACKAGE_NAME variable must be defined by your TEA configure.in" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? " -+The PACKAGE_NAME variable must be defined by your TEA configure.in" "$LINENO" 5 - fi - if test x"3.6" = x ; then -- { { echo "$as_me:$LINENO: error: --TEA version not specified." >&5 --echo "$as_me: error: --TEA version not specified." >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? " -+TEA version not specified." "$LINENO" 5 - elif test "3.6" != "${TEA_VERSION}" ; then -- echo "$as_me:$LINENO: result: warning: requested TEA version \"3.6\", have \"${TEA_VERSION}\"" >&5 --echo "${ECHO_T}warning: requested TEA version \"3.6\", have \"${TEA_VERSION}\"" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: warning: requested TEA version \"3.6\", have \"${TEA_VERSION}\"" >&5 -+$as_echo "warning: requested TEA version \"3.6\", have \"${TEA_VERSION}\"" >&6; } - else -- echo "$as_me:$LINENO: result: ok (TEA ${TEA_VERSION})" >&5 --echo "${ECHO_T}ok (TEA ${TEA_VERSION})" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (TEA ${TEA_VERSION})" >&5 -+$as_echo "ok (TEA ${TEA_VERSION})" >&6; } - fi - case "`uname -s`" in - *win32*|*WIN32*|*CYGWIN_NT*|*CYGWIN_9*|*CYGWIN_ME*|*MINGW32_*) - # Extract the first word of "cygpath", so it can be a program name with args. - set dummy cygpath; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CYGPATH+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CYGPATH+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CYGPATH"; then - ac_cv_prog_CYGPATH="$CYGPATH" # Let the user override the test. -@@ -1371,27 +2224,29 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CYGPATH="cygpath -w" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - test -z "$ac_cv_prog_CYGPATH" && ac_cv_prog_CYGPATH="echo" - fi - fi - CYGPATH=$ac_cv_prog_CYGPATH - if test -n "$CYGPATH"; then -- echo "$as_me:$LINENO: result: $CYGPATH" >&5 --echo "${ECHO_T}$CYGPATH" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGPATH" >&5 -+$as_echo "$CYGPATH" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - EXEEXT=".exe" - TEA_PLATFORM="windows" - ;; -@@ -1431,29 +2286,33 @@ fi - - - ac_aux_dir= --for ac_dir in tclconfig $srcdir/tclconfig; do -- if test -f $ac_dir/install-sh; then -+for ac_dir in tclconfig "$srcdir"/tclconfig; do -+ if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break -- elif test -f $ac_dir/install.sh; then -+ elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break -- elif test -f $ac_dir/shtool; then -+ elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in tclconfig $srcdir/tclconfig" >&5 --echo "$as_me: error: cannot find install-sh or install.sh in tclconfig $srcdir/tclconfig" >&2;} -- { (exit 1); exit 1; }; } --fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in tclconfig \"$srcdir\"/tclconfig" "$LINENO" 5 -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - - #-------------------------------------------------------------------- -@@ -1472,15 +2331,15 @@ ac_configure="$SHELL $ac_aux_dir/configu - # we reset no_tcl in case something fails here - no_tcl=true - --# Check whether --with-tcl or --without-tcl was given. --if test "${with_tcl+set}" = set; then -- withval="$with_tcl" -- with_tclconfig=${withval} --fi; -- echo "$as_me:$LINENO: checking for Tcl configuration" >&5 --echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6 -- if test "${ac_cv_c_tclconfig+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+# Check whether --with-tcl was given. -+if test "${with_tcl+set}" = set; then : -+ withval=$with_tcl; with_tclconfig=${withval} -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5 -+$as_echo_n "checking for Tcl configuration... " >&6; } -+ if ${ac_cv_c_tclconfig+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - -@@ -1489,17 +2348,15 @@ else - case ${with_tclconfig} in - */tclConfig.sh ) - if test -f ${with_tclconfig}; then -- { echo "$as_me:$LINENO: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5 --echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5 -+$as_echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;} - with_tclconfig=`echo ${with_tclconfig} | sed 's!/tclConfig\.sh$!!'` - fi ;; - esac - if test -f "${with_tclconfig}/tclConfig.sh" ; then - ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` - else -- { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5 --echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "${with_tclconfig} directory doesn't contain tclConfig.sh" "$LINENO" 5 - fi - fi - -@@ -1587,28 +2444,28 @@ fi - - if test x"${ac_cv_c_tclconfig}" = x ; then - TCL_BIN_DIR="# no Tcl configs found" -- { echo "$as_me:$LINENO: WARNING: Can't find Tcl configuration definitions" >&5 --echo "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find Tcl configuration definitions" >&5 -+$as_echo "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;} - exit 0 - else - no_tcl= - TCL_BIN_DIR=${ac_cv_c_tclconfig} -- echo "$as_me:$LINENO: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5 --echo "${ECHO_T}found ${TCL_BIN_DIR}/tclConfig.sh" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5 -+$as_echo "found ${TCL_BIN_DIR}/tclConfig.sh" >&6; } - fi - fi - - -- echo "$as_me:$LINENO: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5 --echo $ECHO_N "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5 -+$as_echo_n "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... " >&6; } - - if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then -- echo "$as_me:$LINENO: result: loading" >&5 --echo "${ECHO_T}loading" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 -+$as_echo "loading" >&6; } - . ${TCL_BIN_DIR}/tclConfig.sh - else -- echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5 --echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5 -+$as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; } - fi - - # eval is required to do the TCL_DBGX substitution -@@ -1688,15 +2545,15 @@ echo "${ECHO_T}could not find ${TCL_BIN_ - # we reset no_tk in case something fails here - no_tk=true - --# Check whether --with-tk or --without-tk was given. --if test "${with_tk+set}" = set; then -- withval="$with_tk" -- with_tkconfig=${withval} --fi; -- echo "$as_me:$LINENO: checking for Tk configuration" >&5 --echo $ECHO_N "checking for Tk configuration... $ECHO_C" >&6 -- if test "${ac_cv_c_tkconfig+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+# Check whether --with-tk was given. -+if test "${with_tk+set}" = set; then : -+ withval=$with_tk; with_tkconfig=${withval} -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk configuration" >&5 -+$as_echo_n "checking for Tk configuration... " >&6; } -+ if ${ac_cv_c_tkconfig+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - -@@ -1705,17 +2562,15 @@ else - case ${with_tkconfig} in - */tkConfig.sh ) - if test -f ${with_tkconfig}; then -- { echo "$as_me:$LINENO: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&5 --echo "$as_me: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&5 -+$as_echo "$as_me: WARNING: --with-tk argument should refer to directory containing tkConfig.sh, not to tkConfig.sh itself" >&2;} - with_tkconfig=`echo ${with_tkconfig} | sed 's!/tkConfig\.sh$!!'` - fi ;; - esac - if test -f "${with_tkconfig}/tkConfig.sh" ; then - ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)` - else -- { { echo "$as_me:$LINENO: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&5 --echo "$as_me: error: ${with_tkconfig} directory doesn't contain tkConfig.sh" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "${with_tkconfig} directory doesn't contain tkConfig.sh" "$LINENO" 5 - fi - fi - -@@ -1803,28 +2658,28 @@ fi - - if test x"${ac_cv_c_tkconfig}" = x ; then - TK_BIN_DIR="# no Tk configs found" -- { echo "$as_me:$LINENO: WARNING: Can't find Tk configuration definitions" >&5 --echo "$as_me: WARNING: Can't find Tk configuration definitions" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find Tk configuration definitions" >&5 -+$as_echo "$as_me: WARNING: Can't find Tk configuration definitions" >&2;} - exit 0 - else - no_tk= - TK_BIN_DIR=${ac_cv_c_tkconfig} -- echo "$as_me:$LINENO: result: found ${TK_BIN_DIR}/tkConfig.sh" >&5 --echo "${ECHO_T}found ${TK_BIN_DIR}/tkConfig.sh" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${TK_BIN_DIR}/tkConfig.sh" >&5 -+$as_echo "found ${TK_BIN_DIR}/tkConfig.sh" >&6; } - fi - fi - - -- echo "$as_me:$LINENO: checking for existence of ${TK_BIN_DIR}/tkConfig.sh" >&5 --echo $ECHO_N "checking for existence of ${TK_BIN_DIR}/tkConfig.sh... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${TK_BIN_DIR}/tkConfig.sh" >&5 -+$as_echo_n "checking for existence of ${TK_BIN_DIR}/tkConfig.sh... " >&6; } - - if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then -- echo "$as_me:$LINENO: result: loading" >&5 --echo "${ECHO_T}loading" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5 -+$as_echo "loading" >&6; } - . ${TK_BIN_DIR}/tkConfig.sh - else -- echo "$as_me:$LINENO: result: could not find ${TK_BIN_DIR}/tkConfig.sh" >&5 --echo "${ECHO_T}could not find ${TK_BIN_DIR}/tkConfig.sh" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TK_BIN_DIR}/tkConfig.sh" >&5 -+$as_echo "could not find ${TK_BIN_DIR}/tkConfig.sh" >&6; } - fi - - # eval is required to do the TK_DBGX substitution -@@ -1875,9 +2730,7 @@ echo "${ECHO_T}could not find ${TK_BIN_D - case ${TK_DEFS} in - *MAC_OSX_TK*) - --cat >>confdefs.h <<\_ACEOF --#define MAC_OSX_TK 1 --_ACEOF -+$as_echo "#define MAC_OSX_TK 1" >>confdefs.h - - TEA_WINDOWINGSYSTEM="aqua" - ;; -@@ -1914,24 +2767,24 @@ _ACEOF - if test "${prefix}" = "NONE"; then - prefix_default=yes - if test x"${TCL_PREFIX}" != x; then -- { echo "$as_me:$LINENO: --prefix defaulting to TCL_PREFIX ${TCL_PREFIX}" >&5 --echo "$as_me: --prefix defaulting to TCL_PREFIX ${TCL_PREFIX}" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --prefix defaulting to TCL_PREFIX ${TCL_PREFIX}" >&5 -+$as_echo "$as_me: --prefix defaulting to TCL_PREFIX ${TCL_PREFIX}" >&6;} - prefix=${TCL_PREFIX} - else -- { echo "$as_me:$LINENO: --prefix defaulting to /usr/local" >&5 --echo "$as_me: --prefix defaulting to /usr/local" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --prefix defaulting to /usr/local" >&5 -+$as_echo "$as_me: --prefix defaulting to /usr/local" >&6;} - prefix=/usr/local - fi - fi - if test "${exec_prefix}" = "NONE" -a x"${prefix_default}" = x"yes" \ - -o x"${exec_prefix_default}" = x"yes" ; then - if test x"${TCL_EXEC_PREFIX}" != x; then -- { echo "$as_me:$LINENO: --exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}" >&5 --echo "$as_me: --exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}" >&5 -+$as_echo "$as_me: --exec-prefix defaulting to TCL_EXEC_PREFIX ${TCL_EXEC_PREFIX}" >&6;} - exec_prefix=${TCL_EXEC_PREFIX} - else -- { echo "$as_me:$LINENO: --exec-prefix defaulting to ${prefix}" >&5 --echo "$as_me: --exec-prefix defaulting to ${prefix}" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: --exec-prefix defaulting to ${prefix}" >&5 -+$as_echo "$as_me: --exec-prefix defaulting to ${prefix}" >&6;} - exec_prefix=$prefix - fi - fi -@@ -1944,6 +2797,99 @@ echo "$as_me: --exec-prefix defaulting t - # the basic setup necessary to compile executables. - #----------------------------------------------------------------------- - -+# Find a good install program. We prefer a C program (faster), -+# so one script is as good as another. But avoid the broken or -+# incompatible versions: -+# SysV /etc/install, /usr/sbin/install -+# SunOS /usr/etc/install -+# IRIX /sbin/install -+# AIX /bin/install -+# AmigaOS /C/install, which installs bootblocks on floppy discs -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -+# AFS /usr/afsws/bin/install, which mishandles nonexistent args -+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic -+# ./install, which can be erroneously created by make from ./install.sh. -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } -+if test -z "$INSTALL"; then -+if ${ac_cv_path_install+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in #(( -+ ./ | .// | /[cC]/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi -+ fi -+ done -+ done -+ ;; -+esac -+ -+ done -+IFS=$as_save_IFS -+ -+rm -rf conftest.one conftest.two conftest.dir -+ -+fi -+ if test "${ac_cv_path_install+set}" = set; then -+ INSTALL=$ac_cv_path_install -+ else -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the value is a relative name. -+ INSTALL=$ac_install_sh -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } -+ -+# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -+# It thinks the first close brace ends the variable substitution. -+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+ -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -+ - - # Don't put any macros that use the compiler (e.g. AC_TRY_COMPILE) - # in this macro, they need to go into TEA_SETUP_COMPILER instead. -@@ -1962,10 +2908,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1975,35 +2921,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -2013,39 +2961,50 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2055,77 +3014,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2136,18 +3055,19 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -2165,24 +3085,25 @@ fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -2192,39 +3113,41 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -2234,66 +3157,78 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "no acceptable C compiler found in \$PATH -+See \`config.log' for more details" "$LINENO" 5; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -- (eval $ac_compiler --version &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 -- (eval $ac_compiler -v &5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 -- (eval $ac_compiler -V &5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ fi -+ rm -f conftest.er1 conftest.err -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2305,112 +3240,108 @@ main () - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files -+do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' - do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done -+test "$ac_cv_exeext" = no && ac_cv_exeext= -+ - else -- echo "$as_me: failed program was:" >&5 -+ ac_file='' -+fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error 77 "C compiler cannot create executables -+See \`config.log' for more details" "$LINENO" 5; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - fi -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 -- --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 - --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -2418,38 +3349,90 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --fi -- --rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details" "$LINENO" 5; } -+fi -+rm -f conftest conftest$ac_cv_exeext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details" "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if ${ac_cv_objext+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2461,45 +3444,46 @@ main () - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details" "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if ${ac_cv_c_compiler_gnu+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2513,55 +3497,34 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if ${ac_cv_prog_cc_g+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2572,39 +3535,49 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ - --ac_cv_prog_cc_g=no -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2620,18 +3593,14 @@ else - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if ${ac_cv_prog_cc_c89+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -2659,12 +3628,17 @@ static char *f (char * (*g) (char **, in - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2679,205 +3653,37 @@ return f (e, argv, 0) != argv[0] || f - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg - fi --rm -f conftest.err conftest.$ac_objext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -+if test "x$ac_cv_prog_cc_c89" != xno; then : - --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h - fi - --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2889,15 +3695,15 @@ ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if ${ac_cv_prog_CPP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2911,11 +3717,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -2924,78 +3726,34 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : - break - fi - -@@ -3007,8 +3765,8 @@ fi - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -3018,11 +3776,7 @@ do - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include -@@ -3031,85 +3785,40 @@ cat >>conftest.$ac_ext <<_ACEOF - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. --rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+rm -f conftest.i conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then : -+ - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details" "$LINENO" 5; } - fi - - ac_ext=c -@@ -3119,116 +3828,40 @@ ac_link='$CC -o conftest$ac_exeext $CFLA - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- # Find a good install program. We prefer a C program (faster), --# so one script is as good as another. But avoid the broken or --# incompatible versions: --# SysV /etc/install, /usr/sbin/install --# SunOS /usr/etc/install --# IRIX /sbin/install --# AIX /bin/install --# AmigaOS /C/install, which installs bootblocks on floppy discs --# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag --# AFS /usr/afsws/bin/install, which mishandles nonexistent args --# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" --# OS/2's system install, which has a completely different semantic --# ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 --if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -- /usr/ucb/* ) ;; -- *) -- # OSF1 and SCO ODT 3.0 have their own names for install. -- # Don't use installbsd from OSF since it installs stuff as root -- # by default. -- for ac_prog in ginstall scoinst install; do -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -- if test $ac_prog = install && -- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # AIX install. It has an incompatible calling convention. -- : -- elif test $ac_prog = install && -- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -- # program-specific install script used by HP pwplus--don't use. -- : -- else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -- fi -- fi -- done -- done -- ;; --esac --done -- -- --fi -- if test "${ac_cv_path_install+set}" = set; then -- INSTALL=$ac_cv_path_install -- else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -- # break other packages using the cache if that directory is -- # removed, or if the path is relative. -- INSTALL=$ac_install_sh -- fi --fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -- --# Use test -z because SunOS4 sh mishandles braces in ${var-val}. --# It thinks the first close brace ends the variable substitution. --test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -- --test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -- --test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - - #-------------------------------------------------------------------- - # Checks to see if the make program sets the $MAKE variable. - #-------------------------------------------------------------------- - -- echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 --echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 --set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` --if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -+set x ${MAKE-make} -+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF -+SHELL = /bin/sh - all: -- @echo 'ac_maketemp="$(MAKE)"' -+ @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF --# GNU make sometimes prints "make[1]: Entering...", which would confuse us. --eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` --if test -n "$ac_maketemp"; then -- eval ac_cv_prog_make_${ac_make}_set=yes --else -- eval ac_cv_prog_make_${ac_make}_set=no --fi -+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -+case `${MAKE-make} -f conftest.make 2>/dev/null` in -+ *@@@%%%=?*=@@@%%%*) -+ eval ac_cv_prog_make_${ac_make}_set=yes;; -+ *) -+ eval ac_cv_prog_make_${ac_make}_set=no;; -+esac - rm -f conftest.make - fi --if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - SET_MAKE= - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" - fi - -@@ -3240,10 +3873,10 @@ fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -3253,35 +3886,37 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -3291,28 +3926,38 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - fi -@@ -3327,31 +3972,142 @@ fi - - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if ${ac_cv_path_GREP+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if ${ac_cv_path_EGREP+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP -+fi -+ -+ fi - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if ${ac_cv_header_stdc+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -3366,51 +4122,23 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3420,18 +4148,14 @@ fi - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3441,16 +4165,13 @@ fi - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -+#include - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3470,109 +4191,39 @@ main () - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3590,18 +4241,14 @@ done - #------------------------------------------------------------------------ - - if test -z "$no_pipe" -a -n "$GCC"; then -- echo "$as_me:$LINENO: checking if the compiler understands -pipe" >&5 --echo $ECHO_N "checking if the compiler understands -pipe... $ECHO_C" >&6 --if test "${tcl_cv_cc_pipe+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler understands -pipe" >&5 -+$as_echo_n "checking if the compiler understands -pipe... " >&6; } -+if ${tcl_cv_cc_pipe+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -3612,40 +4259,16 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_cc_pipe=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_cc_pipe=no -+ tcl_cv_cc_pipe=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$hold_cflags - fi --echo "$as_me:$LINENO: result: $tcl_cv_cc_pipe" >&5 --echo "${ECHO_T}$tcl_cv_cc_pipe" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_pipe" >&5 -+$as_echo "$tcl_cv_cc_pipe" >&6; } - if test $tcl_cv_cc_pipe = yes; then - CFLAGS="$CFLAGS -pipe" - fi -@@ -3655,235 +4278,229 @@ echo "${ECHO_T}$tcl_cv_cc_pipe" >&6 - # Common compiler flag setup - #-------------------------------------------------------------------- - -- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 --echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 --if test "${ac_cv_c_bigendian+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- # See if sys/param.h defines the BYTE_ORDER macro. --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -+$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -+if ${ac_cv_c_bigendian+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_c_bigendian=unknown -+ # See if we're dealing with a universal compiler. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifndef __APPLE_CC__ -+ not a universal capable compiler -+ #endif -+ typedef int dummy; -+ -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+ # Check for potential -arch flags. It is not universal unless -+ # there are at least two -arch flags with different values. -+ ac_arch= -+ ac_prev= -+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do -+ if test -n "$ac_prev"; then -+ case $ac_word in -+ i?86 | x86_64 | ppc | ppc64) -+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then -+ ac_arch=$ac_word -+ else -+ ac_cv_c_bigendian=universal -+ break -+ fi -+ ;; -+ esac -+ ac_prev= -+ elif test "x$ac_word" = "x-arch"; then -+ ac_prev=arch -+ fi -+ done -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ if test $ac_cv_c_bigendian = unknown; then -+ # See if sys/param.h defines the BYTE_ORDER macro. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include --#include -+ #include - - int - main () - { --#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN -- bogus endian macros --#endif -+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ -+ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ -+ && LITTLE_ENDIAN) -+ bogus endian macros -+ #endif - - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to BIG_ENDIAN or not. --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include --#include -+ #include - - int - main () - { - #if BYTE_ORDER != BIG_ENDIAN -- not big endian --#endif -+ not big endian -+ #endif - - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_c_bigendian=no -+ ac_cv_c_bigendian=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi -+ if test $ac_cv_c_bigendian = unknown; then -+ # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include - --# It does not; compile a test program. --if test "$cross_compiling" = yes; then -- # try to guess the endianness by grepping values into an object file -- ac_cv_c_bigendian=unknown -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+int -+main () -+{ -+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) -+ bogus endian macros -+ #endif -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ # It does; now see whether it defined to _BIG_ENDIAN or not. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; --short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; --void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } --short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; --short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; --void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -+#include -+ - int - main () - { -- _ascii (); _ebcdic (); -+#ifndef _BIG_ENDIAN -+ not big endian -+ #endif -+ - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -+else -+ ac_cv_c_bigendian=no - fi --if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -- if test "$ac_cv_c_bigendian" = unknown; then -- ac_cv_c_bigendian=no -- else -- # finding both strings is unlikely to happen, but who knows? -- ac_cv_c_bigendian=unknown -- fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi -+ if test $ac_cv_c_bigendian = unknown; then -+ # Compile a test program. -+ if test "$cross_compiling" = yes; then : -+ # Try to guess by grepping values from an object file. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+short int ascii_mm[] = -+ { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -+ short int ascii_ii[] = -+ { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -+ int use_ascii (int i) { -+ return ascii_mm[i] + ascii_ii[i]; -+ } -+ short int ebcdic_ii[] = -+ { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -+ short int ebcdic_mm[] = -+ { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -+ int use_ebcdic (int i) { -+ return ebcdic_mm[i] + ebcdic_ii[i]; -+ } -+ extern int foo; - -+int -+main () -+{ -+return use_ascii (foo) == use_ebcdic (foo); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then -+ ac_cv_c_bigendian=yes -+ fi -+ if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then -+ if test "$ac_cv_c_bigendian" = unknown; then -+ ac_cv_c_bigendian=no -+ else -+ # finding both strings is unlikely to happen, but who knows? -+ ac_cv_c_bigendian=unknown -+ fi -+ fi - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -+$ac_includes_default - int - main () - { -- /* Are we little or big endian? From Harbison&Steele. */ -- union -- { -- long l; -- char c[sizeof (long)]; -- } u; -- u.l = 1; -- exit (u.c[sizeof (long) - 1] == 1); -+ -+ /* Are we little or big endian? From Harbison&Steele. */ -+ union -+ { -+ long int l; -+ char c[sizeof (long int)]; -+ } u; -+ u.l = 1; -+ return u.c[sizeof (long int) - 1] == 1; -+ -+ ; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_bigendian=no - else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --ac_cv_c_bigendian=yes --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+ ac_cv_c_bigendian=yes - fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+ fi - fi --echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 --echo "${ECHO_T}$ac_cv_c_bigendian" >&6 --case $ac_cv_c_bigendian in -- yes) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -+$as_echo "$ac_cv_c_bigendian" >&6; } -+ case $ac_cv_c_bigendian in #( -+ yes) -+ $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h -+;; #( -+ no) -+ ;; #( -+ universal) - --cat >>confdefs.h <<\_ACEOF --#define WORDS_BIGENDIAN 1 --_ACEOF -- ;; -- no) -- ;; -- *) -- { { echo "$as_me:$LINENO: error: unknown endianness --presetting ac_cv_c_bigendian=no (or yes) will help" >&5 --echo "$as_me: error: unknown endianness --presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} -- { (exit 1); exit 1; }; } ;; --esac -+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -+ -+ ;; #( -+ *) -+ as_fn_error $? "unknown endianness -+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; -+ esac - - if test "${TEA_PLATFORM}" = "unix" ; then - -@@ -3894,161 +4511,44 @@ esac - # right (and it must appear before "-lm"). - #-------------------------------------------------------------------- - -- echo "$as_me:$LINENO: checking for sin" >&5 --echo $ECHO_N "checking for sin... $ECHO_C" >&6 --if test "${ac_cv_func_sin+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin" -+if test "x$ac_cv_func_sin" = xyes; then : -+ MATH_LIBS="" - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define sin to an innocuous variant, in case declares sin. -- For example, HP-UX 11i declares gettimeofday. */ --#define sin innocuous_sin -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char sin (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+ MATH_LIBS="-lm" -+fi - --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef sin -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char sin (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_sin) || defined (__stub___sin) --choke me --#else --char (*f) () = sin; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != sin; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_sin=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_sin=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_sin" >&5 --echo "${ECHO_T}$ac_cv_func_sin" >&6 --if test $ac_cv_func_sin = yes; then -- MATH_LIBS="" --else -- MATH_LIBS="-lm" --fi -- -- echo "$as_me:$LINENO: checking for main in -lieee" >&5 --echo $ECHO_N "checking for main in -lieee... $ECHO_C" >&6 --if test "${ac_cv_lib_ieee_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lieee $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lieee" >&5 -+$as_echo_n "checking for main in -lieee... " >&6; } -+if ${ac_cv_lib_ieee_main+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lieee $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - - - int - main () - { --main (); -+return main (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ieee_main=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_ieee_main=no -+ ac_cv_lib_ieee_main=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_ieee_main" >&5 --echo "${ECHO_T}$ac_cv_lib_ieee_main" >&6 --if test $ac_cv_lib_ieee_main = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee_main" >&5 -+$as_echo "$ac_cv_lib_ieee_main" >&6; } -+if test "x$ac_cv_lib_ieee_main" = xyes; then : - MATH_LIBS="-lieee $MATH_LIBS" - fi - -@@ -4058,211 +4558,45 @@ fi - # needs net/errno.h to define the socket-related error codes. - #-------------------------------------------------------------------- - -- echo "$as_me:$LINENO: checking for main in -linet" >&5 --echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6 --if test "${ac_cv_lib_inet_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -linet" >&5 -+$as_echo_n "checking for main in -linet... " >&6; } -+if ${ac_cv_lib_inet_main+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-linet $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - - int - main () - { --main (); -+return main (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_inet_main=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_inet_main=no -+ ac_cv_lib_inet_main=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_inet_main" >&5 --echo "${ECHO_T}$ac_cv_lib_inet_main" >&6 --if test $ac_cv_lib_inet_main = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet_main" >&5 -+$as_echo "$ac_cv_lib_inet_main" >&6; } -+if test "x$ac_cv_lib_inet_main" = xyes; then : - LIBS="$LIBS -linet" - fi - -- if test "${ac_cv_header_net_errno_h+set}" = set; then -- echo "$as_me:$LINENO: checking for net/errno.h" >&5 --echo $ECHO_N "checking for net/errno.h... $ECHO_C" >&6 --if test "${ac_cv_header_net_errno_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_net_errno_h" >&5 --echo "${ECHO_T}$ac_cv_header_net_errno_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking net/errno.h usability" >&5 --echo $ECHO_N "checking net/errno.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking net/errno.h presence" >&5 --echo $ECHO_N "checking net/errno.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: net/errno.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: net/errno.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: net/errno.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: net/errno.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: net/errno.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: net/errno.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: net/errno.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: net/errno.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: net/errno.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: net/errno.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: net/errno.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: net/errno.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: net/errno.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: net/errno.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: net/errno.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: net/errno.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for net/errno.h" >&5 --echo $ECHO_N "checking for net/errno.h... $ECHO_C" >&6 --if test "${ac_cv_header_net_errno_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_net_errno_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_net_errno_h" >&5 --echo "${ECHO_T}$ac_cv_header_net_errno_h" >&6 -- --fi --if test $ac_cv_header_net_errno_h = yes; then -+ ac_fn_c_check_header_mongrel "$LINENO" "net/errno.h" "ac_cv_header_net_errno_h" "$ac_includes_default" -+if test "x$ac_cv_header_net_errno_h" = xyes; then : - - --cat >>confdefs.h <<\_ACEOF --#define HAVE_NET_ERRNO_H 1 --_ACEOF -+$as_echo "#define HAVE_NET_ERRNO_H 1" >>confdefs.h - - fi - -@@ -4287,261 +4621,55 @@ fi - #-------------------------------------------------------------------- - - tcl_checkBoth=0 -- echo "$as_me:$LINENO: checking for connect" >&5 --echo $ECHO_N "checking for connect... $ECHO_C" >&6 --if test "${ac_cv_func_connect+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define connect to an innocuous variant, in case declares connect. -- For example, HP-UX 11i declares gettimeofday. */ --#define connect innocuous_connect -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char connect (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef connect -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char connect (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_connect) || defined (__stub___connect) --choke me --#else --char (*f) () = connect; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != connect; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_connect=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_connect=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 --echo "${ECHO_T}$ac_cv_func_connect" >&6 --if test $ac_cv_func_connect = yes; then -+ ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -+if test "x$ac_cv_func_connect" = xyes; then : - tcl_checkSocket=0 - else - tcl_checkSocket=1 - fi - - if test "$tcl_checkSocket" = 1; then -- echo "$as_me:$LINENO: checking for setsockopt" >&5 --echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6 --if test "${ac_cv_func_setsockopt+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define setsockopt to an innocuous variant, in case declares setsockopt. -- For example, HP-UX 11i declares gettimeofday. */ --#define setsockopt innocuous_setsockopt -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char setsockopt (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef setsockopt -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char setsockopt (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_setsockopt) || defined (__stub___setsockopt) --choke me --#else --char (*f) () = setsockopt; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != setsockopt; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_setsockopt=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_fn_c_check_func "$LINENO" "setsockopt" "ac_cv_func_setsockopt" -+if test "x$ac_cv_func_setsockopt" = xyes; then : - --ac_cv_func_setsockopt=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5 --echo "${ECHO_T}$ac_cv_func_setsockopt" >&6 --if test $ac_cv_func_setsockopt = yes; then -- : - else -- echo "$as_me:$LINENO: checking for setsockopt in -lsocket" >&5 --echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6 --if test "${ac_cv_lib_socket_setsockopt+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lsocket" >&5 -+$as_echo_n "checking for setsockopt in -lsocket... " >&6; } -+if ${ac_cv_lib_socket_setsockopt+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char setsockopt (); - int - main () - { --setsockopt (); -+return setsockopt (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_socket_setsockopt=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_socket_setsockopt=no -+ ac_cv_lib_socket_setsockopt=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_socket_setsockopt" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6 --if test $ac_cv_lib_socket_setsockopt = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_setsockopt" >&5 -+$as_echo "$ac_cv_lib_socket_setsockopt" >&6; } -+if test "x$ac_cv_lib_socket_setsockopt" = xyes; then : - LIBS="$LIBS -lsocket" - else - tcl_checkBoth=1 -@@ -4553,265 +4681,59 @@ fi - if test "$tcl_checkBoth" = 1; then - tk_oldLibs=$LIBS - LIBS="$LIBS -lsocket -lnsl" -- echo "$as_me:$LINENO: checking for accept" >&5 --echo $ECHO_N "checking for accept... $ECHO_C" >&6 --if test "${ac_cv_func_accept+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ ac_fn_c_check_func "$LINENO" "accept" "ac_cv_func_accept" -+if test "x$ac_cv_func_accept" = xyes; then : -+ tcl_checkNsl=0 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define accept to an innocuous variant, in case declares accept. -- For example, HP-UX 11i declares gettimeofday. */ --#define accept innocuous_accept -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char accept (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -+ LIBS=$tk_oldLibs -+fi - --#ifdef __STDC__ --# include --#else --# include --#endif -+ fi -+ ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -+if test "x$ac_cv_func_gethostbyname" = xyes; then : - --#undef accept -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -+if ${ac_cv_lib_nsl_gethostbyname+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ --char accept (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_accept) || defined (__stub___accept) --choke me --#else --char (*f) () = accept; --#endif - #ifdef __cplusplus --} -+extern "C" - #endif -- -+char gethostbyname (); - int - main () - { --return f != accept; -+return gethostbyname (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_accept=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_lib_nsl_gethostbyname=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_accept=no -+ ac_cv_lib_nsl_gethostbyname=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_func_accept" >&5 --echo "${ECHO_T}$ac_cv_func_accept" >&6 --if test $ac_cv_func_accept = yes; then -- tcl_checkNsl=0 --else -- LIBS=$tk_oldLibs -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : -+ LIBS="$LIBS -lnsl" - fi - -- fi -- echo "$as_me:$LINENO: checking for gethostbyname" >&5 --echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 --if test "${ac_cv_func_gethostbyname+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. -- For example, HP-UX 11i declares gettimeofday. */ --#define gethostbyname innocuous_gethostbyname -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char gethostbyname (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef gethostbyname -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char gethostbyname (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) --choke me --#else --char (*f) () = gethostbyname; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != gethostbyname; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_func_gethostbyname=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_func_gethostbyname=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 --if test $ac_cv_func_gethostbyname = yes; then -- : --else -- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 --echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 --if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lnsl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char gethostbyname (); --int --main () --{ --gethostbyname (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_nsl_gethostbyname=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_nsl_gethostbyname=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 --if test $ac_cv_lib_nsl_gethostbyname = yes; then -- LIBS="$LIBS -lnsl" --fi -- --fi -+fi - - - # Don't perform the eval of the libraries here because DL_LIBS -@@ -4822,17 +4744,13 @@ fi - - - -- echo "$as_me:$LINENO: checking dirent.h" >&5 --echo $ECHO_N "checking dirent.h... $ECHO_C" >&6 --if test "${tcl_cv_dirent_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dirent.h" >&5 -+$as_echo_n "checking dirent.h... " >&6; } -+if ${tcl_cv_dirent_h+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -4862,835 +4780,107 @@ closedir(d); - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - tcl_cv_dirent_h=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_dirent_h=no -+ tcl_cv_dirent_h=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $tcl_cv_dirent_h" >&5 --echo "${ECHO_T}$tcl_cv_dirent_h" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_dirent_h" >&5 -+$as_echo "$tcl_cv_dirent_h" >&6; } - - if test $tcl_cv_dirent_h = no; then - --cat >>confdefs.h <<\_ACEOF --#define NO_DIRENT_H 1 --_ACEOF -+$as_echo "#define NO_DIRENT_H 1" >>confdefs.h - - fi - -- if test "${ac_cv_header_errno_h+set}" = set; then -- echo "$as_me:$LINENO: checking for errno.h" >&5 --echo $ECHO_N "checking for errno.h... $ECHO_C" >&6 --if test "${ac_cv_header_errno_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_errno_h" >&5 --echo "${ECHO_T}$ac_cv_header_errno_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking errno.h usability" >&5 --echo $ECHO_N "checking errno.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking errno.h presence" >&5 --echo $ECHO_N "checking errno.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: errno.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: errno.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: errno.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: errno.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: errno.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: errno.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: errno.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: errno.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: errno.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: errno.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: errno.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: errno.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: errno.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: errno.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: errno.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: errno.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for errno.h" >&5 --echo $ECHO_N "checking for errno.h... $ECHO_C" >&6 --if test "${ac_cv_header_errno_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_errno_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_errno_h" >&5 --echo "${ECHO_T}$ac_cv_header_errno_h" >&6 -- --fi --if test $ac_cv_header_errno_h = yes; then -- : --else -- --cat >>confdefs.h <<\_ACEOF --#define NO_ERRNO_H 1 --_ACEOF -- --fi -+ ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" -+if test "x$ac_cv_header_errno_h" = xyes; then : - -- -- if test "${ac_cv_header_float_h+set}" = set; then -- echo "$as_me:$LINENO: checking for float.h" >&5 --echo $ECHO_N "checking for float.h... $ECHO_C" >&6 --if test "${ac_cv_header_float_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_float_h" >&5 --echo "${ECHO_T}$ac_cv_header_float_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking float.h usability" >&5 --echo $ECHO_N "checking float.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking float.h presence" >&5 --echo $ECHO_N "checking float.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: float.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: float.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: float.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: float.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: float.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: float.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: float.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: float.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: float.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: float.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: float.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: float.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: float.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: float.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: float.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: float.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for float.h" >&5 --echo $ECHO_N "checking for float.h... $ECHO_C" >&6 --if test "${ac_cv_header_float_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_float_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_float_h" >&5 --echo "${ECHO_T}$ac_cv_header_float_h" >&6 -- --fi --if test $ac_cv_header_float_h = yes; then -- : --else -- --cat >>confdefs.h <<\_ACEOF --#define NO_FLOAT_H 1 --_ACEOF -- --fi -- -- -- if test "${ac_cv_header_values_h+set}" = set; then -- echo "$as_me:$LINENO: checking for values.h" >&5 --echo $ECHO_N "checking for values.h... $ECHO_C" >&6 --if test "${ac_cv_header_values_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_values_h" >&5 --echo "${ECHO_T}$ac_cv_header_values_h" >&6 - else -- # Is the header compilable? --echo "$as_me:$LINENO: checking values.h usability" >&5 --echo $ECHO_N "checking values.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+$as_echo "#define NO_ERRNO_H 1" >>confdefs.h - --# Is the header present? --echo "$as_me:$LINENO: checking values.h presence" >&5 --echo $ECHO_N "checking values.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: values.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: values.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: values.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: values.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: values.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: values.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: values.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: values.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: values.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: values.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: values.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: values.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: values.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: values.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: values.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: values.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for values.h" >&5 --echo $ECHO_N "checking for values.h... $ECHO_C" >&6 --if test "${ac_cv_header_values_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_values_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_values_h" >&5 --echo "${ECHO_T}$ac_cv_header_values_h" >&6 -+ ac_fn_c_check_header_mongrel "$LINENO" "float.h" "ac_cv_header_float_h" "$ac_includes_default" -+if test "x$ac_cv_header_float_h" = xyes; then : - --fi --if test $ac_cv_header_values_h = yes; then -- : - else - --cat >>confdefs.h <<\_ACEOF --#define NO_VALUES_H 1 --_ACEOF -+$as_echo "#define NO_FLOAT_H 1" >>confdefs.h - - fi - - -- if test "${ac_cv_header_limits_h+set}" = set; then -- echo "$as_me:$LINENO: checking for limits.h" >&5 --echo $ECHO_N "checking for limits.h... $ECHO_C" >&6 --if test "${ac_cv_header_limits_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_limits_h" >&5 --echo "${ECHO_T}$ac_cv_header_limits_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking limits.h usability" >&5 --echo $ECHO_N "checking limits.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ ac_fn_c_check_header_mongrel "$LINENO" "values.h" "ac_cv_header_values_h" "$ac_includes_default" -+if test "x$ac_cv_header_values_h" = xyes; then : - --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking limits.h presence" >&5 --echo $ECHO_N "checking limits.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi - else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -+$as_echo "#define NO_VALUES_H 1" >>confdefs.h - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: limits.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: limits.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: limits.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: limits.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: limits.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: limits.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: limits.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: limits.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: limits.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: limits.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: limits.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: limits.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: limits.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: limits.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: limits.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: limits.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for limits.h" >&5 --echo $ECHO_N "checking for limits.h... $ECHO_C" >&6 --if test "${ac_cv_header_limits_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_limits_h=$ac_header_preproc - fi --echo "$as_me:$LINENO: result: $ac_cv_header_limits_h" >&5 --echo "${ECHO_T}$ac_cv_header_limits_h" >&6 -- --fi --if test $ac_cv_header_limits_h = yes; then -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_LIMITS_H 1 --_ACEOF -- --else - --cat >>confdefs.h <<\_ACEOF --#define NO_LIMITS_H 1 --_ACEOF - --fi -+ ac_fn_c_check_header_mongrel "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default" -+if test "x$ac_cv_header_limits_h" = xyes; then : - -+$as_echo "#define HAVE_LIMITS_H 1" >>confdefs.h - -- if test "${ac_cv_header_stdlib_h+set}" = set; then -- echo "$as_me:$LINENO: checking for stdlib.h" >&5 --echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6 --if test "${ac_cv_header_stdlib_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5 --echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking stdlib.h usability" >&5 --echo $ECHO_N "checking stdlib.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 - --# Is the header present? --echo "$as_me:$LINENO: checking stdlib.h presence" >&5 --echo $ECHO_N "checking stdlib.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+$as_echo "#define NO_LIMITS_H 1" >>confdefs.h - -- ac_header_preproc=no - fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: stdlib.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: stdlib.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: stdlib.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: stdlib.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: stdlib.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: stdlib.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: stdlib.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: stdlib.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: stdlib.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: stdlib.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: stdlib.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: stdlib.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for stdlib.h" >&5 --echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6 --if test "${ac_cv_header_stdlib_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_stdlib_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5 --echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6 - --fi --if test $ac_cv_header_stdlib_h = yes; then -+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -+if test "x$ac_cv_header_stdlib_h" = xyes; then : - tcl_ok=1 - else - tcl_ok=0 - fi - - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "strtol" >/dev/null 2>&1; then -- : -+ $EGREP "strtol" >/dev/null 2>&1; then : -+ - else - tcl_ok=0 - fi - rm -f conftest* - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "strtoul" >/dev/null 2>&1; then -- : -+ $EGREP "strtoul" >/dev/null 2>&1; then : -+ - else - tcl_ok=0 - fi - rm -f conftest* - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "strtod" >/dev/null 2>&1; then -- : -+ $EGREP "strtod" >/dev/null 2>&1; then : -+ - else - tcl_ok=0 - fi -@@ -5698,184 +4888,38 @@ rm -f conftest* - - if test $tcl_ok = 0; then - --cat >>confdefs.h <<\_ACEOF --#define NO_STDLIB_H 1 --_ACEOF -+$as_echo "#define NO_STDLIB_H 1" >>confdefs.h - -- fi -- if test "${ac_cv_header_string_h+set}" = set; then -- echo "$as_me:$LINENO: checking for string.h" >&5 --echo $ECHO_N "checking for string.h... $ECHO_C" >&6 --if test "${ac_cv_header_string_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_string_h" >&5 --echo "${ECHO_T}$ac_cv_header_string_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking string.h usability" >&5 --echo $ECHO_N "checking string.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking string.h presence" >&5 --echo $ECHO_N "checking string.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: string.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: string.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: string.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: string.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: string.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: string.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: string.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: string.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: string.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: string.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: string.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: string.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: string.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: string.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: string.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: string.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for string.h" >&5 --echo $ECHO_N "checking for string.h... $ECHO_C" >&6 --if test "${ac_cv_header_string_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_string_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_string_h" >&5 --echo "${ECHO_T}$ac_cv_header_string_h" >&6 -- --fi --if test $ac_cv_header_string_h = yes; then -+ fi -+ ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" -+if test "x$ac_cv_header_string_h" = xyes; then : - tcl_ok=1 - else - tcl_ok=0 - fi - - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "strstr" >/dev/null 2>&1; then -- : -+ $EGREP "strstr" >/dev/null 2>&1; then : -+ - else - tcl_ok=0 - fi - rm -f conftest* - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "strerror" >/dev/null 2>&1; then -- : -+ $EGREP "strerror" >/dev/null 2>&1; then : -+ - else - tcl_ok=0 - fi -@@ -5887,454 +4931,38 @@ rm -f conftest* - - if test $tcl_ok = 0; then - --cat >>confdefs.h <<\_ACEOF --#define NO_STRING_H 1 --_ACEOF -+$as_echo "#define NO_STRING_H 1" >>confdefs.h - - fi - -- if test "${ac_cv_header_sys_wait_h+set}" = set; then -- echo "$as_me:$LINENO: checking for sys/wait.h" >&5 --echo $ECHO_N "checking for sys/wait.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_wait_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking sys/wait.h usability" >&5 --echo $ECHO_N "checking sys/wait.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking sys/wait.h presence" >&5 --echo $ECHO_N "checking sys/wait.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: sys/wait.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: sys/wait.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/wait.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: sys/wait.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: sys/wait.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: sys/wait.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/wait.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: sys/wait.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/wait.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: sys/wait.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/wait.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: sys/wait.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/wait.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: sys/wait.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: sys/wait.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: sys/wait.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for sys/wait.h" >&5 --echo $ECHO_N "checking for sys/wait.h... $ECHO_C" >&6 --if test "${ac_cv_header_sys_wait_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_sys_wait_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 --echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 -- --fi --if test $ac_cv_header_sys_wait_h = yes; then -- : --else -- --cat >>confdefs.h <<\_ACEOF --#define NO_SYS_WAIT_H 1 --_ACEOF -- --fi -- -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_wait_h" = xyes; then : - -- if test "${ac_cv_header_dlfcn_h+set}" = set; then -- echo "$as_me:$LINENO: checking for dlfcn.h" >&5 --echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6 --if test "${ac_cv_header_dlfcn_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5 --echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking dlfcn.h usability" >&5 --echo $ECHO_N "checking dlfcn.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -+$as_echo "#define NO_SYS_WAIT_H 1" >>confdefs.h - --# Is the header present? --echo "$as_me:$LINENO: checking dlfcn.h presence" >&5 --echo $ECHO_N "checking dlfcn.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes - fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 - --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: dlfcn.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: dlfcn.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: dlfcn.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: dlfcn.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: dlfcn.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: dlfcn.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: dlfcn.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: dlfcn.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: dlfcn.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: dlfcn.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: dlfcn.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: dlfcn.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: dlfcn.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: dlfcn.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for dlfcn.h" >&5 --echo $ECHO_N "checking for dlfcn.h... $ECHO_C" >&6 --if test "${ac_cv_header_dlfcn_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_dlfcn_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_dlfcn_h" >&5 --echo "${ECHO_T}$ac_cv_header_dlfcn_h" >&6 -+ ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" -+if test "x$ac_cv_header_dlfcn_h" = xyes; then : - --fi --if test $ac_cv_header_dlfcn_h = yes; then -- : - else - --cat >>confdefs.h <<\_ACEOF --#define NO_DLFCN_H 1 --_ACEOF -+$as_echo "#define NO_DLFCN_H 1" >>confdefs.h - - fi - - - - # OS/390 lacks sys/param.h (and doesn't need it, by chance). -- --for ac_header in sys/param.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------ ## --## Report this to the Tix lists. ## --## ------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ for ac_header in sys/param.h -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" -+if test "x$ac_cv_header_sys_param_h" = xyes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_SYS_PARAM_H 1 - _ACEOF - - fi -@@ -6376,9 +5004,7 @@ done - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 --echo "$as_me: error: could not find source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -6412,9 +5038,7 @@ echo "$as_me: error: could not find sour - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 --echo "$as_me: error: could not find source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -6447,9 +5071,7 @@ echo "$as_me: error: could not find sour - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 --echo "$as_me: error: could not find source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -6484,9 +5106,7 @@ echo "$as_me: error: could not find sour - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 --echo "$as_me: error: could not find source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -6519,9 +5139,7 @@ echo "$as_me: error: could not find sour - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 --echo "$as_me: error: could not find source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -6545,9 +5163,7 @@ echo "$as_me: error: could not find sour - for i in $vars; do - # check for existence, be strict because it is installed - if test ! -f "${srcdir}/$i" ; then -- { { echo "$as_me:$LINENO: error: could not find header file '${srcdir}/$i'" >&5 --echo "$as_me: error: could not find header file '${srcdir}/$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find header file '${srcdir}/$i'" "$LINENO" 5 - fi - PKG_HEADERS="$PKG_HEADERS $i" - done -@@ -6571,9 +5187,7 @@ echo "$as_me: error: could not find head - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find stub source file '$i'" >&5 --echo "$as_me: error: could not find stub source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find stub source file '$i'" "$LINENO" 5 - fi - PKG_STUB_SOURCES="$PKG_STUB_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -6594,9 +5208,7 @@ echo "$as_me: error: could not find stub - for i in $vars; do - # check for existence, be strict because it is installed - if test ! -f "${srcdir}/$i" ; then -- { { echo "$as_me:$LINENO: error: could not find tcl source file '${srcdir}/$i'" >&5 --echo "$as_me: error: could not find tcl source file '${srcdir}/$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find tcl source file '${srcdir}/$i'" "$LINENO" 5 - fi - PKG_TCL_SOURCES="$PKG_TCL_SOURCES $i" - done -@@ -6614,8 +5226,8 @@ echo "$as_me: error: could not find tcl - - # needed for tclPort.h and such ... can be corrected - -- echo "$as_me:$LINENO: checking for Tcl private include files" >&5 --echo $ECHO_N "checking for Tcl private include files... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl private include files" >&5 -+$as_echo_n "checking for Tcl private include files... " >&6; } - - TCL_SRC_DIR_NATIVE=`${CYGPATH} ${TCL_SRC_DIR}` - TCL_TOP_DIR_NATIVE=\"${TCL_SRC_DIR_NATIVE}\" -@@ -6646,9 +5258,7 @@ echo $ECHO_N "checking for Tcl private i - esac - else - if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then -- { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 --echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find private header tclInt.h in ${TCL_SRC_DIR}" "$LINENO" 5 - fi - fi - -@@ -6662,12 +5272,12 @@ echo "$as_me: error: Cannot find private - - - -- echo "$as_me:$LINENO: result: Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" >&5 --echo "${ECHO_T}Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" >&5 -+$as_echo "Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" >&6; } - - -- echo "$as_me:$LINENO: checking for Tk private include files" >&5 --echo $ECHO_N "checking for Tk private include files... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tk private include files" >&5 -+$as_echo_n "checking for Tk private include files... " >&6; } - - TK_SRC_DIR_NATIVE=`${CYGPATH} ${TK_SRC_DIR}` - TK_TOP_DIR_NATIVE=\"${TK_SRC_DIR_NATIVE}\" -@@ -6701,9 +5311,7 @@ echo $ECHO_N "checking for Tk private in - esac - else - if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then -- { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5 --echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find private header tkInt.h in ${TK_SRC_DIR}" "$LINENO" 5 - fi - fi - -@@ -6715,8 +5323,8 @@ echo "$as_me: error: Cannot find private - - - -- echo "$as_me:$LINENO: result: Using srcdir found in tkConfig.sh: ${TK_SRC_DIR}" >&5 --echo "${ECHO_T}Using srcdir found in tkConfig.sh: ${TK_SRC_DIR}" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using srcdir found in tkConfig.sh: ${TK_SRC_DIR}" >&5 -+$as_echo "Using srcdir found in tkConfig.sh: ${TK_SRC_DIR}" >&6; } - - - #-------------------------------------------------------------------- -@@ -6726,44 +5334,47 @@ echo "${ECHO_T}Using srcdir found in tkC - - if test "${TEA_WINDOWINGSYSTEM}" = "x11" ; then - -- echo "$as_me:$LINENO: checking for X" >&5 --echo $ECHO_N "checking for X... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -+$as_echo_n "checking for X... " >&6; } - - --# Check whether --with-x or --without-x was given. --if test "${with_x+set}" = set; then -- withval="$with_x" -+# Check whether --with-x was given. -+if test "${with_x+set}" = set; then : -+ withval=$with_x; -+fi - --fi; - # $have_x is `yes', `no', `disabled', or empty when we do not yet know. - if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled - else -- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then -- # Both variables are already set. -- have_x=yes -- else -- if test "${ac_cv_have_x+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ case $x_includes,$x_libraries in #( -+ *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( -+ *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - # One or both of the vars are not set, and there is no cached value. - ac_x_includes=no ac_x_libraries=no --rm -fr conftest.dir -+rm -f -r conftest.dir - if mkdir conftest.dir; then - cd conftest.dir -- # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' --acfindx: -- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' --_ACEOF -- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then -- # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` -+incroot: -+ @echo incroot='${INCROOT}' -+usrlibdir: -+ @echo usrlibdir='${USRLIBDIR}' -+libdir: -+ @echo libdir='${LIBDIR}' -+_ACEOF -+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then -+ # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -+ for ac_var in incroot usrlibdir libdir; do -+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" -+ done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. -- for ac_extension in a so sl; do -- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && -- test -f $ac_im_libdir/libX11.$ac_extension; then -+ for ac_extension in a so sl dylib la dll; do -+ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && -+ test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done -@@ -6771,37 +5382,41 @@ _ACEOF - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in -- /usr/include) ;; -+ /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in -- /usr/lib | /lib) ;; -+ /usr/lib | /usr/lib64 | /lib | /lib64) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. -- rm -fr conftest.dir -+ rm -f -r conftest.dir - fi - - # Standard set of common directories for X headers. - # Check X11 before X11Rn because it is often a symlink to the current release. - ac_x_header_dirs=' - /usr/X11/include -+/usr/X11R7/include - /usr/X11R6/include - /usr/X11R5/include - /usr/X11R4/include - - /usr/include/X11 -+/usr/include/X11R7 - /usr/include/X11R6 - /usr/include/X11R5 - /usr/include/X11R4 - - /usr/local/X11/include -+/usr/local/X11R7/include - /usr/local/X11R6/include - /usr/local/X11R5/include - /usr/local/X11R4/include - - /usr/local/include/X11 -+/usr/local/include/X11R7 - /usr/local/include/X11R6 - /usr/local/include/X11R5 - /usr/local/include/X11R4 -@@ -6821,48 +5436,24 @@ ac_x_header_dirs=' - /usr/openwin/share/include' - - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include -+#include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # We can compile using X headers with no special include directory. - ac_x_includes= - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - for ac_dir in $ac_x_header_dirs; do -- if test -r "$ac_dir/X11/Intrinsic.h"; then -+ if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi - done - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - fi # $ac_x_includes = no - - if test "$ac_x_libraries" = no; then -@@ -6870,133 +5461,85 @@ if test "$ac_x_libraries" = no; then - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS -- LIBS="-lXt $LIBS" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ LIBS="-lX11 $LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include -+#include - int - main () - { --XtMalloc (0) -+XrmInitialize () - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - LIBS=$ac_save_LIBS - # We can link X programs with no special library path. - ac_x_libraries= - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --LIBS=$ac_save_LIBS --for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -+ LIBS=$ac_save_LIBS -+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` - do - # Don't even attempt the hair of trying to link an X program! -- for ac_extension in a so sl; do -- if test -r $ac_dir/libXt.$ac_extension; then -+ for ac_extension in a so sl dylib la dll; do -+ if test -r "$ac_dir/libX11.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done - done - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - fi # $ac_x_libraries = no - --if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then -- # Didn't find X anywhere. Cache the known absence of X. -- ac_cv_have_x="have_x=no" --else -- # Record where we found X for the cache. -- ac_cv_have_x="have_x=yes \ -- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" --fi -+case $ac_x_includes,$ac_x_libraries in #( -+ no,* | *,no | *\'*) -+ # Didn't find X, or a directory has "'" in its name. -+ ac_cv_have_x="have_x=no";; #( -+ *) -+ # Record where we found X for the cache. -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$ac_x_includes'\ -+ ac_x_libraries='$ac_x_libraries'" -+esac - fi -- -- fi -+;; #( -+ *) have_x=yes;; -+ esac - eval "$ac_cv_have_x" - fi # $with_x != no - - if test "$have_x" != yes; then -- echo "$as_me:$LINENO: result: $have_x" >&5 --echo "${ECHO_T}$have_x" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -+$as_echo "$have_x" >&6; } - no_x=yes - else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. -- ac_cv_have_x="have_x=yes \ -- ac_x_includes=$x_includes ac_x_libraries=$x_libraries" -- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 --echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -+ ac_cv_have_x="have_x=yes\ -+ ac_x_includes='$x_includes'\ -+ ac_x_libraries='$x_libraries'" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -+$as_echo "libraries $x_libraries, headers $x_includes" >&6; } - fi - - not_really_there="" - if test "$no_x" = ""; then - if test "$x_includes" = ""; then -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - not_really_there="yes" - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - else - if test ! -r $x_includes/X11/Intrinsic.h; then - not_really_there="yes" -@@ -7004,49 +5547,25 @@ rm -f conftest.err conftest.$ac_ext - fi - fi - if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then -- echo "$as_me:$LINENO: checking for X11 header files" >&5 --echo $ECHO_N "checking for X11 header files... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 header files" >&5 -+$as_echo_n "checking for X11 header files... " >&6; } - found_xincludes="no" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - found_xincludes="yes" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - found_xincludes="no" - fi --rm -f conftest.err conftest.$ac_ext -+rm -f conftest.err conftest.i conftest.$ac_ext - if test "$found_xincludes" = "no"; then -- dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include" -+ dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R7/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include /usr/pkg/include" - for i in $dirs ; do - if test -r $i/X11/Intrinsic.h; then -- echo "$as_me:$LINENO: result: $i" >&5 --echo "${ECHO_T}$i" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5 -+$as_echo "$i" >&6; } - XINCLUDES=" -I$i" - found_xincludes="yes" - break -@@ -7060,19 +5579,19 @@ echo "${ECHO_T}$i" >&6 - fi - fi - if test found_xincludes = "no"; then -- echo "$as_me:$LINENO: result: couldn't find any!" >&5 --echo "${ECHO_T}couldn't find any!" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: couldn't find any!" >&5 -+$as_echo "couldn't find any!" >&6; } - fi - - if test "$no_x" = yes; then -- echo "$as_me:$LINENO: checking for X11 libraries" >&5 --echo $ECHO_N "checking for X11 libraries... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 libraries" >&5 -+$as_echo_n "checking for X11 libraries... " >&6; } - XLIBSW=nope -- dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib" -+ dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R7/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib /usr/pkg/lib" - for i in $dirs ; do - if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then -- echo "$as_me:$LINENO: result: $i" >&5 --echo "${ECHO_T}$i" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5 -+$as_echo "$i" >&6; } - XLIBSW="-L$i -lX11" - x_libraries="$i" - break -@@ -7082,82 +5601,54 @@ echo "${ECHO_T}$i" >&6 - if test "$x_libraries" = ""; then - XLIBSW=-lX11 - else -- XLIBSW="-L$x_libraries -lX11" -+ XLIBSW="-L$x_libraries -Wl,-R,$x_libraries -lX11" - fi - fi - if test "$XLIBSW" = nope ; then -- echo "$as_me:$LINENO: checking for XCreateWindow in -lXwindow" >&5 --echo $ECHO_N "checking for XCreateWindow in -lXwindow... $ECHO_C" >&6 --if test "${ac_cv_lib_Xwindow_XCreateWindow+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCreateWindow in -lXwindow" >&5 -+$as_echo_n "checking for XCreateWindow in -lXwindow... " >&6; } -+if ${ac_cv_lib_Xwindow_XCreateWindow+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lXwindow $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char XCreateWindow (); - int - main () - { --XCreateWindow (); -+return XCreateWindow (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xwindow_XCreateWindow=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_Xwindow_XCreateWindow=no -+ ac_cv_lib_Xwindow_XCreateWindow=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_Xwindow_XCreateWindow" >&5 --echo "${ECHO_T}$ac_cv_lib_Xwindow_XCreateWindow" >&6 --if test $ac_cv_lib_Xwindow_XCreateWindow = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xwindow_XCreateWindow" >&5 -+$as_echo "$ac_cv_lib_Xwindow_XCreateWindow" >&6; } -+if test "x$ac_cv_lib_Xwindow_XCreateWindow" = xyes; then : - XLIBSW=-lXwindow - fi - - fi - if test "$XLIBSW" = nope ; then -- echo "$as_me:$LINENO: result: could not find any! Using -lX11." >&5 --echo "${ECHO_T}could not find any! Using -lX11." >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find any! Using -lX11." >&5 -+$as_echo "could not find any! Using -lX11." >&6; } - XLIBSW=-lX11 - fi - if test x"${XLIBSW}" != x ; then -@@ -7212,9 +5703,7 @@ _ACEOF - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 --echo "$as_me: error: could not find source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -7255,9 +5744,7 @@ else - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 --echo "$as_me: error: could not find source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -7289,9 +5776,7 @@ echo "$as_me: error: could not find sour - if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ - -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ - ; then -- { { echo "$as_me:$LINENO: error: could not find source file '$i'" >&5 --echo "$as_me: error: could not find source file '$i'" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find source file '$i'" "$LINENO" 5 - fi - PKG_SOURCES="$PKG_SOURCES $i" - # this assumes it is in a VPATH dir -@@ -7334,13 +5819,13 @@ fi - #-------------------------------------------------------------------- - - -- # Check whether --enable-threads or --disable-threads was given. --if test "${enable_threads+set}" = set; then -- enableval="$enable_threads" -- tcl_ok=$enableval -+ # Check whether --enable-threads was given. -+if test "${enable_threads+set}" = set; then : -+ enableval=$enable_threads; tcl_ok=$enableval - else - tcl_ok=yes --fi; -+fi -+ - - if test "${enable_threads+set}" = set; then - enableval="$enable_threads" -@@ -7358,92 +5843,56 @@ fi; - # USE_THREAD_ALLOC tells us to try the special thread-based - # allocator that significantly reduces lock contention - --cat >>confdefs.h <<\_ACEOF --#define USE_THREAD_ALLOC 1 --_ACEOF -+$as_echo "#define USE_THREAD_ALLOC 1" >>confdefs.h - - --cat >>confdefs.h <<\_ACEOF --#define _REENTRANT 1 --_ACEOF -+$as_echo "#define _REENTRANT 1" >>confdefs.h - - if test "`uname -s`" = "SunOS" ; then - --cat >>confdefs.h <<\_ACEOF --#define _POSIX_PTHREAD_SEMANTICS 1 --_ACEOF -+$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - fi - --cat >>confdefs.h <<\_ACEOF --#define _THREAD_SAFE 1 --_ACEOF -+$as_echo "#define _THREAD_SAFE 1" >>confdefs.h - -- echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 --echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6 --if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthread" >&5 -+$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; } -+if ${ac_cv_lib_pthread_pthread_mutex_init+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpthread $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pthread_mutex_init (); - int - main () - { --pthread_mutex_init (); -+return pthread_mutex_init (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pthread_pthread_mutex_init=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_pthread_pthread_mutex_init=no -+ ac_cv_lib_pthread_pthread_mutex_init=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5 --echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6 --if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5 -+$as_echo "$ac_cv_lib_pthread_pthread_mutex_init" >&6; } -+if test "x$ac_cv_lib_pthread_pthread_mutex_init" = xyes; then : - tcl_ok=yes - else - tcl_ok=no -@@ -7455,71 +5904,43 @@ fi - # defined. We could alternatively do an AC_TRY_COMPILE with - # pthread.h, but that will work with libpthread really doesn't - # exist, like AIX 4.2. [Bug: 4359] -- echo "$as_me:$LINENO: checking for __pthread_mutex_init in -lpthread" >&5 --echo $ECHO_N "checking for __pthread_mutex_init in -lpthread... $ECHO_C" >&6 --if test "${ac_cv_lib_pthread___pthread_mutex_init+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_mutex_init in -lpthread" >&5 -+$as_echo_n "checking for __pthread_mutex_init in -lpthread... " >&6; } -+if ${ac_cv_lib_pthread___pthread_mutex_init+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpthread $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char __pthread_mutex_init (); - int - main () - { --__pthread_mutex_init (); -+return __pthread_mutex_init (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pthread___pthread_mutex_init=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_pthread___pthread_mutex_init=no -+ ac_cv_lib_pthread___pthread_mutex_init=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_init" >&5 --echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_init" >&6 --if test $ac_cv_lib_pthread___pthread_mutex_init = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_mutex_init" >&5 -+$as_echo "$ac_cv_lib_pthread___pthread_mutex_init" >&6; } -+if test "x$ac_cv_lib_pthread___pthread_mutex_init" = xyes; then : - tcl_ok=yes - else - tcl_ok=no -@@ -7531,71 +5952,43 @@ fi - # The space is needed - THREADS_LIBS=" -lpthread" - else -- echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthreads" >&5 --echo $ECHO_N "checking for pthread_mutex_init in -lpthreads... $ECHO_C" >&6 --if test "${ac_cv_lib_pthreads_pthread_mutex_init+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lpthreads" >&5 -+$as_echo_n "checking for pthread_mutex_init in -lpthreads... " >&6; } -+if ${ac_cv_lib_pthreads_pthread_mutex_init+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lpthreads $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pthread_mutex_init (); - int - main () - { --pthread_mutex_init (); -+return pthread_mutex_init (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_pthreads_pthread_mutex_init=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_pthreads_pthread_mutex_init=no -+ ac_cv_lib_pthreads_pthread_mutex_init=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_mutex_init" >&5 --echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_mutex_init" >&6 --if test $ac_cv_lib_pthreads_pthread_mutex_init = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_mutex_init" >&5 -+$as_echo "$ac_cv_lib_pthreads_pthread_mutex_init" >&6; } -+if test "x$ac_cv_lib_pthreads_pthread_mutex_init" = xyes; then : - tcl_ok=yes - else - tcl_ok=no -@@ -7605,142 +5998,86 @@ fi - # The space is needed - THREADS_LIBS=" -lpthreads" - else -- echo "$as_me:$LINENO: checking for pthread_mutex_init in -lc" >&5 --echo $ECHO_N "checking for pthread_mutex_init in -lc... $ECHO_C" >&6 --if test "${ac_cv_lib_c_pthread_mutex_init+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lc" >&5 -+$as_echo_n "checking for pthread_mutex_init in -lc... " >&6; } -+if ${ac_cv_lib_c_pthread_mutex_init+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lc $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pthread_mutex_init (); - int - main () - { --pthread_mutex_init (); -+return pthread_mutex_init (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_pthread_mutex_init=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_c_pthread_mutex_init=no -+ ac_cv_lib_c_pthread_mutex_init=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_mutex_init" >&5 --echo "${ECHO_T}$ac_cv_lib_c_pthread_mutex_init" >&6 --if test $ac_cv_lib_c_pthread_mutex_init = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_mutex_init" >&5 -+$as_echo "$ac_cv_lib_c_pthread_mutex_init" >&6; } -+if test "x$ac_cv_lib_c_pthread_mutex_init" = xyes; then : - tcl_ok=yes - else - tcl_ok=no - fi - - if test "$tcl_ok" = "no"; then -- echo "$as_me:$LINENO: checking for pthread_mutex_init in -lc_r" >&5 --echo $ECHO_N "checking for pthread_mutex_init in -lc_r... $ECHO_C" >&6 --if test "${ac_cv_lib_c_r_pthread_mutex_init+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_init in -lc_r" >&5 -+$as_echo_n "checking for pthread_mutex_init in -lc_r... " >&6; } -+if ${ac_cv_lib_c_r_pthread_mutex_init+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lc_r $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char pthread_mutex_init (); - int - main () - { --pthread_mutex_init (); -+return pthread_mutex_init (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_r_pthread_mutex_init=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_c_r_pthread_mutex_init=no -+ ac_cv_lib_c_r_pthread_mutex_init=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_mutex_init" >&5 --echo "${ECHO_T}$ac_cv_lib_c_r_pthread_mutex_init" >&6 --if test $ac_cv_lib_c_r_pthread_mutex_init = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_mutex_init" >&5 -+$as_echo "$ac_cv_lib_c_r_pthread_mutex_init" >&6; } -+if test "x$ac_cv_lib_c_r_pthread_mutex_init" = xyes; then : - tcl_ok=yes - else - tcl_ok=no -@@ -7751,8 +6088,8 @@ fi - THREADS_LIBS=" -pthread" - else - TCL_THREADS=0 -- { echo "$as_me:$LINENO: WARNING: Do not know how to find pthread lib on your system - thread support disabled" >&5 --echo "$as_me: WARNING: Do not know how to find pthread lib on your system - thread support disabled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Do not know how to find pthread lib on your system - thread support disabled" >&5 -+$as_echo "$as_me: WARNING: Do not know how to find pthread lib on your system - thread support disabled" >&2;} - fi - fi - fi -@@ -7762,40 +6099,38 @@ echo "$as_me: WARNING: Do not know how t - TCL_THREADS=0 - fi - # Do checking message here to not mess up interleaved configure output -- echo "$as_me:$LINENO: checking for building with threads" >&5 --echo $ECHO_N "checking for building with threads... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for building with threads" >&5 -+$as_echo_n "checking for building with threads... " >&6; } - if test "${TCL_THREADS}" = 1; then - --cat >>confdefs.h <<\_ACEOF --#define TCL_THREADS 1 --_ACEOF -+$as_echo "#define TCL_THREADS 1" >>confdefs.h - -- echo "$as_me:$LINENO: result: yes (default)" >&5 --echo "${ECHO_T}yes (default)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (default)" >&5 -+$as_echo "yes (default)" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - # TCL_THREADS sanity checking. See if our request for building with - # threads is the same as the way Tcl was built. If not, warn the user. - case ${TCL_DEFS} in - *THREADS=1*) - if test "${TCL_THREADS}" = "0"; then -- { echo "$as_me:$LINENO: WARNING: -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: - Building ${PACKAGE_NAME} without threads enabled, but building against Tcl - that IS thread-enabled. It is recommended to use --enable-threads." >&5 --echo "$as_me: WARNING: -+$as_echo "$as_me: WARNING: - Building ${PACKAGE_NAME} without threads enabled, but building against Tcl - that IS thread-enabled. It is recommended to use --enable-threads." >&2;} - fi - ;; - *) - if test "${TCL_THREADS}" = "1"; then -- { echo "$as_me:$LINENO: WARNING: -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: - --enable-threads requested, but building against a Tcl that is NOT - thread-enabled. This is an OK configuration that will also run in - a thread-enabled core." >&5 --echo "$as_me: WARNING: -+$as_echo "$as_me: WARNING: - --enable-threads requested, but building against a Tcl that is NOT - thread-enabled. This is an OK configuration that will also run in - a thread-enabled core." >&2;} -@@ -7811,15 +6146,15 @@ echo "$as_me: WARNING: - #-------------------------------------------------------------------- - - -- echo "$as_me:$LINENO: checking how to build libraries" >&5 --echo $ECHO_N "checking how to build libraries... $ECHO_C" >&6 -- # Check whether --enable-shared or --disable-shared was given. --if test "${enable_shared+set}" = set; then -- enableval="$enable_shared" -- tcl_ok=$enableval -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5 -+$as_echo_n "checking how to build libraries... " >&6; } -+ # Check whether --enable-shared was given. -+if test "${enable_shared+set}" = set; then : -+ enableval=$enable_shared; tcl_ok=$enableval - else - tcl_ok=yes --fi; -+fi -+ - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" -@@ -7829,17 +6164,15 @@ fi; - fi - - if test "$tcl_ok" = "yes" ; then -- echo "$as_me:$LINENO: result: shared" >&5 --echo "${ECHO_T}shared" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5 -+$as_echo "shared" >&6; } - SHARED_BUILD=1 - else -- echo "$as_me:$LINENO: result: static" >&5 --echo "${ECHO_T}static" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5 -+$as_echo "static" >&6; } - SHARED_BUILD=0 - --cat >>confdefs.h <<\_ACEOF --#define STATIC_BUILD 1 --_ACEOF -+$as_echo "#define STATIC_BUILD 1" >>confdefs.h - - fi - -@@ -7856,31 +6189,31 @@ _ACEOF - - # Step 0.a: Enable 64 bit support? - -- echo "$as_me:$LINENO: checking if 64bit support is requested" >&5 --echo $ECHO_N "checking if 64bit support is requested... $ECHO_C" >&6 -- # Check whether --enable-64bit or --disable-64bit was given. --if test "${enable_64bit+set}" = set; then -- enableval="$enable_64bit" -- do64bit=$enableval -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit support is requested" >&5 -+$as_echo_n "checking if 64bit support is requested... " >&6; } -+ # Check whether --enable-64bit was given. -+if test "${enable_64bit+set}" = set; then : -+ enableval=$enable_64bit; do64bit=$enableval - else - do64bit=no --fi; -- echo "$as_me:$LINENO: result: $do64bit" >&5 --echo "${ECHO_T}$do64bit" >&6 -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bit" >&5 -+$as_echo "$do64bit" >&6; } - - # Step 0.b: Enable Solaris 64 bit VIS support? - -- echo "$as_me:$LINENO: checking if 64bit Sparc VIS support is requested" >&5 --echo $ECHO_N "checking if 64bit Sparc VIS support is requested... $ECHO_C" >&6 -- # Check whether --enable-64bit-vis or --disable-64bit-vis was given. --if test "${enable_64bit_vis+set}" = set; then -- enableval="$enable_64bit_vis" -- do64bitVIS=$enableval -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit Sparc VIS support is requested" >&5 -+$as_echo_n "checking if 64bit Sparc VIS support is requested... " >&6; } -+ # Check whether --enable-64bit-vis was given. -+if test "${enable_64bit_vis+set}" = set; then : -+ enableval=$enable_64bit_vis; do64bitVIS=$enableval - else - do64bitVIS=no --fi; -- echo "$as_me:$LINENO: result: $do64bitVIS" >&5 --echo "${ECHO_T}$do64bitVIS" >&6 -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bitVIS" >&5 -+$as_echo "$do64bitVIS" >&6; } - - if test "$do64bitVIS" = "yes"; then - # Force 64bit on with VIS -@@ -7890,27 +6223,27 @@ echo "${ECHO_T}$do64bitVIS" >&6 - # Step 0.c: Cross-compiling options for Windows/CE builds? - - if test "${TEA_PLATFORM}" = "windows" ; then -- echo "$as_me:$LINENO: checking if Windows/CE build is requested" >&5 --echo $ECHO_N "checking if Windows/CE build is requested... $ECHO_C" >&6 -- # Check whether --enable-wince or --disable-wince was given. --if test "${enable_wince+set}" = set; then -- enableval="$enable_wince" -- doWince=$enableval -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Windows/CE build is requested" >&5 -+$as_echo_n "checking if Windows/CE build is requested... " >&6; } -+ # Check whether --enable-wince was given. -+if test "${enable_wince+set}" = set; then : -+ enableval=$enable_wince; doWince=$enableval - else - doWince=no --fi; -- echo "$as_me:$LINENO: result: $doWince" >&5 --echo "${ECHO_T}$doWince" >&6 -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $doWince" >&5 -+$as_echo "$doWince" >&6; } - fi - - # Step 1: set the variable "system" to hold the name and version number - # for the system. - - -- echo "$as_me:$LINENO: checking system version" >&5 --echo $ECHO_N "checking system version... $ECHO_C" >&6 --if test "${tcl_cv_sys_version+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5 -+$as_echo_n "checking system version... " >&6; } -+if ${tcl_cv_sys_version+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - if test "${TEA_PLATFORM}" = "windows" ; then -@@ -7920,8 +6253,8 @@ else - else - tcl_cv_sys_version=`uname -s`-`uname -r` - if test "$?" -ne 0 ; then -- { echo "$as_me:$LINENO: WARNING: can't find uname command" >&5 --echo "$as_me: WARNING: can't find uname command" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find uname command" >&5 -+$as_echo "$as_me: WARNING: can't find uname command" >&2;} - tcl_cv_sys_version=unknown - else - # Special check for weird MP-RAS system (uname returns weird -@@ -7937,79 +6270,51 @@ echo "$as_me: WARNING: can't find uname - fi - - fi --echo "$as_me:$LINENO: result: $tcl_cv_sys_version" >&5 --echo "${ECHO_T}$tcl_cv_sys_version" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_sys_version" >&5 -+$as_echo "$tcl_cv_sys_version" >&6; } - system=$tcl_cv_sys_version - - - # Step 2: check for existence of -ldl library. This is needed because - # Linux can use either -ldl or -ldld for dynamic loading. - -- echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 --echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 --if test "${ac_cv_lib_dl_dlopen+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -+$as_echo_n "checking for dlopen in -ldl... " >&6; } -+if ${ac_cv_lib_dl_dlopen+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char dlopen (); - int - main () - { --dlopen (); -+return dlopen (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_dl_dlopen=no -+ ac_cv_lib_dl_dlopen=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 --echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 --if test $ac_cv_lib_dl_dlopen = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -+$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -+if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - have_dl=yes - else - have_dl=no -@@ -8048,10 +6353,10 @@ fi - TCL_EXP_FILE="" - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_AR+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if ${ac_cv_prog_AR+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -@@ -8061,26 +6366,28 @@ for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="ar" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - AR=$ac_cv_prog_AR - if test -n "$AR"; then -- echo "$as_me:$LINENO: result: $AR" >&5 --echo "${ECHO_T}$AR" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -+$as_echo "$AR" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - STLIB_LD='${AR} cr' - LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH" - case $system in -@@ -8108,28 +6415,24 @@ fi - ;; - esac - if test ! -d "${PATH64}" ; then -- { echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&5 --echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&2;} -- { echo "$as_me:$LINENO: WARNING: Ensure latest Platform SDK is installed" >&5 --echo "$as_me: WARNING: Ensure latest Platform SDK is installed" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&5 -+$as_echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ensure latest Platform SDK is installed" >&5 -+$as_echo "$as_me: WARNING: Ensure latest Platform SDK is installed" >&2;} - do64bit="no" - else -- echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5 --echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using 64-bit $MACHINE mode" >&5 -+$as_echo " Using 64-bit $MACHINE mode" >&6; } - do64bit_ok="yes" - fi - fi - - if test "$doWince" != "no" ; then - if test "$do64bit" != "no" ; then -- { { echo "$as_me:$LINENO: error: Windows/CE and 64-bit builds incompatible" >&5 --echo "$as_me: error: Windows/CE and 64-bit builds incompatible" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Windows/CE and 64-bit builds incompatible" "$LINENO" 5 - fi - if test "$GCC" = "yes" ; then -- { { echo "$as_me:$LINENO: error: Windows/CE and GCC builds incompatible" >&5 --echo "$as_me: error: Windows/CE and GCC builds incompatible" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Windows/CE and GCC builds incompatible" "$LINENO" 5 - fi - - # First, look for one uninstalled. -@@ -8139,15 +6442,15 @@ echo "$as_me: error: Windows/CE and GCC - # we reset no_celib in case something fails here - no_celib=true - --# Check whether --with-celib or --without-celib was given. --if test "${with_celib+set}" = set; then -- withval="$with_celib" -- with_celibconfig=${withval} --fi; -- echo "$as_me:$LINENO: checking for Windows/CE celib directory" >&5 --echo $ECHO_N "checking for Windows/CE celib directory... $ECHO_C" >&6 -- if test "${ac_cv_c_celibconfig+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+# Check whether --with-celib was given. -+if test "${with_celib+set}" = set; then : -+ withval=$with_celib; with_celibconfig=${withval} -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows/CE celib directory" >&5 -+$as_echo_n "checking for Windows/CE celib directory... " >&6; } -+ if ${ac_cv_c_celibconfig+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - # First check to see if --with-celibconfig was specified. -@@ -8155,9 +6458,7 @@ else - if test -d "${with_celibconfig}/inc" ; then - ac_cv_c_celibconfig=`(cd ${with_celibconfig}; pwd)` - else -- { { echo "$as_me:$LINENO: error: ${with_celibconfig} directory doesn't contain inc directory" >&5 --echo "$as_me: error: ${with_celibconfig} directory doesn't contain inc directory" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "${with_celibconfig} directory doesn't contain inc directory" "$LINENO" 5 - fi - fi - -@@ -8183,15 +6484,13 @@ echo "$as_me: error: ${with_celibconfig} - fi - - if test x"${ac_cv_c_celibconfig}" = x ; then -- { { echo "$as_me:$LINENO: error: Cannot find celib support library directory" >&5 --echo "$as_me: error: Cannot find celib support library directory" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "Cannot find celib support library directory" "$LINENO" 5 - else - no_celib= - CELIB_DIR=${ac_cv_c_celibconfig} - CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'` -- echo "$as_me:$LINENO: result: found $CELIB_DIR" >&5 --echo "${ECHO_T}found $CELIB_DIR" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $CELIB_DIR" >&5 -+$as_echo "found $CELIB_DIR" >&6; } - fi - fi - -@@ -8233,9 +6532,7 @@ echo "${ECHO_T}found $CELIB_DIR" >&6 - SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'` - if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}" \ - -o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then -- { { echo "$as_me:$LINENO: error: could not find PocketPC SDK or target compiler to enable WinCE mode $CEVERSION,$TARGETCPU,$ARCH,$PLATFORM" >&5 --echo "$as_me: error: could not find PocketPC SDK or target compiler to enable WinCE mode $CEVERSION,$TARGETCPU,$ARCH,$PLATFORM" >&2;} -- { (exit 1); exit 1; }; } -+ as_fn_error $? "could not find PocketPC SDK or target compiler to enable WinCE mode $CEVERSION,$TARGETCPU,$ARCH,$PLATFORM" "$LINENO" 5 - doWince="no" - else - # We could PATH_NOSPACE these, but that's not important, -@@ -8372,8 +6669,8 @@ _ACEOF - CC=${CC}_r - ;; - esac -- echo "$as_me:$LINENO: result: Using $CC for compiling with threads" >&5 --echo "${ECHO_T}Using $CC for compiling with threads" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $CC for compiling with threads" >&5 -+$as_echo "Using $CC for compiling with threads" >&6; } - fi - LIBS="$LIBS -lc" - SHLIB_CFLAGS="" -@@ -8386,8 +6683,8 @@ echo "${ECHO_T}Using $CC for compiling w - # Check to enable 64-bit flags for compiler/linker on AIX 4+ - if test "$do64bit" = "yes" -a "`uname -v`" -gt "3" ; then - if test "$GCC" = "yes" ; then -- { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5 --echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5 -+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;} - else - do64bit_ok=yes - CFLAGS="$CFLAGS -q64" -@@ -8425,12 +6722,10 @@ echo "$as_me: WARNING: 64bit mode not su - - # AIX v<=4.1 has some different flags than 4.2+ - if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then -- case $LIBOBJS in -- "tclLoadAix.$ac_objext" | \ -- *" tclLoadAix.$ac_objext" | \ -- "tclLoadAix.$ac_objext "* | \ -+ case " $LIBOBJS " in - *" tclLoadAix.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS tclLoadAix.$ac_objext" ;; -+ *) LIBOBJS="$LIBOBJS tclLoadAix.$ac_objext" -+ ;; - esac - - DL_LIBS="-lld" -@@ -8448,71 +6743,43 @@ esac - # deduce the timezone by comparing the localtime result on a - # known GMT value. - -- echo "$as_me:$LINENO: checking for gettimeofday in -lbsd" >&5 --echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6 --if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gettimeofday in -lbsd" >&5 -+$as_echo_n "checking for gettimeofday in -lbsd... " >&6; } -+if ${ac_cv_lib_bsd_gettimeofday+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbsd $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char gettimeofday (); - int - main () - { --gettimeofday (); -+return gettimeofday (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_bsd_gettimeofday=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_bsd_gettimeofday=no -+ ac_cv_lib_bsd_gettimeofday=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gettimeofday" >&5 --echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6 --if test $ac_cv_lib_bsd_gettimeofday = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gettimeofday" >&5 -+$as_echo "$ac_cv_lib_bsd_gettimeofday" >&6; } -+if test "x$ac_cv_lib_bsd_gettimeofday" = xyes; then : - libbsd=yes - else - libbsd=no -@@ -8521,9 +6788,7 @@ fi - if test $libbsd = yes; then - MATH_LIBS="$MATH_LIBS -lbsd" - --cat >>confdefs.h <<\_ACEOF --#define USE_DELTA_FOR_TZ 1 --_ACEOF -+$as_echo "#define USE_DELTA_FOR_TZ 1" >>confdefs.h - - fi - ;; -@@ -8540,71 +6805,43 @@ _ACEOF - # -lsocket, even if the network functions are in -lnet which - # is always linked to, for compatibility. - #----------------------------------------------------------- -- echo "$as_me:$LINENO: checking for inet_ntoa in -lbind" >&5 --echo $ECHO_N "checking for inet_ntoa in -lbind... $ECHO_C" >&6 --if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lbind" >&5 -+$as_echo_n "checking for inet_ntoa in -lbind... " >&6; } -+if ${ac_cv_lib_bind_inet_ntoa+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lbind $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char inet_ntoa (); - int - main () - { --inet_ntoa (); -+return inet_ntoa (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_bind_inet_ntoa=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_bind_inet_ntoa=no -+ ac_cv_lib_bind_inet_ntoa=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_bind_inet_ntoa" >&5 --echo "${ECHO_T}$ac_cv_lib_bind_inet_ntoa" >&6 --if test $ac_cv_lib_bind_inet_ntoa = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_ntoa" >&5 -+$as_echo "$ac_cv_lib_bind_inet_ntoa" >&6; } -+if test "x$ac_cv_lib_bind_inet_ntoa" = xyes; then : - LIBS="$LIBS -lbind -lsocket" - fi - -@@ -8643,9 +6880,7 @@ fi - HP-UX-*.11.*) - # Use updated header definitions where possible - --cat >>confdefs.h <<\_ACEOF --#define _XOPEN_SOURCE_EXTENDED 1 --_ACEOF -+$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h - - # Needed by Tcl, but not most extensions - #AC_DEFINE(_XOPEN_SOURCE, 1, [Do we want to use the XOPEN network library?]) -@@ -8656,71 +6891,43 @@ _ACEOF - else - SHLIB_SUFFIX=".sl" - fi -- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 --if test "${ac_cv_lib_dld_shl_load+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -+$as_echo_n "checking for shl_load in -ldld... " >&6; } -+if ${ac_cv_lib_dld_shl_load+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char shl_load (); - int - main () - { --shl_load (); -+return shl_load (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_dld_shl_load=no -+ ac_cv_lib_dld_shl_load=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 --if test $ac_cv_lib_dld_shl_load = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -+$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -+if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - tcl_ok=yes - else - tcl_ok=no -@@ -8760,8 +6967,8 @@ fi - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - ;; - *) -- { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5 --echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5 -+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;} - ;; - esac - else -@@ -8773,71 +6980,43 @@ echo "$as_me: WARNING: 64bit mode not su - ;; - HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*) - SHLIB_SUFFIX=".sl" -- echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 --echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 --if test "${ac_cv_lib_dld_shl_load+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -+$as_echo_n "checking for shl_load in -ldld... " >&6; } -+if ${ac_cv_lib_dld_shl_load+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-ldld $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char shl_load (); - int - main () - { --shl_load (); -+return shl_load (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_dld_shl_load=no -+ ac_cv_lib_dld_shl_load=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 --echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6 --if test $ac_cv_lib_dld_shl_load = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -+$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -+if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - tcl_ok=yes - else - tcl_ok=no -@@ -8904,8 +7083,8 @@ fi - - if test "$do64bit" = "yes" ; then - if test "$GCC" = "yes" ; then -- { echo "$as_me:$LINENO: WARNING: 64bit mode not supported by gcc" >&5 --echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported by gcc" >&5 -+$as_echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;} - else - do64bit_ok=yes - SHLIB_LD="ld -64 -shared -rdata_shared" -@@ -8936,19 +7115,15 @@ echo "$as_me: WARNING: 64bit mode not su - CFLAGS="$CFLAGS -mieee" - fi - if test $do64bit = yes; then -- echo "$as_me:$LINENO: checking if compiler accepts -m64 flag" >&5 --echo $ECHO_N "checking if compiler accepts -m64 flag... $ECHO_C" >&6 --if test "${tcl_cv_cc_m64+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -m64 flag" >&5 -+$as_echo_n "checking if compiler accepts -m64 flag... " >&6; } -+if ${tcl_cv_cc_m64+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - hold_cflags=$CFLAGS - CFLAGS="$CFLAGS -m64" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -8959,41 +7134,17 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - tcl_cv_cc_m64=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_cc_m64=no -+ tcl_cv_cc_m64=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - CFLAGS=$hold_cflags - fi --echo "$as_me:$LINENO: result: $tcl_cv_cc_m64" >&5 --echo "${ECHO_T}$tcl_cv_cc_m64" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_m64" >&5 -+$as_echo "$tcl_cv_cc_m64" >&6; } - if test $tcl_cv_cc_m64 = yes; then - CFLAGS="$CFLAGS -m64" - do64bit_ok=yes -@@ -9070,17 +7221,13 @@ echo "${ECHO_T}$tcl_cv_cc_m64" >&6 - DL_LIBS="" - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}' -- echo "$as_me:$LINENO: checking for ELF" >&5 --echo $ECHO_N "checking for ELF... $ECHO_C" >&6 --if test "${tcl_cv_ld_elf+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5 -+$as_echo_n "checking for ELF... " >&6; } -+if ${tcl_cv_ld_elf+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef __ELF__ -@@ -9089,7 +7236,7 @@ cat >>conftest.$ac_ext <<_ACEOF - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then -+ $EGREP "yes" >/dev/null 2>&1; then : - tcl_cv_ld_elf=yes - else - tcl_cv_ld_elf=no -@@ -9097,8 +7244,8 @@ fi - rm -f conftest* - - fi --echo "$as_me:$LINENO: result: $tcl_cv_ld_elf" >&5 --echo "${ECHO_T}$tcl_cv_ld_elf" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_elf" >&5 -+$as_echo "$tcl_cv_ld_elf" >&6; } - if test $tcl_cv_ld_elf = yes; then - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' - else -@@ -9126,17 +7273,13 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 - CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0' -- echo "$as_me:$LINENO: checking for ELF" >&5 --echo $ECHO_N "checking for ELF... $ECHO_C" >&6 --if test "${tcl_cv_ld_elf+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5 -+$as_echo_n "checking for ELF... " >&6; } -+if ${tcl_cv_ld_elf+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - #ifdef __ELF__ -@@ -9145,7 +7288,7 @@ cat >>conftest.$ac_ext <<_ACEOF - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then -+ $EGREP "yes" >/dev/null 2>&1; then : - tcl_cv_ld_elf=yes - else - tcl_cv_ld_elf=no -@@ -9153,8 +7296,8 @@ fi - rm -f conftest* - - fi --echo "$as_me:$LINENO: result: $tcl_cv_ld_elf" >&5 --echo "${ECHO_T}$tcl_cv_ld_elf" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_elf" >&5 -+$as_echo "$tcl_cv_ld_elf" >&6; } - if test $tcl_cv_ld_elf = yes; then - LDFLAGS=-Wl,-export-dynamic - else -@@ -9165,7 +7308,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - TCL_LIB_VERSIONS_OK=nodots - ;; -- FreeBSD-*) -+ FreeBSD-*|DragonFly-*) - # FreeBSD 3.* and greater have ELF. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="ld -Bshareable -x" -@@ -9183,7 +7326,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 - LDFLAGS="$LDFLAGS -pthread" - fi - case $system in -- FreeBSD-3.*) -+ *) - # FreeBSD-3 doesn't handle version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' -@@ -9206,19 +7349,15 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 - if test $do64bit = yes; then - case `arch` in - ppc) -- echo "$as_me:$LINENO: checking if compiler accepts -arch ppc64 flag" >&5 --echo $ECHO_N "checking if compiler accepts -arch ppc64 flag... $ECHO_C" >&6 --if test "${tcl_cv_cc_arch_ppc64+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5 -+$as_echo_n "checking if compiler accepts -arch ppc64 flag... " >&6; } -+if ${tcl_cv_cc_arch_ppc64+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - hold_cflags=$CFLAGS - CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9229,59 +7368,31 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - tcl_cv_cc_arch_ppc64=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_cc_arch_ppc64=no -+ tcl_cv_cc_arch_ppc64=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - CFLAGS=$hold_cflags - fi --echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_ppc64" >&5 --echo "${ECHO_T}$tcl_cv_cc_arch_ppc64" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_ppc64" >&5 -+$as_echo "$tcl_cv_cc_arch_ppc64" >&6; } - if test $tcl_cv_cc_arch_ppc64 = yes; then - CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5" - do64bit_ok=yes - fi;; - i386) -- echo "$as_me:$LINENO: checking if compiler accepts -arch x86_64 flag" >&5 --echo $ECHO_N "checking if compiler accepts -arch x86_64 flag... $ECHO_C" >&6 --if test "${tcl_cv_cc_arch_x86_64+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5 -+$as_echo_n "checking if compiler accepts -arch x86_64 flag... " >&6; } -+if ${tcl_cv_cc_arch_x86_64+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - hold_cflags=$CFLAGS - CFLAGS="$CFLAGS -arch x86_64" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9292,48 +7403,24 @@ main () - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - tcl_cv_cc_arch_x86_64=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_cc_arch_x86_64=no -+ tcl_cv_cc_arch_x86_64=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - CFLAGS=$hold_cflags - fi --echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_x86_64" >&5 --echo "${ECHO_T}$tcl_cv_cc_arch_x86_64" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_x86_64" >&5 -+$as_echo "$tcl_cv_cc_arch_x86_64" >&6; } - if test $tcl_cv_cc_arch_x86_64 = yes; then - CFLAGS="$CFLAGS -arch x86_64" - do64bit_ok=yes - fi;; - *) -- { echo "$as_me:$LINENO: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5 --echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};; -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5 -+$as_echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};; - esac - else - # Check for combined 32-bit and 64-bit fat build -@@ -9343,19 +7430,15 @@ echo "$as_me: WARNING: Don't know how en - fi - # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS here: - SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT}' -- echo "$as_me:$LINENO: checking if ld accepts -single_module flag" >&5 --echo $ECHO_N "checking if ld accepts -single_module flag... $ECHO_C" >&6 --if test "${tcl_cv_ld_single_module+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5 -+$as_echo_n "checking if ld accepts -single_module flag... " >&6; } -+if ${tcl_cv_ld_single_module+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - hold_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9366,41 +7449,17 @@ int i; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - tcl_cv_ld_single_module=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_ld_single_module=no -+ tcl_cv_ld_single_module=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$hold_ldflags - fi --echo "$as_me:$LINENO: result: $tcl_cv_ld_single_module" >&5 --echo "${ECHO_T}$tcl_cv_ld_single_module" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_single_module" >&5 -+$as_echo "$tcl_cv_ld_single_module" >&6; } - if test $tcl_cv_ld_single_module = yes; then - SHLIB_LD="${SHLIB_LD} -Wl,-single_module" - fi -@@ -9413,19 +7472,15 @@ echo "${ECHO_T}$tcl_cv_ld_single_module" - "`echo "${CFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4 && \ - LDFLAGS="$LDFLAGS -prebind" - LDFLAGS="$LDFLAGS -headerpad_max_install_names" -- echo "$as_me:$LINENO: checking if ld accepts -search_paths_first flag" >&5 --echo $ECHO_N "checking if ld accepts -search_paths_first flag... $ECHO_C" >&6 --if test "${tcl_cv_ld_search_paths_first+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5 -+$as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; } -+if ${tcl_cv_ld_search_paths_first+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - hold_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9436,41 +7491,17 @@ int i; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - tcl_cv_ld_search_paths_first=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_ld_search_paths_first=no -+ tcl_cv_ld_search_paths_first=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$hold_ldflags - fi --echo "$as_me:$LINENO: result: $tcl_cv_ld_search_paths_first" >&5 --echo "${ECHO_T}$tcl_cv_ld_search_paths_first" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_search_paths_first" >&5 -+$as_echo "$tcl_cv_ld_search_paths_first" >&6; } - if test $tcl_cv_ld_search_paths_first = yes; then - LDFLAGS="$LDFLAGS -Wl,-search_paths_first" - fi -@@ -9497,9 +7528,7 @@ echo "${ECHO_T}$tcl_cv_ld_search_paths_f - OS/390-*) - CFLAGS_OPTIMIZE="" # Optimizer is buggy - --cat >>confdefs.h <<\_ACEOF --#define _OE_SOCKETS 1 --_ACEOF -+$as_echo "#define _OE_SOCKETS 1" >>confdefs.h - - ;; - OSF1-1.0|OSF1-1.1|OSF1-1.2) -@@ -9630,14 +7659,10 @@ _ACEOF - # won't define thread-safe library routines. - - --cat >>confdefs.h <<\_ACEOF --#define _REENTRANT 1 --_ACEOF -+$as_echo "#define _REENTRANT 1" >>confdefs.h - - --cat >>confdefs.h <<\_ACEOF --#define _POSIX_PTHREAD_SEMANTICS 1 --_ACEOF -+$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - - SHLIB_CFLAGS="-KPIC" -@@ -9664,14 +7689,10 @@ _ACEOF - # won't define thread-safe library routines. - - --cat >>confdefs.h <<\_ACEOF --#define _REENTRANT 1 --_ACEOF -+$as_echo "#define _REENTRANT 1" >>confdefs.h - - --cat >>confdefs.h <<\_ACEOF --#define _POSIX_PTHREAD_SEMANTICS 1 --_ACEOF -+$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h - - - SHLIB_CFLAGS="-KPIC" -@@ -9682,8 +7703,8 @@ _ACEOF - if test "$arch" = "sparcv9 sparc" ; then - if test "$GCC" = "yes" ; then - if test "`gcc -dumpversion | awk -F. '{print $1}'`" -lt "3" ; then -- { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&5 --echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&5 -+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;} - else - do64bit_ok=yes - CFLAGS="$CFLAGS -m64 -mcpu=v9" -@@ -9704,16 +7725,16 @@ echo "$as_me: WARNING: 64bit mode not su - fi - elif test "$arch" = "amd64 i386" ; then - if test "$GCC" = "yes" ; then -- { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5 --echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5 -+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;} - else - do64bit_ok=yes - CFLAGS="$CFLAGS -xarch=amd64" - LDFLAGS="$LDFLAGS -xarch=amd64" - fi - else -- { echo "$as_me:$LINENO: WARNING: 64bit mode not supported for $arch" >&5 --echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported for $arch" >&5 -+$as_echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;} - fi - fi - -@@ -9754,19 +7775,15 @@ echo "$as_me: WARNING: 64bit mode not su - DL_LIBS="-ldl" - # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers - # that don't grok the -Bexport option. Test that it does. -- echo "$as_me:$LINENO: checking for ld accepts -Bexport flag" >&5 --echo $ECHO_N "checking for ld accepts -Bexport flag... $ECHO_C" >&6 --if test "${tcl_cv_ld_Bexport+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld accepts -Bexport flag" >&5 -+$as_echo_n "checking for ld accepts -Bexport flag... " >&6; } -+if ${tcl_cv_ld_Bexport+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - hold_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS -Wl,-Bexport" -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -9777,41 +7794,17 @@ int i; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - tcl_cv_ld_Bexport=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_ld_Bexport=no -+ tcl_cv_ld_Bexport=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$hold_ldflags - fi --echo "$as_me:$LINENO: result: $tcl_cv_ld_Bexport" >&5 --echo "${ECHO_T}$tcl_cv_ld_Bexport" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_Bexport" >&5 -+$as_echo "$tcl_cv_ld_Bexport" >&6; } - if test $tcl_cv_ld_Bexport = yes; then - LDFLAGS="$LDFLAGS -Wl,-Bexport" - fi -@@ -9821,21 +7814,21 @@ echo "${ECHO_T}$tcl_cv_ld_Bexport" >&6 - esac - - if test "$do64bit" = "yes" -a "$do64bit_ok" = "no" ; then -- { echo "$as_me:$LINENO: WARNING: 64bit support being disabled -- don't know magic for this platform" >&5 --echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit support being disabled -- don't know magic for this platform" >&5 -+$as_echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;} - fi - - - - # Step 4: disable dynamic loading if requested via a command-line switch. - -- # Check whether --enable-load or --disable-load was given. --if test "${enable_load+set}" = set; then -- enableval="$enable_load" -- tcl_ok=$enableval -+ # Check whether --enable-load was given. -+if test "${enable_load+set}" = set; then : -+ enableval=$enable_load; tcl_ok=$enableval - else - tcl_ok=yes --fi; -+fi -+ - if test "$tcl_ok" = "no"; then - DL_OBJS="" - fi -@@ -9909,18 +7902,14 @@ fi; - # These must be called after we do the basic CFLAGS checks and - # verify any possible 64-bit or similar switches are necessary - -- echo "$as_me:$LINENO: checking for required early compiler flags" >&5 --echo $ECHO_N "checking for required early compiler flags... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for required early compiler flags" >&5 -+$as_echo_n "checking for required early compiler flags... " >&6; } - tcl_flags="" - -- if test "${tcl_cv_flag__isoc99_source+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if ${tcl_cv_flag__isoc99_source+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int -@@ -9931,38 +7920,10 @@ char *p = (char *)strtoll; char *q = (ch - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_flag__isoc99_source=no - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #define _ISOC99_SOURCE 1 - #include -@@ -9974,58 +7935,28 @@ char *p = (char *)strtoll; char *q = (ch - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_flag__isoc99_source=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_flag__isoc99_source=no -+ tcl_cv_flag__isoc99_source=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - if test "x${tcl_cv_flag__isoc99_source}" = "xyes" ; then - --cat >>confdefs.h <<\_ACEOF --#define _ISOC99_SOURCE 1 --_ACEOF -+$as_echo "#define _ISOC99_SOURCE 1" >>confdefs.h - - tcl_flags="$tcl_flags _ISOC99_SOURCE" - fi - - -- if test "${tcl_cv_flag__largefile64_source+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if ${tcl_cv_flag__largefile64_source+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int -@@ -10036,38 +7967,10 @@ struct stat64 buf; int i = stat64("/", & - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_flag__largefile64_source=no - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #define _LARGEFILE64_SOURCE 1 - #include -@@ -10079,58 +7982,28 @@ struct stat64 buf; int i = stat64("/", & - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_flag__largefile64_source=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_flag__largefile64_source=no -+ tcl_cv_flag__largefile64_source=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - if test "x${tcl_cv_flag__largefile64_source}" = "xyes" ; then - --cat >>confdefs.h <<\_ACEOF --#define _LARGEFILE64_SOURCE 1 --_ACEOF -+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h - - tcl_flags="$tcl_flags _LARGEFILE64_SOURCE" - fi - - -- if test "${tcl_cv_flag__largefile_source64+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if ${tcl_cv_flag__largefile_source64+:} false; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int -@@ -10141,38 +8014,10 @@ char *p = (char *)open64; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_flag__largefile_source64=no - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #define _LARGEFILE_SOURCE64 1 - #include -@@ -10184,71 +8029,41 @@ char *p = (char *)open64; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_flag__largefile_source64=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_flag__largefile_source64=no -+ tcl_cv_flag__largefile_source64=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - if test "x${tcl_cv_flag__largefile_source64}" = "xyes" ; then - --cat >>confdefs.h <<\_ACEOF --#define _LARGEFILE_SOURCE64 1 --_ACEOF -+$as_echo "#define _LARGEFILE_SOURCE64 1" >>confdefs.h - - tcl_flags="$tcl_flags _LARGEFILE_SOURCE64" - fi - - if test "x${tcl_flags}" = "x" ; then -- echo "$as_me:$LINENO: result: none" >&5 --echo "${ECHO_T}none" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -+$as_echo "none" >&6; } - else -- echo "$as_me:$LINENO: result: ${tcl_flags}" >&5 --echo "${ECHO_T}${tcl_flags}" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_flags}" >&5 -+$as_echo "${tcl_flags}" >&6; } - fi - - -- echo "$as_me:$LINENO: checking for 64-bit integer type" >&5 --echo $ECHO_N "checking for 64-bit integer type... $ECHO_C" >&6 -- if test "${tcl_cv_type_64bit+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit integer type" >&5 -+$as_echo_n "checking for 64-bit integer type... " >&6; } -+ if ${tcl_cv_type_64bit+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - - tcl_cv_type_64bit=none - # See if the compiler knows natively about __int64 -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10259,44 +8074,16 @@ __int64 value = (__int64) 0; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_type_64bit=__int64 - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_type_64bit="long long" -+ tcl_type_64bit="long long" - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - # See if we should use long anyway Note that we substitute in the - # type that is our current guess for a 64-bit type inside this check - # program, so it should be modified only carefully... -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -10309,72 +8096,41 @@ switch (0) { - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_type_64bit=${tcl_type_64bit} --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - if test "${tcl_cv_type_64bit}" = none ; then - --cat >>confdefs.h <<\_ACEOF --#define TCL_WIDE_INT_IS_LONG 1 --_ACEOF -+$as_echo "#define TCL_WIDE_INT_IS_LONG 1" >>confdefs.h - -- echo "$as_me:$LINENO: result: using long" >&5 --echo "${ECHO_T}using long" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using long" >&5 -+$as_echo "using long" >&6; } - elif test "${tcl_cv_type_64bit}" = "__int64" \ - -a "${TEA_PLATFORM}" = "windows" ; then - # We actually want to use the default tcl.h checks in this - # case to handle both TCL_WIDE_INT_TYPE and TCL_LL_MODIFIER* -- echo "$as_me:$LINENO: result: using Tcl header defaults" >&5 --echo "${ECHO_T}using Tcl header defaults" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: using Tcl header defaults" >&5 -+$as_echo "using Tcl header defaults" >&6; } - else - - cat >>confdefs.h <<_ACEOF - #define TCL_WIDE_INT_TYPE ${tcl_cv_type_64bit} - _ACEOF - -- echo "$as_me:$LINENO: result: ${tcl_cv_type_64bit}" >&5 --echo "${ECHO_T}${tcl_cv_type_64bit}" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_cv_type_64bit}" >&5 -+$as_echo "${tcl_cv_type_64bit}" >&6; } - - # Now check for auxiliary declarations -- echo "$as_me:$LINENO: checking for struct dirent64" >&5 --echo $ECHO_N "checking for struct dirent64... $ECHO_C" >&6 --if test "${tcl_cv_struct_dirent64+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5 -+$as_echo_n "checking for struct dirent64... " >&6; } -+if ${tcl_cv_struct_dirent64+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - #include -@@ -10386,58 +8142,28 @@ struct dirent64 p; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_struct_dirent64=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_struct_dirent64=no -+ tcl_cv_struct_dirent64=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $tcl_cv_struct_dirent64" >&5 --echo "${ECHO_T}$tcl_cv_struct_dirent64" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_struct_dirent64" >&5 -+$as_echo "$tcl_cv_struct_dirent64" >&6; } - if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then - --cat >>confdefs.h <<\_ACEOF --#define HAVE_STRUCT_DIRENT64 1 --_ACEOF -+$as_echo "#define HAVE_STRUCT_DIRENT64 1" >>confdefs.h - - fi - -- echo "$as_me:$LINENO: checking for struct stat64" >&5 --echo $ECHO_N "checking for struct stat64... $ECHO_C" >&6 --if test "${tcl_cv_struct_stat64+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat64" >&5 -+$as_echo_n "checking for struct stat64... " >&6; } -+if ${tcl_cv_struct_stat64+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int -@@ -10449,161 +8175,40 @@ struct stat64 p; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_struct_stat64=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_struct_stat64=no -+ tcl_cv_struct_stat64=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $tcl_cv_struct_stat64" >&5 --echo "${ECHO_T}$tcl_cv_struct_stat64" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_struct_stat64" >&5 -+$as_echo "$tcl_cv_struct_stat64" >&6; } - if test "x${tcl_cv_struct_stat64}" = "xyes" ; then - --cat >>confdefs.h <<\_ACEOF --#define HAVE_STRUCT_STAT64 1 --_ACEOF -+$as_echo "#define HAVE_STRUCT_STAT64 1" >>confdefs.h - - fi - -- -- --for ac_func in open64 lseek64 --do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case declares $ac_func. -- For example, HP-UX 11i declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer to if __STDC__ is defined, since -- exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include --#else --# include --#endif -- --#undef $ac_func -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != $ac_func; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_var=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_var=no" --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 --if test `eval echo '${'$as_ac_var'}'` = yes; then -+ for ac_func in open64 lseek64 -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi - done - -- echo "$as_me:$LINENO: checking for off64_t" >&5 --echo $ECHO_N "checking for off64_t... $ECHO_C" >&6 -- if test "${tcl_cv_type_off64_t+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for off64_t" >&5 -+$as_echo_n "checking for off64_t... " >&6; } -+ if ${tcl_cv_type_off64_t+:} false; then : -+ $as_echo_n "(cached) " >&6 - else - -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include - int -@@ -10615,51 +8220,25 @@ off64_t offset; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - tcl_cv_type_off64_t=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --tcl_cv_type_off64_t=no -+ tcl_cv_type_off64_t=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - if test "x${tcl_cv_type_off64_t}" = "xyes" && \ - test "x${ac_cv_func_lseek64}" = "xyes" && \ - test "x${ac_cv_func_open64}" = "xyes" ; then - --cat >>confdefs.h <<\_ACEOF --#define HAVE_TYPE_OFF64_T 1 --_ACEOF -+$as_echo "#define HAVE_TYPE_OFF64_T 1" >>confdefs.h - -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - fi - -@@ -10672,27 +8251,27 @@ echo "${ECHO_T}no" >&6 - - - -- echo "$as_me:$LINENO: checking for build with symbols" >&5 --echo $ECHO_N "checking for build with symbols... $ECHO_C" >&6 -- # Check whether --enable-symbols or --disable-symbols was given. --if test "${enable_symbols+set}" = set; then -- enableval="$enable_symbols" -- tcl_ok=$enableval -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build with symbols" >&5 -+$as_echo_n "checking for build with symbols... " >&6; } -+ # Check whether --enable-symbols was given. -+if test "${enable_symbols+set}" = set; then : -+ enableval=$enable_symbols; tcl_ok=$enableval - else - tcl_ok=no --fi; -+fi -+ - DBGX="" - if test "$tcl_ok" = "no"; then - CFLAGS_DEFAULT="${CFLAGS_OPTIMIZE}" - LDFLAGS_DEFAULT="${LDFLAGS_OPTIMIZE}" -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else - CFLAGS_DEFAULT="${CFLAGS_DEBUG}" - LDFLAGS_DEFAULT="${LDFLAGS_DEBUG}" - if test "$tcl_ok" = "yes"; then -- echo "$as_me:$LINENO: result: yes (standard debugging)" >&5 --echo "${ECHO_T}yes (standard debugging)" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (standard debugging)" >&5 -+$as_echo "yes (standard debugging)" >&6; } - fi - fi - if test "${TEA_PLATFORM}" != "windows" ; then -@@ -10705,19 +8284,17 @@ echo "${ECHO_T}yes (standard debugging)" - - if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then - --cat >>confdefs.h <<\_ACEOF --#define TCL_MEM_DEBUG 1 --_ACEOF -+$as_echo "#define TCL_MEM_DEBUG 1" >>confdefs.h - - fi - - if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then - if test "$tcl_ok" = "all"; then -- echo "$as_me:$LINENO: result: enabled symbols mem debugging" >&5 --echo "${ECHO_T}enabled symbols mem debugging" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled symbols mem debugging" >&5 -+$as_echo "enabled symbols mem debugging" >&6; } - else -- echo "$as_me:$LINENO: result: enabled $tcl_ok debugging" >&5 --echo "${ECHO_T}enabled $tcl_ok debugging" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled $tcl_ok debugging" >&5 -+$as_echo "enabled $tcl_ok debugging" >&6; } - fi - fi - -@@ -10729,13 +8306,9 @@ echo "${ECHO_T}enabled $tcl_ok debugging - # link against the non-stubbed Tcl library. - #-------------------------------------------------------------------- - --cat >>confdefs.h <<\_ACEOF --#define USE_TCL_STUBS 1 --_ACEOF -+$as_echo "#define USE_TCL_STUBS 1" >>confdefs.h - --cat >>confdefs.h <<\_ACEOF --#define USE_TK_STUBS 1 --_ACEOF -+$as_echo "#define USE_TK_STUBS 1" >>confdefs.h - - - #-------------------------------------------------------------------- -@@ -10826,8 +8399,8 @@ _ACEOF - #-------------------------------------------------------------------- - - -- echo "$as_me:$LINENO: checking for tclsh" >&5 --echo $ECHO_N "checking for tclsh... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5 -+$as_echo_n "checking for tclsh... " >&6; } - if test -f "${TCL_BIN_DIR}/Makefile" ; then - # tclConfig.sh is in Tcl build directory - if test "${TEA_PLATFORM}" = "windows"; then -@@ -10853,13 +8426,13 @@ echo $ECHO_N "checking for tclsh... $ECH - done - TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}" - fi -- echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5 --echo "${ECHO_T}${TCLSH_PROG}" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${TCLSH_PROG}" >&5 -+$as_echo "${TCLSH_PROG}" >&6; } - - - -- echo "$as_me:$LINENO: checking for wish" >&5 --echo $ECHO_N "checking for wish... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wish" >&5 -+$as_echo_n "checking for wish... " >&6; } - if test -f "${TK_BIN_DIR}/Makefile" ; then - # tkConfig.sh is in Tk build directory - if test "${TEA_PLATFORM}" = "windows"; then -@@ -10885,8 +8458,8 @@ echo $ECHO_N "checking for wish... $ECHO - done - WISH_PROG="${REAL_TK_BIN_DIR}/${WISH_PROG}" - fi -- echo "$as_me:$LINENO: result: ${WISH_PROG}" >&5 --echo "${ECHO_T}${WISH_PROG}" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${WISH_PROG}" >&5 -+$as_echo "${WISH_PROG}" >&6; } - - - -@@ -10894,7 +8467,8 @@ echo "${ECHO_T}${WISH_PROG}" >&6 - # Finally, substitute all of the various values into the Makefile. - #-------------------------------------------------------------------- - -- ac_config_files="$ac_config_files Makefile" -+ac_config_files="$ac_config_files Makefile" -+ - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -10913,39 +8487,70 @@ _ACEOF - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -- cat confcache >$cache_file -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ if test "x$cache_file" != "x/dev/null"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} -+ if test ! -f "$cache_file" || test -h "$cache_file"; then -+ cat confcache >"$cache_file" -+ else -+ case $cache_file in #( -+ */* | ?:*) -+ mv -f confcache "$cache_file"$$ && -+ mv -f "$cache_file"$$ "$cache_file" ;; #( -+ *) -+ mv -f confcache "$cache_file" ;; -+ esac -+ fi -+ fi - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -10954,77 +8559,72 @@ test "x$prefix" = xNONE && prefix=$ac_de - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - # Transform confdefs.h into DEFS. - # Protect against shell expansion while executing Makefile rules. - # Protect against Makefile macro expansion. - # - # If the first sed substitution is executed (which looks for macros that --# take arguments), then we branch to the quote section. Otherwise, -+# take arguments), then branch to the quote section. Otherwise, - # look for a macro that doesn't take arguments. --cat >confdef2opt.sed <<\_ACEOF -+ac_script=' -+:mline -+/\\$/{ -+ N -+ s,\\\n,, -+ b mline -+} - t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -+:clear -+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g - t quote --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g - t quote --d --: quote --s,[ `~#$^&*(){}\\|;'"<>?],\\&,g --s,\[,\\&,g --s,\],\\&,g --s,\$,$$,g --p --_ACEOF --# We use echo to avoid assuming a particular line-breaking character. --# The extra dot is to prevent the shell from consuming trailing --# line-breaks from the sub-command output. A line-break within --# single-quotes doesn't work because, if this script is created in a --# platform that uses two characters for line-breaks (e.g., DOS), tr --# would break. --ac_LF_and_DOT=`echo; echo .` --DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` --rm -f confdef2opt.sed -+b any -+:quote -+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -+s/\[/\\&/g -+s/\]/\\&/g -+s/\$/$$/g -+H -+:any -+${ -+ g -+ s/^\n// -+ s/\n/ /g -+ p -+} -+' -+DEFS=`sed -n "$ac_script" confdefs.h` - - - ac_libobjs= - ac_ltlibobjs= -+U= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - - LTLIBOBJS=$ac_ltlibobjs - - -+ - CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS="" - --: ${CONFIG_STATUS=./config.status} -+: "${CONFIG_STATUS=./config.status}" -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -11034,81 +8634,253 @@ cat >$CONFIG_STATUS <<_ACEOF - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+as_myself= -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+ -+# as_fn_error STATUS ERROR [LINENO LOG_FD] -+# ---------------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with STATUS, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$1; test $as_status -eq 0 && as_status=1 -+ if test "$4"; then -+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 -+ fi -+ $as_echo "$as_me: error: $2" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -11116,148 +8888,123 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" - -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -11266,31 +9013,20 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by Tix $as_me 8.4.3, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.68. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -11298,125 +9034,117 @@ generated by GNU Autoconf 2.59. Invocat - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" - --cat >>$CONFIG_STATUS <<\_ACEOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -+ -V, --version print version number and configuration settings, then exit -+ --config print configuration, then exit -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE - - Configuration files: - $config_files - --Report bugs to ." --_ACEOF -+Report bugs to the package provider." - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" - ac_cs_version="\\ - Tix config.status 8.4.3 --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.68, -+ with options \\"\$ac_cs_config\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2010 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do - case $1 in -- --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ --*=?*) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` -+ ac_shift=: -+ ;; -+ --*=) -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg= - ac_shift=: - ;; -- -*) -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --config | --confi | --conf | --con | --co | --c ) -+ $as_echo "$ac_cs_config"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -- ac_need_defaults=false;; -- --header | --heade | --head | --hea ) -- $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ '') as_fn_error $? "missing file argument" ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; -+ --he | --h | --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error $? "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -11430,30 +9158,44 @@ if $ac_cs_silent; then - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 - -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -- -- --cat >>$CONFIG_STATUS <<\_ACEOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ case $ac_config_target in -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ -+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -11463,414 +9205,419 @@ if $ac_need_defaults; then - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ tmp= ac_tmp= -+ trap 'exit_status=$? -+ : "${ac_tmp:=$tmp}" -+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -- test -n "$tmp" && test -d "$tmp" -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && -+ test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || --{ -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 -+ac_tmp=$tmp -+ -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then -+ - -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\\r' -+else -+ ac_cs_awk_cr=$ac_cr -+fi -+ -+echo 'BEGIN {' >"$ac_tmp/subs1.awk" && - _ACEOF - --cat >>$CONFIG_STATUS <<_ACEOF - --# --# CONFIG_FILES section. --# -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 - --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@CYGPATH@,$CYGPATH,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@PKG_LIB_FILE@,$PKG_LIB_FILE,;t t --s,@PKG_STUB_LIB_FILE@,$PKG_STUB_LIB_FILE,;t t --s,@PKG_STUB_SOURCES@,$PKG_STUB_SOURCES,;t t --s,@PKG_STUB_OBJECTS@,$PKG_STUB_OBJECTS,;t t --s,@PKG_TCL_SOURCES@,$PKG_TCL_SOURCES,;t t --s,@PKG_HEADERS@,$PKG_HEADERS,;t t --s,@PKG_INCLUDES@,$PKG_INCLUDES,;t t --s,@PKG_LIBS@,$PKG_LIBS,;t t --s,@PKG_CFLAGS@,$PKG_CFLAGS,;t t --s,@TCL_VERSION@,$TCL_VERSION,;t t --s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t --s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t --s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t --s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t --s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t --s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t --s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t --s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t --s,@TCL_LIBS@,$TCL_LIBS,;t t --s,@TCL_DEFS@,$TCL_DEFS,;t t --s,@TCL_EXTRA_CFLAGS@,$TCL_EXTRA_CFLAGS,;t t --s,@TCL_LD_FLAGS@,$TCL_LD_FLAGS,;t t --s,@TCL_SHLIB_LD_LIBS@,$TCL_SHLIB_LD_LIBS,;t t --s,@TK_VERSION@,$TK_VERSION,;t t --s,@TK_BIN_DIR@,$TK_BIN_DIR,;t t --s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t --s,@TK_LIB_FILE@,$TK_LIB_FILE,;t t --s,@TK_LIB_FLAG@,$TK_LIB_FLAG,;t t --s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t --s,@TK_STUB_LIB_FILE@,$TK_STUB_LIB_FILE,;t t --s,@TK_STUB_LIB_FLAG@,$TK_STUB_LIB_FLAG,;t t --s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t --s,@TK_LIBS@,$TK_LIBS,;t t --s,@TK_XINCLUDES@,$TK_XINCLUDES,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@CPP@,$CPP,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@SET_MAKE@,$SET_MAKE,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@EGREP@,$EGREP,;t t --s,@MATH_LIBS@,$MATH_LIBS,;t t --s,@PKG_SOURCES@,$PKG_SOURCES,;t t --s,@PKG_OBJECTS@,$PKG_OBJECTS,;t t --s,@TCL_TOP_DIR_NATIVE@,$TCL_TOP_DIR_NATIVE,;t t --s,@TCL_GENERIC_DIR_NATIVE@,$TCL_GENERIC_DIR_NATIVE,;t t --s,@TCL_UNIX_DIR_NATIVE@,$TCL_UNIX_DIR_NATIVE,;t t --s,@TCL_WIN_DIR_NATIVE@,$TCL_WIN_DIR_NATIVE,;t t --s,@TCL_BMAP_DIR_NATIVE@,$TCL_BMAP_DIR_NATIVE,;t t --s,@TCL_TOOL_DIR_NATIVE@,$TCL_TOOL_DIR_NATIVE,;t t --s,@TCL_PLATFORM_DIR_NATIVE@,$TCL_PLATFORM_DIR_NATIVE,;t t --s,@TCL_INCLUDES@,$TCL_INCLUDES,;t t --s,@TK_TOP_DIR_NATIVE@,$TK_TOP_DIR_NATIVE,;t t --s,@TK_UNIX_DIR_NATIVE@,$TK_UNIX_DIR_NATIVE,;t t --s,@TK_WIN_DIR_NATIVE@,$TK_WIN_DIR_NATIVE,;t t --s,@TK_GENERIC_DIR_NATIVE@,$TK_GENERIC_DIR_NATIVE,;t t --s,@TK_XLIB_DIR_NATIVE@,$TK_XLIB_DIR_NATIVE,;t t --s,@TK_PLATFORM_DIR_NATIVE@,$TK_PLATFORM_DIR_NATIVE,;t t --s,@TK_INCLUDES@,$TK_INCLUDES,;t t --s,@CLEANFILES@,$CLEANFILES,;t t --s,@TCL_THREADS@,$TCL_THREADS,;t t --s,@SHARED_BUILD@,$SHARED_BUILD,;t t --s,@AR@,$AR,;t t --s,@CELIB_DIR@,$CELIB_DIR,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@DL_LIBS@,$DL_LIBS,;t t --s,@CFLAGS_DEBUG@,$CFLAGS_DEBUG,;t t --s,@CFLAGS_OPTIMIZE@,$CFLAGS_OPTIMIZE,;t t --s,@CFLAGS_WARNING@,$CFLAGS_WARNING,;t t --s,@STLIB_LD@,$STLIB_LD,;t t --s,@SHLIB_LD@,$SHLIB_LD,;t t --s,@SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t --s,@SHLIB_CFLAGS@,$SHLIB_CFLAGS,;t t --s,@LD_LIBRARY_PATH_VAR@,$LD_LIBRARY_PATH_VAR,;t t --s,@TCL_DBGX@,$TCL_DBGX,;t t --s,@CFLAGS_DEFAULT@,$CFLAGS_DEFAULT,;t t --s,@LDFLAGS_DEFAULT@,$LDFLAGS_DEFAULT,;t t --s,@MAKE_LIB@,$MAKE_LIB,;t t --s,@MAKE_SHARED_LIB@,$MAKE_SHARED_LIB,;t t --s,@MAKE_STATIC_LIB@,$MAKE_STATIC_LIB,;t t --s,@MAKE_STUB_LIB@,$MAKE_STUB_LIB,;t t --s,@RANLIB_STUB@,$RANLIB_STUB,;t t --s,@TCLSH_PROG@,$TCLSH_PROG,;t t --s,@WISH_PROG@,$WISH_PROG,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi --fi # test -n "$CONFIG_FILES" -+done -+rm -f conf$$subs.sh - -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\)..*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\)..*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' >$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" -+ -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } -+ -+ print line -+} -+ -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ -+ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 -+_ACEOF -+ -+# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -+h -+s/// -+s/^/:/ -+s/[ ]*$/:/ -+s/:\$(srcdir):/:/g -+s/:\${srcdir}:/:/g -+s/:@srcdir@:/:/g -+s/^:*// -+s/:*$// -+x -+s/\(=[ ]*\).*/\1/ -+G -+s/\n// -+s/^[^=]*=[ ]*$// -+}' -+fi -+ -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" -+ -+ -+eval set X " :F $CONFIG_FILES " -+shift -+for ac_tag -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$ac_tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" -+ done -+ -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} -+ fi -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$ac_tmp/stdin" \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; - esac - -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || -+ ac_dir=`$as_dirname -- "$ac_file" || - $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -- -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+_ACEOF - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -- else -- configure_input="$ac_file. " -- fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -- -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub -+ -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub - $extrasub - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - :t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ -+ >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ -+ "$ac_tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined" >&2;} - --done --_ACEOF -+ rm -f "$ac_tmp/stdin" -+ case $ac_file in -+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; -+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 -+ ;; -+ -+ -+ -+ esac -+ -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\_ACEOF - --{ (exit 0); exit 0; } -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -11890,6 +9637,10 @@ if test "$no_create" != yes; then - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit 1 -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - From 2342df5c1fe14e374710fe6b632549a3e79befee Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:03:09 +0000 Subject: [PATCH 0417/2457] Skip shared library check for non-native binaries. --- www/jalbum/Makefile | 4 +++- www/paros/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/www/jalbum/Makefile b/www/jalbum/Makefile index 6a15809df2b10..0204d76f1f4ef 100644 --- a/www/jalbum/Makefile +++ b/www/jalbum/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2012/10/28 06:30:18 asau Exp $ +# $NetBSD: Makefile,v 1.30 2016/03/25 21:03:09 joerg Exp $ DISTNAME= Jalbum${VERSION} PKGNAME= jalbum-${VERSION} @@ -24,6 +24,8 @@ INSTALLATION_DIRS+= bin ${PREFIX}/share/jalbum USE_TOOLS+= pax +CHECK_SHLIBS_SKIP+= share/jalbum/lib/* + post-extract: ${ECHO} "===> Removing invalid skins" (cd ${WRKSRC} && rm -rf skins/Chameleon/styles/Black*) diff --git a/www/paros/Makefile b/www/paros/Makefile index e7c2462489703..56f82764b2872 100644 --- a/www/paros/Makefile +++ b/www/paros/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/03/02 05:47:08 obache Exp $ +# $NetBSD: Makefile,v 1.16 2016/03/25 21:03:09 joerg Exp $ # DISTNAME= paros-3.2.13-unix @@ -41,5 +41,7 @@ do-install: @cd ${WRKDIR} && pax -rw -pm ${PKGBASE} ${DESTDIR}${PREFIX}/lib/ ${INSTALL_SCRIPT} ${WRKDIR}/paros.sh ${DESTDIR}${PREFIX}/bin/paros +CHECK_SHLIBS_SKIP+= lib/paros/libjdic.so lib/paros/libtray.so + .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" From 183a92b7d88b977776791b82d3991386bd6491ff Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:04:04 +0000 Subject: [PATCH 0418/2457] Fix PLIST. Bump revision. --- www/py-django-cms/Makefile | 3 ++- www/py-django-cms/PLIST | 10 +++++----- www/py-djangocms-picture/Makefile | 3 ++- www/py-djangocms-picture/PLIST | 4 ++-- www/py-djangocms-style/Makefile | 3 ++- www/py-djangocms-style/PLIST | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile index f29c3dfe47024..35cf6a9c3b08a 100644 --- a/www/py-django-cms/Makefile +++ b/www/py-django-cms/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2016/03/06 14:27:09 adam Exp $ +# $NetBSD: Makefile,v 1.36 2016/03/25 21:04:04 joerg Exp $ DISTNAME= django-cms-3.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= www python MASTER_SITES= http://pypi.python.org/packages/source/d/django-cms/ diff --git a/www/py-django-cms/PLIST b/www/py-django-cms/PLIST index 55983299fbfb2..72defcc6bd53f 100644 --- a/www/py-django-cms/PLIST +++ b/www/py-django-cms/PLIST @@ -1,10 +1,14 @@ -@comment $NetBSD: PLIST,v 1.24 2016/03/06 14:27:09 adam Exp $ +@comment $NetBSD: PLIST,v 1.25 2016/03/25 21:04:04 joerg Exp $ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt.py ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt.py ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe ${PYSITELIB}/${EGG_INFODIR}/requires.txt +${PYSITELIB}/${EGG_INFODIR}/requires.txt.py ${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt.py ${PYSITELIB}/cms/__init__.py ${PYSITELIB}/cms/__init__.pyc ${PYSITELIB}/cms/__init__.pyo @@ -1979,10 +1983,6 @@ ${PYSITELIB}/cms/wizards/wizard_base.pyo ${PYSITELIB}/cms/wizards/wizard_pool.py ${PYSITELIB}/cms/wizards/wizard_pool.pyc ${PYSITELIB}/cms/wizards/wizard_pool.pyo -${PYSITELIB}/django_cms-3.2.2-py3.5.egg-info/SOURCES.txt.py -${PYSITELIB}/django_cms-3.2.2-py3.5.egg-info/dependency_links.txt.py -${PYSITELIB}/django_cms-3.2.2-py3.5.egg-info/requires.txt.py -${PYSITELIB}/django_cms-3.2.2-py3.5.egg-info/top_level.txt.py ${PYSITELIB}/menus/__init__.py ${PYSITELIB}/menus/__init__.pyc ${PYSITELIB}/menus/__init__.pyo diff --git a/www/py-djangocms-picture/Makefile b/www/py-djangocms-picture/Makefile index 56c5c66c7002b..3841a7588d82d 100644 --- a/www/py-djangocms-picture/Makefile +++ b/www/py-djangocms-picture/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2016/03/06 14:34:45 adam Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/25 21:04:04 joerg Exp $ DISTNAME= djangocms-picture-0.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= www python MASTER_SITES= http://pypi.python.org/packages/source/d/djangocms-picture/ diff --git a/www/py-djangocms-picture/PLIST b/www/py-djangocms-picture/PLIST index 064a1e48f7bbb..0ba7ea6e3aec2 100644 --- a/www/py-djangocms-picture/PLIST +++ b/www/py-djangocms-picture/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2016/03/06 14:34:45 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/03/25 21:04:04 joerg Exp $ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe +${PYSITELIB}/${EGG_INFODIR}/requires.txt ${PYSITELIB}/${EGG_INFODIR}/top_level.txt -${PYSITELIB}/djangocms_picture-0.2.0-py3.5.egg-info/requires.txt ${PYSITELIB}/djangocms_picture/__init__.py ${PYSITELIB}/djangocms_picture/__init__.pyc ${PYSITELIB}/djangocms_picture/__init__.pyo diff --git a/www/py-djangocms-style/Makefile b/www/py-djangocms-style/Makefile index c3166467ddca7..ad5577370cfcd 100644 --- a/www/py-djangocms-style/Makefile +++ b/www/py-djangocms-style/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.1 2016/03/14 20:37:52 adam Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/25 21:04:04 joerg Exp $ DISTNAME= djangocms-style-1.7.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= www python MASTER_SITES= http://pypi.python.org/packages/source/d/djangocms-style/ diff --git a/www/py-djangocms-style/PLIST b/www/py-djangocms-style/PLIST index 933a42456afe4..1e49891e89578 100644 --- a/www/py-djangocms-style/PLIST +++ b/www/py-djangocms-style/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2016/03/14 20:37:52 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/25 21:04:04 joerg Exp $ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe +${PYSITELIB}/${EGG_INFODIR}/requires.txt ${PYSITELIB}/${EGG_INFODIR}/top_level.txt -${PYSITELIB}/djangocms_style-1.7.0-py3.5.egg-info/requires.txt ${PYSITELIB}/djangocms_style/__init__.py ${PYSITELIB}/djangocms_style/__init__.pyc ${PYSITELIB}/djangocms_style/__init__.pyo From 341a4d1ea6f982db9a1890d05344f841df19f2ae Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:05:10 +0000 Subject: [PATCH 0419/2457] Don't skip part of the installation to ensure all libaries are present. --- textproc/groonga/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile index df7da9c1c5a9a..a3469795d8d70 100644 --- a/textproc/groonga/Makefile +++ b/textproc/groonga/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.57 2016/03/13 09:36:59 taca Exp $ +# $NetBSD: Makefile,v 1.58 2016/03/25 21:05:10 joerg Exp $ # DISTNAME= groonga-4.1.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= textproc MASTER_SITES= http://packages.groonga.org/source/groonga/ @@ -34,6 +34,7 @@ PKG_SYSCONFSUBDIR= ${PKGBASE} BUILD_DEFS+= VARBASE +INSTALL_DIRS= ${BUILD_DIRS} ${WRKSRC}/vendor/onigmo-source INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples CONF_FILES+= share/examples/${PKGBASE}/groonga.conf \ From 88d95099d4f888c7b715ef845f2c0b2d1d1e98cd Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:05:30 +0000 Subject: [PATCH 0420/2457] Needs _KERNTYPES on NetBSD. --- sysutils/monit/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sysutils/monit/Makefile b/sysutils/monit/Makefile index b7b4c8b8d3959..bd854abf50978 100644 --- a/sysutils/monit/Makefile +++ b/sysutils/monit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/03/05 11:29:31 jperkin Exp $ +# $NetBSD: Makefile,v 1.18 2016/03/25 21:05:30 joerg Exp $ # DISTNAME= monit-5.8 @@ -56,6 +56,11 @@ SUBST_FILES.monit= monitrc SUBST_SED.monit= -e "s|^\# *set *daemon|set daemon|" SUBST_SED.monit+= -e "s|include */etc/monit.d|include ${PKG_SYSCONFDIR}/monit.d|" +.if ${OPSYS} == "NetBSD" +_WRAP_EXTRA_ARGS.CC+= -D_KERNTYPES +CWRAPPERS_APPEND.cc+= -D_KERNTYPES +.endif + # Perform configure substitutions on monit.1 post-configure: cd ${WRKSRC} && mv monit.1 monit.1.in && ./config.status --file=monit.1 From d0526d7d2a00691fe17082b4d5e8c266082a243e Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:05:55 +0000 Subject: [PATCH 0421/2457] Needs main bacula package for shared libraries. Bump revision. --- sysutils/bacula-tray-monitor/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sysutils/bacula-tray-monitor/Makefile b/sysutils/bacula-tray-monitor/Makefile index f02833a9c51e9..46ba65446c996 100644 --- a/sysutils/bacula-tray-monitor/Makefile +++ b/sysutils/bacula-tray-monitor/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2015/04/25 14:24:50 tnn Exp $ +# $NetBSD: Makefile,v 1.37 2016/03/25 21:05:55 joerg Exp $ PKGNAME= ${DISTNAME:S/-/-tray-monitor-/} -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= System tray monitor for Bacula - The Network Backup Solution DISTINFO_FILE= ${.CURDIR}/../../sysutils/bacula/distinfo @@ -18,5 +18,6 @@ INSTALL_DIRS= src/tray-monitor INSTALLATION_DIRS= sbin share/examples/bacula .include "../../sysutils/bacula/Makefile.common" +.include "../../sysutils/bacula/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" From 0e935e07685d2d90a24fc026b168c045ff6f8d09 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:06:24 +0000 Subject: [PATCH 0422/2457] Needs evince for shared libraries. --- print/evince-nautilus/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/print/evince-nautilus/Makefile b/print/evince-nautilus/Makefile index e8c10e51c88fb..0924ecc4a2d18 100644 --- a/print/evince-nautilus/Makefile +++ b/print/evince-nautilus/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.76 2016/03/05 11:29:16 jperkin Exp $ +# $NetBSD: Makefile,v 1.77 2016/03/25 21:06:24 joerg Exp $ # .include "../../print/evince/Makefile.common" PKGNAME= ${DISTNAME:S/evince/evince-nautilus/} -PKGREVISION= 37 +PKGREVISION= 38 COMMENT= File properties plugin for evince files .include "options.mk" @@ -14,6 +14,7 @@ INSTALL_DIRS= properties BUILDLINK_DEPMETHOD.libXt?= build BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.14.0 +.include "../../print/evince/buildlink3.mk" .include "../../security/libgnome-keyring/buildlink3.mk" .include "../../sysutils/nautilus/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" From e051dbaefcca55128221a13ec4b3e8e101833c54 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:06:50 +0000 Subject: [PATCH 0423/2457] _KERNTYPES is needed on newer NetBSD. --- net/gated/distinfo | 4 ++-- net/gated/patches/patch-aa | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/gated/distinfo b/net/gated/distinfo index 3e6a386ca4923..50f72ea2fa167 100644 --- a/net/gated/distinfo +++ b/net/gated/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2013/12/08 03:55:43 dholland Exp $ +$NetBSD: distinfo,v 1.12 2016/03/25 21:06:50 joerg Exp $ SHA1 (gated-3-5-11.tar.gz) = a6abdc59beb881dee06c9433b690fa6eab99fe07 RMD160 (gated-3-5-11.tar.gz) = 16624c1e2229fb783dd3bbc5759945e5e368c1f3 Size (gated-3-5-11.tar.gz) = 1565263 bytes -SHA1 (patch-aa) = 551f3b1d13e88ea5b502e8cd342eeb94b3ea1886 +SHA1 (patch-aa) = 67933e863e715b92beda5a0cb05d38600b42311e SHA1 (patch-ab) = cd5c46845530d6c746e5255fb7685ce5da6c1de3 SHA1 (patch-ad) = 0338ffe0160d72daf45c1fb641cae7baee82e13e SHA1 (patch-ae) = c02081fa9281cbe5adfab53f24c3c662fcdf9beb diff --git a/net/gated/patches/patch-aa b/net/gated/patches/patch-aa index 60126cfafd037..95abf801703c1 100644 --- a/net/gated/patches/patch-aa +++ b/net/gated/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2013/12/08 03:55:43 dholland Exp $ +$NetBSD: patch-aa,v 1.6 2016/03/25 21:06:50 joerg Exp $ --- src/configs/netbsd.orig 2004-07-10 22:21:01.000000000 +0200 +++ src/configs/netbsd @@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.5 2013/12/08 03:55:43 dholland Exp $ -cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow -cflags -O -g +#cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow -+cflags -O -g -DUSE_MMAP ++cflags -O -g -DUSE_MMAP -D_KERNTYPES ldflags -lkvm From 1218f7ee41f4ec4b813d00faea891800c081605d Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:08:09 +0000 Subject: [PATCH 0424/2457] Libtoolize to provide shared libraries. Fixes parallel build as side effect. Bump revision. --- math/arpack/Makefile | 12 ++++---- math/arpack/PLIST | 4 +-- math/arpack/files/Makefile | 59 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 math/arpack/files/Makefile diff --git a/math/arpack/Makefile b/math/arpack/Makefile index ace672effabd0..8fb0da6ede645 100644 --- a/math/arpack/Makefile +++ b/math/arpack/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2014/10/15 22:06:23 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/25 21:08:09 joerg Exp $ DISTNAME= arpack96 PKGNAME= arpack-96 +PKGREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.caam.rice.edu/software/ARPACK/SRC/ DISTFILES= arpack96.tar.gz patch.tar.gz @@ -11,12 +12,11 @@ HOMEPAGE= http://www.caam.rice.edu/software/ARPACK/SRC/ COMMENT= Library of subroutines to solve eigenvalue problems LICENSE= original-bsd -# unsafe library creation -MAKE_JOBS_SAFE= no - WRKSRC= ${WRKDIR}/ARPACK USE_LANGUAGES= fortran77 -MAKE_ENV+= WRKSRC=${WRKSRC} +MAKE_FILE= ${FILESDIR}/Makefile + +USE_LIBTOOL= yes INSTALLATION_DIRS= lib @@ -25,6 +25,6 @@ post-extract: cd ${WRKDIR} && ${TAR} -zxf ${DISTDIR}/patch.tar.gz do-install: - ${INSTALL_DATA} ${WRKSRC}/libarpack.a ${DESTDIR}${PREFIX}/lib + ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libarpack.la ${DESTDIR}${PREFIX}/lib .include "../../mk/bsd.pkg.mk" diff --git a/math/arpack/PLIST b/math/arpack/PLIST index c9496ace88b17..4305bb0a8f794 100644 --- a/math/arpack/PLIST +++ b/math/arpack/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2012/05/29 16:38:01 asau Exp $ -lib/libarpack.a +@comment $NetBSD: PLIST,v 1.2 2016/03/25 21:08:09 joerg Exp $ +lib/libarpack.la diff --git a/math/arpack/files/Makefile b/math/arpack/files/Makefile new file mode 100644 index 0000000000000..5e1ad6d4f5914 --- /dev/null +++ b/math/arpack/files/Makefile @@ -0,0 +1,59 @@ +BLAS = isamax.lo sasum.lo saxpy.lo scopy.lo sdot.lo snrm2.lo srot.lo srotg.lo \ + sscal.lo sswap.lo sgemv.lo sger.lo ssymv.lo ssyr2.lo strmm.lo sgbmv.lo \ + idamax.lo dasum.lo daxpy.lo dcopy.lo ddot.lo dnrm2.lo drot.lo drotg.lo \ + dscal.lo dswap.lo dgemv.lo dger.lo dsymv.lo dsyr2.lo dtrmm.lo dgbmv.lo \ + icamax.lo caxpy.lo ccopy.lo cdotc.lo cdotu.lo cgbmv.lo cgemv.lo cgerc.lo \ + cgeru.lo cscal.lo csscal.lo cswap.lo ctrmm.lo ctrsv.lo scasum.lo scnrm2.lo \ + izamax.lo zaxpy.lo zcopy.lo zdotc.lo zdotu.lo zgbmv.lo zgemv.lo zgerc.lo \ + zgeru.lo zscal.lo zdscal.lo zswap.lo ztrmm.lo ztrsv.lo dzasum.lo dznrm2.lo + +LAPACK= sgeqr2.lo slabad.lo slacon.lo slacpy.lo sladiv.lo slae2.lo slaev2.lo \ + slaexc.lo slagtm.lo slahqr.lo slaln2.lo slamch.lo slange.lo slanhs.lo \ + slanst.lo slanv2.lo slaptm.lo slapy2.lo slapy3.lo slaran.lo slarf.lo \ + slarfg.lo slarfx.lo slarnd.lo slarnv.lo slartg.lo slaruv.lo slascl.lo \ + slaset.lo slasr.lo slasrt.lo slassq.lo slasy2.lo sorm2r.lo ssteqr.lo \ + strevc.lo strexc.lo strsen.lo strsyl.lo \ + dgeqr2.lo dlabad.lo dlacon.lo dlacpy.lo dladiv.lo dlae2.lo dlaev2.lo \ + dlaexc.lo dlagtm.lo dlahqr.lo dlaln2.lo dlamch.lo dlange.lo dlanhs.lo \ + dlanst.lo dlanv2.lo dlaptm.lo dlapy2.lo dlapy3.lo dlaran.lo dlarf.lo \ + dlarfg.lo dlarfx.lo dlarnd.lo dlarnv.lo dlartg.lo dlaruv.lo dlascl.lo \ + dlaset.lo dlasr.lo dlasrt.lo dlassq.lo dlasy2.lo dorm2r.lo dsteqr.lo \ + dtrevc.lo dtrexc.lo dtrsen.lo dtrsyl.lo \ + ilaenv.lo lsame.lo lsamen.lo xerbla.lo xlaenv.lo \ + icmax1.lo \ + izmax1.lo \ + cgeqr2.lo clacon.lo clacpy.lo cladiv.lo clahqr.lo clange.lo clanhs.lo \ + clarf.lo clarfg.lo clarnv.lo clartg.lo clascl.lo claset.lo classq.lo \ + clatrs.lo cmach.lo crot.lo ctrevc.lo ctrexc.lo ctrsen.lo ctrsyl.lo \ + cunm2r.lo \ + scsum1.lo \ + zgeqr2.lo zlacon.lo zlacpy.lo zladiv.lo zlahqr.lo zlange.lo zlanhs.lo \ + zlarf.lo zlarfg.lo zlarnv.lo zlartg.lo zlascl.lo zlaset.lo zlassq.lo \ + zlatrs.lo zmach.lo zrot.lo ztrevc.lo ztrexc.lo ztrsen.lo ztrsyl.lo \ + zunm2r.lo \ + dzsum1.lo + +ARPACK= sgetv0.lo slaqrb.lo sstqrb.lo ssortc.lo ssortr.lo sstatn.lo sstats.lo \ + snaitr.lo snapps.lo snaup2.lo snaupd.lo snconv.lo sneigh.lo sngets.lo \ + ssaitr.lo ssapps.lo ssaup2.lo ssaupd.lo ssconv.lo sseigt.lo ssgets.lo \ + sneupd.lo sseupd.lo ssesrt.lo \ + dgetv0.lo dlaqrb.lo dstqrb.lo dsortc.lo dsortr.lo dstatn.lo dstats.lo \ + dnaitr.lo dnapps.lo dnaup2.lo dnaupd.lo dnconv.lo dneigh.lo dngets.lo \ + dsaitr.lo dsapps.lo dsaup2.lo dsaupd.lo dsconv.lo dseigt.lo dsgets.lo \ + dneupd.lo dseupd.lo dsesrt.lo \ + cnaitr.lo cnapps.lo cnaup2.lo cnaupd.lo cneigh.lo cneupd.lo cngets.lo \ + cgetv0.lo csortc.lo cstatn.lo \ + znaitr.lo znapps.lo znaup2.lo znaupd.lo zneigh.lo zneupd.lo zngets.lo \ + zgetv0.lo zsortc.lo zstatn.lo + +.SUFFIXES: .f .lo + +.PATH: BLAS LAPACK SRC + +.f.lo: + libtool --mode=compile ${FC} -o $@ -c ${FFLAGS} $< + +all: libarpack.la + +libarpack.la: ${BLAS} ${LAPACK} ${ARPACK} + libtool --mode=link ${FC} -o libarpack.la ${BLAS} ${LAPACK} ${ARPACK} -version-info 1 -rpath ${PREFIX}/lib From 7cdcabc21b0ababd1ad1d4f8d19bc52cc59cb53c Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:08:58 +0000 Subject: [PATCH 0425/2457] Drop CVP workaround for Clang, with 3.8 the memory use has gone down enough. --- math/qalculate/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile index 4aca1d4aa1b3f..881680fb09e92 100644 --- a/math/qalculate/Makefile +++ b/math/qalculate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2015/03/02 19:59:07 joerg Exp $ +# $NetBSD: Makefile,v 1.47 2016/03/25 21:08:58 joerg Exp $ DISTNAME= libqalculate-0.9.7 PKGNAME= qalculate-0.9.7 @@ -19,8 +19,6 @@ PKGCONFIG_OVERRIDE= ${WRKSRC}/libqalculate.pc.in UNLIMIT_RESOURCES= datasize -MAKE_ENV+= CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q} - SUBST_CLASSES+= pthread SUBST_FILES.pthread= libqalculate.pc.in SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g' From bf37333a86e0f1e70295d9f63d65391969f907be Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:10:36 +0000 Subject: [PATCH 0426/2457] Allow packages linking against libperl to get the rpath correctly. --- lang/perl5/buildlink3.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index 4e7cab4299175..cda18c0782729 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.57 2015/11/25 12:51:17 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.58 2016/03/25 21:10:36 joerg Exp $ BUILDLINK_TREE+= perl @@ -39,6 +39,7 @@ INSTALL_TEMPLATES+= ${.CURDIR}/../../lang/perl5/files/install_threads.tmpl # .include "../../lang/perl5/vars.mk" BUILDLINK_FILES.perl= ${PERL5_SUB_INSTALLARCHLIB}/CORE/* +BUILDLINK_RPATHDIRS.perl+= ${PERL5_SUB_INSTALLARCHLIB}/CORE .endif # PERL_BUILDLINK3_MK BUILDLINK_TREE+= -perl From 4b5a15f3568783ddd8152886327fcf962704cdec Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:11:16 +0000 Subject: [PATCH 0427/2457] Regen. --- lang/micropython/distinfo | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/micropython/distinfo b/lang/micropython/distinfo index 988255f5e934e..85a5fa53b217e 100644 --- a/lang/micropython/distinfo +++ b/lang/micropython/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2016/03/22 19:01:17 joerg Exp $ +$NetBSD: distinfo,v 1.3 2016/03/25 21:11:16 joerg Exp $ SHA1 (micropython-1.5.2/micropython-1.5.2.tar.gz) = 493cf36aa722b50b6034efb8de6433dcea546b0f RMD160 (micropython-1.5.2/micropython-1.5.2.tar.gz) = 0f5c316ecd716734fe8e1dbdf9a360ef6f126b85 SHA512 (micropython-1.5.2/micropython-1.5.2.tar.gz) = 309dcb20a3369ac5bec92a6a5cd8af37d671fc2a8e3b6a36c4c49d1f4730eaaa46dffb2351eb5783de12f045069554c22ee70c0100cf98ab09138ef42594a65a Size (micropython-1.5.2/micropython-1.5.2.tar.gz) = 6673101 bytes -SHA1 (patch-py_obj.h) = b945ad9b6c2e8dd4631c88b7c3c3d1008fe40fae -SHA1 (patch-unix_Makefile) = 302b1963bbf36dd7513380bfa34fa9cbf358aeaf -SHA1 (patch-unix_mpconfigport.h) = beb3b1b94cbb0cb81b24ef956f6f24cd86ca0194 +SHA1 (patch-py_obj.h) = f148e1e88ef6347c93fca5d367b36be805267f74 +SHA1 (patch-unix_Makefile) = e40d7413ec1140e6a408b82708f1749b3cb879bb +SHA1 (patch-unix_mpconfigport.h) = a93806f5db48cc61096a899ea3558afc46468ff1 From 773ce1e38d84b8deb42cebad8d8b6ad5ef9b3c48 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:11:47 +0000 Subject: [PATCH 0428/2457] Drop CVP memory use workaround for clang, no longer needed with 3.8. --- lang/gambc/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lang/gambc/Makefile b/lang/gambc/Makefile index bdf5e8b5521df..a48a5484d9efb 100644 --- a/lang/gambc/Makefile +++ b/lang/gambc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2015/03/02 19:59:06 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2016/03/25 21:11:47 joerg Exp $ # DISTNAME= gambc-${GAMBC_DIST_VERSION} @@ -71,8 +71,6 @@ PACKAGE_STRING= ${${PKGBASE} ${PKGVERSION}:L} .include "version.mk" -MAKE_ENV+= CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q} - .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" From 3f1c29dc7968f52ed0bc9c03a176a1ce4d8ada97 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:12:33 +0000 Subject: [PATCH 0429/2457] Doesn't support the Python 3.x C API. --- graphics/py-openexr/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/graphics/py-openexr/Makefile b/graphics/py-openexr/Makefile index 8c520eccf7298..3cd84b443a993 100644 --- a/graphics/py-openexr/Makefile +++ b/graphics/py-openexr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/02/07 20:59:19 markd Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/25 21:12:33 joerg Exp $ DISTNAME= OpenEXR-1.2.0 PKGNAME= ${PYPKGPREFIX}-openexr-1.2.0 @@ -19,6 +19,7 @@ SUBST_FILES.fix-path= setup.py SUBST_SED.fix-path= -e 's,/usr/include/OpenEXR,${BUILDLINK_PREFIX.openexr}/include/OpenEXR,' SUBST_SED.fix-path+= -e 's,/usr/local/lib,${BUILDLINK_PREFIX.openexr}/lib,' +PYTHON_VERSIONS_ACCEPTED= 27 .include "../../graphics/openexr/buildlink3.mk" .include "../../lang/python/distutils.mk" From 5e608a5c899ea9d9e9c7d3d2122dfc47a762064b Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:12:57 +0000 Subject: [PATCH 0430/2457] Support jpeg-9 API. --- graphics/cnxtview/distinfo | 4 ++-- graphics/cnxtview/patches/patch-jpeg__decode.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/graphics/cnxtview/distinfo b/graphics/cnxtview/distinfo index eaa50b4880cac..fd7777df6c88d 100644 --- a/graphics/cnxtview/distinfo +++ b/graphics/cnxtview/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2015/11/03 21:33:54 agc Exp $ +$NetBSD: distinfo,v 1.6 2016/03/25 21:12:57 joerg Exp $ SHA1 (cnxtutil-0.00-alpha.tar.gz) = bd151410026a307562ed928d72feb8aa57b2cb51 RMD160 (cnxtutil-0.00-alpha.tar.gz) = a9ef8504c8254c2f6e99cea2a1345dcdc48a6bda @@ -9,4 +9,4 @@ SHA1 (patch-ab) = e9277d522b02191e49a9d0b8ef9057b64ae0ae6b SHA1 (patch-ac) = f9502c50575ca5b8917a3c78cbcdf0bb3afe1bcf SHA1 (patch-ad) = 89fa87ebbe611e05cda5dc8087aa6d5179bbe01a SHA1 (patch-ae) = eff3d6b1c2c6e94c7d6edd5ef8375beb86b71241 -SHA1 (patch-jpeg__decode.c) = df308f9ea2e8462cc2fd31e1c69cba46e4d310c3 +SHA1 (patch-jpeg__decode.c) = e877f099541f98ba6167a0b37b2120524c190392 diff --git a/graphics/cnxtview/patches/patch-jpeg__decode.c b/graphics/cnxtview/patches/patch-jpeg__decode.c index 28cc13456902f..0f428347f9816 100644 --- a/graphics/cnxtview/patches/patch-jpeg__decode.c +++ b/graphics/cnxtview/patches/patch-jpeg__decode.c @@ -1,6 +1,6 @@ -$NetBSD: patch-jpeg__decode.c,v 1.1 2014/02/10 11:46:55 obache Exp $ +$NetBSD: patch-jpeg__decode.c,v 1.2 2016/03/25 21:12:57 joerg Exp $ -* To match prototype from jpeg>=8 libary +* To match prototype from jpeg>=9 libary --- jpeg_decode.c.orig 2004-01-13 16:40:32.000000000 +0000 +++ jpeg_decode.c @@ -9,7 +9,7 @@ GLOBAL(void) -jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * source_ptr, size_t source_length) -+jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * source_ptr, unsigned long source_length) ++jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * source_ptr, unsigned long source_length) { mem_src_ptr src; From 7667f7c892909b0b5735dfac739fdb5a2adf003a Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:13:31 +0000 Subject: [PATCH 0431/2457] The CVP memory use workaround for Clang is no longer needed with 3.8. --- games/scummvm-tools/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile index 52d4ad5f2f78a..313d0554d3701 100644 --- a/games/scummvm-tools/Makefile +++ b/games/scummvm-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2015/04/25 14:23:03 tnn Exp $ +# $NetBSD: Makefile,v 1.33 2016/03/25 21:13:31 joerg Exp $ # DISTNAME= scummvm-tools-1.4.0 @@ -19,8 +19,6 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} INSTALLATION_DIRS= bin -MAKE_ENV+= CLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q} - .include "../../audio/flac/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" From 11090448c2ee60098abed0d7e3c742f06876ca6b Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:13:51 +0000 Subject: [PATCH 0432/2457] Needs _KERNTYPES on NetBSD. --- filesystems/ori/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/filesystems/ori/Makefile b/filesystems/ori/Makefile index aff422a359128..53c32b6e9c50d 100644 --- a/filesystems/ori/Makefile +++ b/filesystems/ori/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/03/05 11:28:29 jperkin Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/25 21:13:51 joerg Exp $ DISTNAME= ori-0.8.1 PKGREVISION= 2 @@ -22,6 +22,13 @@ SUBST_FILES.man+= SConstruct SUBST_STAGE.man= pre-build SUBST_MESSAGE.man= Fixing man page installation path. +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" +_WRAP_EXTRA_ARGS.CXX+= -D_KERNTYPES +CWRAPPERS_APPEND.cxx+= -D_KERNTYPES +.endif + do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons From a8fa9bd9e3002d94457fdc40c25db482e2393ef7 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:14:19 +0000 Subject: [PATCH 0433/2457] Force extraction with bsdtar. --- devel/bazel/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile index ba1da57f73063..463a50fd85f13 100644 --- a/devel/bazel/Makefile +++ b/devel/bazel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/03/01 20:45:31 jmmv Exp $ +# $NetBSD: Makefile,v 1.2 2016/03/25 21:14:19 joerg Exp $ DISTNAME= bazel-0.2.0 CATEGORIES= devel @@ -9,6 +9,8 @@ HOMEPAGE= http://bazel.io/ COMMENT= Google's own build tool LICENSE= apache-2.0 +EXTRACT_USING= bsdtar + DEPENDS+= unzip-[0-9]*:../../archivers/unzip DEPENDS+= zip-[0-9]*:../../archivers/zip From 42540627766088c6d207aa3d5ba80afe0006d88b Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:15:07 +0000 Subject: [PATCH 0434/2457] Avoid outdated exception throwing syntax. --- databases/py-pgnotify/distinfo | 3 ++- databases/py-pgnotify/patches/patch-pgnotify.py | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 databases/py-pgnotify/patches/patch-pgnotify.py diff --git a/databases/py-pgnotify/distinfo b/databases/py-pgnotify/distinfo index df933c2db1224..1b9ecc8c95c69 100644 --- a/databases/py-pgnotify/distinfo +++ b/databases/py-pgnotify/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 01:56:28 agc Exp $ +$NetBSD: distinfo,v 1.4 2016/03/25 21:15:07 joerg Exp $ SHA1 (pgnotify-0.1.zip) = 6545a994077427b481c7fc9c511dc74f6106ae39 RMD160 (pgnotify-0.1.zip) = a48a7536a6edf330bdb1eb6b83be119ce4327e56 SHA512 (pgnotify-0.1.zip) = d1b27c89290476111a1751019b3c99af72a8904e4c56d363f0bff7ac334c8773b397ca3dd264eb26402489c8a3189181b8ad7966a312a7b4a918c87588f196e5 Size (pgnotify-0.1.zip) = 6148 bytes +SHA1 (patch-pgnotify.py) = 9b05f0685186833bad513bfd2cf0376133c9ae52 diff --git a/databases/py-pgnotify/patches/patch-pgnotify.py b/databases/py-pgnotify/patches/patch-pgnotify.py new file mode 100644 index 0000000000000..d5bcd636ba555 --- /dev/null +++ b/databases/py-pgnotify/patches/patch-pgnotify.py @@ -0,0 +1,16 @@ +$NetBSD: patch-pgnotify.py,v 1.1 2016/03/25 21:15:07 joerg Exp $ + +--- pgnotify.py.orig 2016-03-25 09:35:27.000000000 +0000 ++++ pgnotify.py +@@ -99,9 +99,9 @@ class pgnotify: + else: + self.pgconn.query('unlisten "%s"' % self.event) + self.pgconn.query('unlisten "%s"' % self.stop) +- raise pgnotifyError, \ ++ raise pgnotifyError( + 'listening for ("%s", "%s") but notified of "%s"' \ +- % (self.event, self.stop, event) ++ % (self.event, self.stop, event)) + + + From bcb868d2929c8e8d80ca74936ee41466bf77233c Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:15:33 +0000 Subject: [PATCH 0435/2457] Sync PLIST with reality. --- chat/ktp-accounts-kcm/Makefile | 4 ++-- chat/ktp-accounts-kcm/PLIST | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chat/ktp-accounts-kcm/Makefile b/chat/ktp-accounts-kcm/Makefile index ae12798bc9277..d4f5e86135310 100644 --- a/chat/ktp-accounts-kcm/Makefile +++ b/chat/ktp-accounts-kcm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/25 21:15:33 joerg Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../meta-pkgs/kde-telepathy/Makefile.common" DISTNAME= ktp-accounts-kcm-${KTP_VERSION} CATEGORIES= chat kde diff --git a/chat/ktp-accounts-kcm/PLIST b/chat/ktp-accounts-kcm/PLIST index 12d2923baf747..9a552b7612d29 100644 --- a/chat/ktp-accounts-kcm/PLIST +++ b/chat/ktp-accounts-kcm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2016/01/17 15:07:04 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/25 21:15:33 joerg Exp $ lib/kde4/kcm_ktp_accounts.so lib/kde4/ktpaccountskcm_plugin_butterfly.so lib/kde4/ktpaccountskcm_plugin_gabble.so @@ -11,7 +11,7 @@ lib/kde4/ktpaccountskcm_plugin_sipe.so lib/kde4/ktpaccountskcm_plugin_sunshine.so lib/libktpaccountskcminternal.so lib/libktpaccountskcminternal.so.4 -lib/libktpaccountskcminternal.so.4.14.3 +lib/libktpaccountskcminternal.so.4.14.15 share/kde4/services/kcm_ktp_accounts.desktop share/kde4/services/ktpaccountskcm_plugin_butterfly.desktop share/kde4/services/ktpaccountskcm_plugin_gabble.desktop From 48aa1417f48e5d7b0bfbbd3ad443317973a1728c Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:15:51 +0000 Subject: [PATCH 0436/2457] Needs pkg-config. --- chat/ktp-auth-handler/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chat/ktp-auth-handler/Makefile b/chat/ktp-auth-handler/Makefile index aa4e85aede5e8..469d5e5d0095c 100644 --- a/chat/ktp-auth-handler/Makefile +++ b/chat/ktp-auth-handler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/03/05 11:28:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2016/03/25 21:15:51 joerg Exp $ PKGREVISION= 1 .include "../../meta-pkgs/kde-telepathy/Makefile.common" @@ -13,7 +13,7 @@ COMMENT= KDE Telepathy KWallet integration module LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= c c++ -USE_TOOLS+= msgfmt +USE_TOOLS+= msgfmt pkg-config DEPENDS+= qca2-ossl-[0-9]*:../../security/qca2-ossl BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 From 4230c8ee914d7043e6768e40e50a5c15cfc7af85 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 25 Mar 2016 21:16:07 +0000 Subject: [PATCH 0437/2457] Needs automoc4. --- chat/ktp-send-file/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chat/ktp-send-file/Makefile b/chat/ktp-send-file/Makefile index 5cb1a4d4fc717..11c22130f49fc 100644 --- a/chat/ktp-send-file/Makefile +++ b/chat/ktp-send-file/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/03/05 11:28:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.3 2016/03/25 21:16:07 joerg Exp $ PKGREVISION= 1 .include "../../meta-pkgs/kde-telepathy/Makefile.common" @@ -15,6 +15,7 @@ LICENSE= gnu-lgpl-v2.1 USE_LANGUAGES= c c++ DEPENDS+= ktp-filetransfer-handler-${KTP_VERSION}{,nb[0-9]*}:../../chat/ktp-filetransfer-handler +BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 .include "../../chat/ktp-common-internals/buildlink3.mk" .include "../../chat/ktp-contact-list/buildlink3.mk" From 0a07cd7127ddb7fbd26b3628285bf580f1bccece Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sat, 26 Mar 2016 04:27:21 +0000 Subject: [PATCH 0438/2457] Fix PLIST for libind option. Reported by Mayuresh on pkgsrc-users@: http://mail-index.netbsd.org/pkgsrc-users/2016/03/24/msg023205.html Note Indic roman seems handled by --otl with harfbuzz option since 3.6.2. --- x11/mlterm/PLIST | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/x11/mlterm/PLIST b/x11/mlterm/PLIST index 0e072501b1b0e..3a2698672744c 100644 --- a/x11/mlterm/PLIST +++ b/x11/mlterm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.36 2016/03/14 16:03:36 tsutsui Exp $ +@comment $NetBSD: PLIST,v 1.37 2016/03/26 04:27:21 tsutsui Exp $ bin/mlcc bin/mlclient bin/mlclientx @@ -38,7 +38,6 @@ ${PLIST.ind}lib/mlterm/libind_kannada.la ${PLIST.ind}lib/mlterm/libind_malayalam.la ${PLIST.ind}lib/mlterm/libind_oriya.la ${PLIST.ind}lib/mlterm/libind_punjabi.la -${PLIST.ind}lib/mlterm/libind_roman.la ${PLIST.ind}lib/mlterm/libind_tamil.la ${PLIST.ind}lib/mlterm/libind_telugu.la lib/mlterm/libmotif.la From d1b8a84a089de7f34fb881ffeb30e7987791ef52 Mon Sep 17 00:00:00 2001 From: richard Date: Sat, 26 Mar 2016 07:53:32 +0000 Subject: [PATCH 0439/2457] use POSIX typedefs for u_int*_t on SunOS --- devel/libusb-compat/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devel/libusb-compat/Makefile b/devel/libusb-compat/Makefile index 613bab1678760..d4b75b7b7c7b9 100644 --- a/devel/libusb-compat/Makefile +++ b/devel/libusb-compat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2014/11/24 12:53:19 mef Exp $ +# $NetBSD: Makefile,v 1.5 2016/03/26 07:53:32 richard Exp $ DISTNAME= libusb-compat-0.1.5 CATEGORIES= devel @@ -15,6 +15,10 @@ USE_TOOLS+= pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= libusb.pc.in +CPPFLAGS.SunOS+= -Du_int8_t=uint8_t +CPPFLAGS.SunOS+= -Du_int16_t=uint16_t +CPPFLAGS.SunOS+= -Du_int32_t=uint32_t + CONFLICTS= libusb-[0-9]* .include "../../devel/libusb1/buildlink3.mk" From 37f2a246276a1074e57d40490d9e426baac7bf14 Mon Sep 17 00:00:00 2001 From: bsiegert Date: Sat, 26 Mar 2016 20:21:37 +0000 Subject: [PATCH 0440/2457] Fix opening files in directories other than the current one (no, really). From coypu in PR pkg/51010. Bump PKGREVISION. --- editors/nano/Makefile | 3 ++- editors/nano/distinfo | 3 ++- editors/nano/patches/patch-src_files.c | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 editors/nano/patches/patch-src_files.c diff --git a/editors/nano/Makefile b/editors/nano/Makefile index 900bd843c5c39..e05fdf6b144df 100644 --- a/editors/nano/Makefile +++ b/editors/nano/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2016/03/07 18:34:15 wiedi Exp $ +# $NetBSD: Makefile,v 1.54 2016/03/26 20:21:37 bsiegert Exp $ DISTNAME= nano-2.5.3 +PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= http://www.nano-editor.org/dist/v2.5/ diff --git a/editors/nano/distinfo b/editors/nano/distinfo index b171ad9944a7b..1f6dae661dfad 100644 --- a/editors/nano/distinfo +++ b/editors/nano/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.26 2016/03/07 18:34:15 wiedi Exp $ +$NetBSD: distinfo,v 1.27 2016/03/26 20:21:37 bsiegert Exp $ SHA1 (nano-2.5.3.tar.gz) = 5ab42a39283a17f61ac5f044d9eae92e41ea8114 RMD160 (nano-2.5.3.tar.gz) = 7f5d2bf718408d3a3c43e066ef66ba585b5e53ab SHA512 (nano-2.5.3.tar.gz) = 1d859f0bd88b9d907cfcaa84edc212bcaea4335c203922eb5b7378c2b45d88dffe1f3e4cb499a824d33781485834ef564997c58cf1fd92610d08f6ce8dcb67d5 Size (nano-2.5.3.tar.gz) = 1967760 bytes SHA1 (patch-configure) = 3a63b02a39000d5a15087739648b82e999d14f56 +SHA1 (patch-src_files.c) = 3416d3437743794aa909ce62b545a02576277060 diff --git a/editors/nano/patches/patch-src_files.c b/editors/nano/patches/patch-src_files.c new file mode 100644 index 0000000000000..79587bd0838b8 --- /dev/null +++ b/editors/nano/patches/patch-src_files.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src_files.c,v 1.1 2016/03/26 20:21:37 bsiegert Exp $ + +--- src/files.c.orig 2016-02-25 20:47:10.000000000 +0000 ++++ src/files.c +@@ -43,7 +43,7 @@ bool has_valid_path(const char *filename + if (strrchr(filename, '/') == NULL) + parentdir = mallocstrcpy(NULL, "."); + else +- parentdir = dirname(mallocstrcpy(NULL, filename)); ++ parentdir = mallocstrcpy(NULL, dirname(filename)); + + if (stat(parentdir, &parentinfo) == -1) { + if (errno == ENOENT) From e66a481bd77ba09cb3e061175cdba01b57256b3d Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 26 Mar 2016 23:05:10 +0000 Subject: [PATCH 0441/2457] Drop SSLv2 support. Add option for disabling SSLv3 as well. Bump revision. --- www/lhs/Makefile | 4 +-- www/lhs/distinfo | 8 +++--- www/lhs/patches/patch-ab | 12 ++++++-- www/lhs/patches/patch-ac | 50 +++++++++++++++++++++++++++++++-- www/lhs/patches/patch-configure | 9 +----- 5 files changed, 65 insertions(+), 18 deletions(-) diff --git a/www/lhs/Makefile b/www/lhs/Makefile index 548f63a079ddd..96c3f61ba39c6 100644 --- a/www/lhs/Makefile +++ b/www/lhs/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2016/03/05 11:29:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2016/03/26 23:05:10 joerg Exp $ # DISTNAME= lhs-0.1 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= www MASTER_SITES= ftp://dev.null.pl/pub/ diff --git a/www/lhs/distinfo b/www/lhs/distinfo index b39a63966fa27..2ccc745d6de99 100644 --- a/www/lhs/distinfo +++ b/www/lhs/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.4 2015/11/04 02:46:56 agc Exp $ +$NetBSD: distinfo,v 1.5 2016/03/26 23:05:10 joerg Exp $ SHA1 (lhs-0.1.tar.gz) = 74fbb0a982cd00c668c9f07b7c3c583759f14fd6 RMD160 (lhs-0.1.tar.gz) = 176d8149d11383fc4d82e4a13991f156f3ab42ca SHA512 (lhs-0.1.tar.gz) = 38eaa65eea5e2ac1ec914e2a88d10402abab6d3f03349d24d4f0c7236f829ba7c775b0745fd8c87891e45819e47896b01f4e425b257e45c2a49f9e7845c0654a Size (lhs-0.1.tar.gz) = 10665 bytes SHA1 (patch-aa) = 682df4329c32b01438221ba78055761468ede8fa -SHA1 (patch-ab) = 83591e01fc71e4d487b5a4b5d598a60f83d22fa9 -SHA1 (patch-ac) = 66e697aa31f17519c700bd7ba857c1faefe7dda6 -SHA1 (patch-configure) = 87b38dd13938dc9756530d34497502924ccff121 +SHA1 (patch-ab) = a066f92aa5f47e85863b23e92247c2fad8f3c5bf +SHA1 (patch-ac) = 5359e9a017dc3e9ca4199b52691eb8727bdfa1f5 +SHA1 (patch-configure) = 21e675f56bd36f6bb880cb0179db952fa18a25a3 diff --git a/www/lhs/patches/patch-ab b/www/lhs/patches/patch-ab index d06332257068a..739dcd259a802 100644 --- a/www/lhs/patches/patch-ab +++ b/www/lhs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2012/12/26 17:12:57 ryoon Exp $ +$NetBSD: patch-ab,v 1.3 2016/03/26 23:05:10 joerg Exp $ --- lhs.h.orig 2001-02-25 14:48:00.000000000 +0000 +++ lhs.h -@@ -7,7 +7,10 @@ +@@ -7,14 +7,17 @@ #define VERSION "lhs/0.1" @@ -13,3 +13,11 @@ $NetBSD: patch-ab,v 1.2 2012/12/26 17:12:57 ryoon Exp $ #define DEFAULT_HTTP_PORT 8000 #define DEFAULT_HTTPS_PORT 8001 #define DEFAULT_MAX_SOCKS 50 + + #ifdef USE_SSL + #include +-#define DEFAULT_SSL_PROTOCOL SSL2_VERSION ++#define DEFAULT_SSL_PROTOCOL TLS1_VERSION + #define DEFAULT_CERT_FILE "lhs.pem" + #endif + diff --git a/www/lhs/patches/patch-ac b/www/lhs/patches/patch-ac index bc6d63f5d55ab..652e768f87340 100644 --- a/www/lhs/patches/patch-ac +++ b/www/lhs/patches/patch-ac @@ -1,6 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2012/12/26 17:12:57 ryoon Exp $ +$NetBSD: patch-ac,v 1.3 2016/03/26 23:05:10 joerg Exp $ * Include sys/filio.h for FIONBIO etc. +* Drop SSLv2 support +* Add TLSv1 support --- lhs.c.orig 2001-02-27 17:37:10.000000000 +0000 +++ lhs.c @@ -14,7 +16,40 @@ $NetBSD: patch-ac,v 1.2 2012/12/26 17:12:57 ryoon Exp $ #define debug(x...) { if (verbose) printf(x); } -@@ -592,7 +595,7 @@ void usage(char *a0) +@@ -467,12 +470,10 @@ int init_ssl() + SSL_load_error_strings(); + SSLeay_add_ssl_algorithms(); + +- if (ssl_protocol == SSL2_VERSION) +- ctx = SSL_CTX_new(SSLv2_method()); +- else { +- ctx = SSL_CTX_new(SSLv23_method()); +- SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); +- } ++ ctx = SSL_CTX_new(SSLv23_method()); ++ SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); ++ if (ssl_protocol == TLS1_VERSION) ++ SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3); + if (!ctx) { + fprintf(stderr, "SSL_CTX_new failed.\n"); + return 0; +@@ -512,12 +513,12 @@ SSL *init_ssl_socket(int sock) + } + // SSL_set_session_id_context(ssl,AppContext,sizeof(AppContext)); + switch(ssl->session->ssl_version) { +- case SSL2_VERSION: +- debug("ssl2\n"); +- break; + case SSL3_VERSION: + debug("ssl3\n"); + break; ++ case TLS1_VERSION: ++ debug("tls3\n"); ++ break; + default: + debug("nieznany standard szyfrowania\n"); + } +@@ -592,7 +593,7 @@ void usage(char *a0) " -s version set SSL protocol version (default: SSLv2)\n" " -c filename load certificate file (default: lhs.pem)\n" #endif @@ -23,3 +58,14 @@ $NetBSD: patch-ac,v 1.2 2012/12/26 17:12:57 ryoon Exp $ " -u user switch to other user after startup\n" " -g group change gid to other than user's\n" " -m socks set number of sockets (default: 50, min: 3)\n" +@@ -633,8 +634,8 @@ int main(int argc, char **argv) + cert_file = optarg; + break; + case 's': +- if (!strcasecmp(optarg, "ssl2") || !strcasecmp(optarg, "sslv2")) +- ssl_protocol = SSL2_VERSION; ++ if (!strcasecmp(optarg, "tls1") || !strcasecmp(optarg, "tls1")) ++ ssl_protocol = TLS1_VERSION; + else if (!strcasecmp(optarg, "ssl3") || !strcasecmp(optarg, "sslv3")) + ssl_protocol = SSL3_VERSION; + else { diff --git a/www/lhs/patches/patch-configure b/www/lhs/patches/patch-configure index 78ada54092c7c..ca2257a3fc03c 100644 --- a/www/lhs/patches/patch-configure +++ b/www/lhs/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.1 2012/12/26 17:12:57 ryoon Exp $ +$NetBSD: patch-configure,v 1.2 2016/03/26 23:05:10 joerg Exp $ * Catch LIBS from pkgsrc Makefile @@ -10,10 +10,3 @@ $NetBSD: patch-configure,v 1.1 2012/12/26 17:12:57 ryoon Exp $ rm -f Makefile config.h if [ -f /usr/include/netinet/ip6.h ]; then echo "#define USE_IPV6" >> config.h -@@ -10,4 +9,4 @@ if [ -f /usr/include/openssl/ssl.h ]; th - echo "openssl includes found." - LIBS="$LIBS -lssl -lcrypto" - fi --sed "s/#LIBS#/$LIBS/g" < Makefile.in > Makefile -\ No newline at end of file -+sed "s/#LIBS#/$LIBS/g" < Makefile.in > Makefile From a59e70e577e162153237f5f381ff55f311f55a0f Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 26 Mar 2016 23:07:13 +0000 Subject: [PATCH 0442/2457] Use external rake, the included version fails on NetBSD current. --- multimedia/mkvtoolnix/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index d24cada4abe69..21cb9b39f5be3 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2016/03/13 09:36:58 taca Exp $ +# $NetBSD: Makefile,v 1.78 2016/03/26 23:07:13 joerg Exp $ DISTNAME= mkvtoolnix-5.0.1 PKGREVISION= 27 @@ -27,7 +27,9 @@ LDFLAGS.SunOS+= -lintl INSTALL_ENV+= SHELL=${SH:Q} -.include "../../mk/bsd.prefs.mk" +.include "../../lang/ruby/rubyversion.mk" + +BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-rake>=0.8.7:../../devel/ruby-rake .if !empty(MAKE_JOBS) DRAKE_ARGS= -j${MAKE_JOBS} @@ -36,18 +38,13 @@ DRAKE_ARGS= # empty .endif do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ruby drake ${DRAKE_ARGS} + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/${RAKE_NAME} ${DRAKE_ARGS} do-install: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ruby drake install + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} ${LOCALBASE}/bin/${RAKE_NAME} install .include "options.mk" -.if ${OPSYS} != "Darwin" -.include "../../lang/ruby/buildlink3.mk" -BUILDLINK_DEPMETHOD.${RUBY_BASE}= build -.endif - .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/lzo/buildlink3.mk" .include "../../audio/flac/buildlink3.mk" From 289ef4332c0f044c6fc7bec6c22c55b6e319ce59 Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 26 Mar 2016 23:26:14 +0000 Subject: [PATCH 0443/2457] Don't try to define max_align_t in C11 or C++11 mode. --- devel/xulrunner10/distinfo | 3 ++- .../patch-media_libnestegg_src_align.h | 14 ++++++++++ devel/xulrunner17/distinfo | 3 ++- .../patch-media_libnestegg_src_align.h | 14 ++++++++++ editors/xemacs-current/distinfo | 3 ++- .../xemacs-current/patches/patch-src_lisp.h | 20 ++++++++++++++ editors/xemacs/distinfo | 4 +-- editors/xemacs/patches/patch-src_lisp.h | 26 +++++++++++-------- 8 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 devel/xulrunner10/patches/patch-media_libnestegg_src_align.h create mode 100644 devel/xulrunner17/patches/patch-media_libnestegg_src_align.h create mode 100644 editors/xemacs-current/patches/patch-src_lisp.h diff --git a/devel/xulrunner10/distinfo b/devel/xulrunner10/distinfo index c3c51d4793eba..f0c8d3ccb4546 100644 --- a/devel/xulrunner10/distinfo +++ b/devel/xulrunner10/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2015/11/03 03:29:39 agc Exp $ +$NetBSD: distinfo,v 1.19 2016/03/26 23:26:14 joerg Exp $ SHA1 (firefox-10.0.12esr.source.tar.bz2) = d9086cabf06e04ef5200a8731288c0df27eb84d7 RMD160 (firefox-10.0.12esr.source.tar.bz2) = b112325fa37435d62e5e2737f2e87caf58f25b3c @@ -82,6 +82,7 @@ SHA1 (patch-ma) = 247368e8cd2a2ce6cb2d21a2ebd942dc5b410e7a SHA1 (patch-mb) = e2a63c095399de1f1dbd6abad08df09bbec446d7 SHA1 (patch-md) = aa4edf887d1b2cfb29e845fa514dd0867f78d6bb SHA1 (patch-me) = c88f67ceedfb910f83f5a13d1696736386d54c93 +SHA1 (patch-media_libnestegg_src_align.h) = 9d5b11be15a24435f45a44a3df59dfa6d55782a6 SHA1 (patch-media_libvpx_vpx__config.h) = e80d16bc127f4b06924e911aa60a74b2c533e73b SHA1 (patch-media_libvpx_vpx__config__c.c) = b099f480176225df5cc2f5776b35099dca0bbb4c SHA1 (patch-mf) = ab10485bd3f702ca0c5e2289342576193872abcf diff --git a/devel/xulrunner10/patches/patch-media_libnestegg_src_align.h b/devel/xulrunner10/patches/patch-media_libnestegg_src_align.h new file mode 100644 index 0000000000000..95938cba6227c --- /dev/null +++ b/devel/xulrunner10/patches/patch-media_libnestegg_src_align.h @@ -0,0 +1,14 @@ +$NetBSD: patch-media_libnestegg_src_align.h,v 1.1 2016/03/26 23:26:14 joerg Exp $ + +--- media/libnestegg/src/align.h.orig 2016-03-26 12:36:49.221957164 +0000 ++++ media/libnestegg/src/align.h +@@ -30,7 +30,9 @@ union max_align + void (*q)(void); + }; + ++#if (__STDC_VERSION__ - 0) < 201112L && (__cplusplus - 0) < 201103L + typedef union max_align max_align_t; ++#endif + + #endif + diff --git a/devel/xulrunner17/distinfo b/devel/xulrunner17/distinfo index c6e0149a73c7b..530fda60183ff 100644 --- a/devel/xulrunner17/distinfo +++ b/devel/xulrunner17/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2016/01/20 22:14:13 ryoon Exp $ +$NetBSD: distinfo,v 1.21 2016/03/26 23:26:14 joerg Exp $ SHA1 (firefox-17.0.11esr.source.tar.bz2) = 593153bc2658be0bdf6d1361a079d4ce8fd516bd RMD160 (firefox-17.0.11esr.source.tar.bz2) = 9797f1553bf20008e62df2713a22c5844e7e3bdc @@ -83,6 +83,7 @@ SHA1 (patch-mb) = d1348344ad269df7008d857417551c594c9b9195 SHA1 (patch-md) = 1369069901aacaa47d76753772236fe159d42362 SHA1 (patch-me) = 93d5ef914cb00389cd5c2d92d228f47ec2436cb3 SHA1 (patch-media_libcubeb_src_Makefile.in) = a5026b121bca81043340104d331b6343953d5dc8 +SHA1 (patch-media_libnestegg_src_align.h) = 9d5b11be15a24435f45a44a3df59dfa6d55782a6 SHA1 (patch-media_libsydneyaudio_src_Makefile.in) = 7e55e41cdbcd193f57beb417e4b5c3511e8ddae0 SHA1 (patch-media_libsydneyaudio_src_sydney_audio_pulseaudio.c) = 75b828c074ccc71ff430795e2b044bebd8ff69eb SHA1 (patch-mf) = 6d314e67e9ad99c43faf0aea53dd67a77802ba8a diff --git a/devel/xulrunner17/patches/patch-media_libnestegg_src_align.h b/devel/xulrunner17/patches/patch-media_libnestegg_src_align.h new file mode 100644 index 0000000000000..95938cba6227c --- /dev/null +++ b/devel/xulrunner17/patches/patch-media_libnestegg_src_align.h @@ -0,0 +1,14 @@ +$NetBSD: patch-media_libnestegg_src_align.h,v 1.1 2016/03/26 23:26:14 joerg Exp $ + +--- media/libnestegg/src/align.h.orig 2016-03-26 12:36:49.221957164 +0000 ++++ media/libnestegg/src/align.h +@@ -30,7 +30,9 @@ union max_align + void (*q)(void); + }; + ++#if (__STDC_VERSION__ - 0) < 201112L && (__cplusplus - 0) < 201103L + typedef union max_align max_align_t; ++#endif + + #endif + diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo index 4722fd497fb6e..65a96053ea25c 100644 --- a/editors/xemacs-current/distinfo +++ b/editors/xemacs-current/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2016/01/29 15:46:48 joerg Exp $ +$NetBSD: distinfo,v 1.28 2016/03/26 23:26:14 joerg Exp $ SHA1 (xemacs-21.5.27.tar.gz) = 55fc3e9c8fe3cac92791ffe1a0870aeae1baf0b8 RMD160 (xemacs-21.5.27.tar.gz) = ee0caff8730c999d37aa3a19b19f23d5756837ad @@ -20,3 +20,4 @@ SHA1 (patch-am) = 0ccbead4be5da92e73a15432ff1b063da13cf0b4 SHA1 (patch-an) = f382865087f011ea3806d707cbf784fac81ad746 SHA1 (patch-src_config.h.in) = 8032e1a040b46131763d40e625a1b7e841f9b233 SHA1 (patch-src_glyphs-eimage.c) = a382113190a65d27747a90e58294a41f3bb6df42 +SHA1 (patch-src_lisp.h) = a99b2c3a25c5a20f654ca217234dc49b2424262d diff --git a/editors/xemacs-current/patches/patch-src_lisp.h b/editors/xemacs-current/patches/patch-src_lisp.h new file mode 100644 index 0000000000000..3c1f09fef3ea3 --- /dev/null +++ b/editors/xemacs-current/patches/patch-src_lisp.h @@ -0,0 +1,20 @@ +$NetBSD: patch-src_lisp.h,v 1.1 2016/03/26 23:26:14 joerg Exp $ + +--- src/lisp.h.orig 2016-03-26 13:47:05.129185443 +0000 ++++ src/lisp.h +@@ -957,6 +957,7 @@ typedef int Boolint; + + /* No type has a greater alignment requirement than max_align_t. + (except perhaps for types we don't use, like long double) */ ++#if (__STDC_VERSION__ - 0) < 201112L && (__cplusplus - 0) < 201103L + typedef union + { + struct { long l; } l; +@@ -964,6 +965,7 @@ typedef union + struct { void (*f)(void); } f; + struct { double d; } d; + } max_align_t; ++#endif + + /* ALIGNOF returns the required alignment of a type -- i.e. a value such + that data of this type must begin at a memory address which is a diff --git a/editors/xemacs/distinfo b/editors/xemacs/distinfo index 67bf8157eaffd..ca02c20458b64 100644 --- a/editors/xemacs/distinfo +++ b/editors/xemacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2016/01/17 07:51:34 richard Exp $ +$NetBSD: distinfo,v 1.22 2016/03/26 23:26:14 joerg Exp $ SHA1 (xemacs/xemacs-21.4.23.tar.gz) = b57bc569cf8d376c1e2443b6ea1f40d30271e9a6 RMD160 (xemacs/xemacs-21.4.23.tar.gz) = 9df94c576b546a4df30c29ed3b5609ee816ad43c @@ -20,6 +20,6 @@ SHA1 (patch-src_Makefile.in.in) = 28098f18870c34165b37fe11e84cbd6f5584bc63 SHA1 (patch-src_config.h.in) = 9a031ace4ca6f89dacbf599484d9fcd410d7841f SHA1 (patch-src_dired.c) = 98f1c076c29385e3d5052cdb84d067f6cec8bc22 SHA1 (patch-src_glyphs-eimage.c) = ea561758dd454003eb3274508087fd302d9d9fd4 -SHA1 (patch-src_lisp.h) = 92f866c17745a3bf664c3c1153249f15fffb1866 +SHA1 (patch-src_lisp.h) = eb3247faef98f889cd6c95584395f97b1d29e2f7 SHA1 (patch-src_unexelf.c) = 738d09ea8a3d10b609e474b0efb8806d3e302bf9 SHA1 (patch-src_unexfreebsd.c) = 89ce80b21fa5d6cf8be98762183c6a8b0d8f71dd diff --git a/editors/xemacs/patches/patch-src_lisp.h b/editors/xemacs/patches/patch-src_lisp.h index 63e04f31d6a27..c65f23ff5251c 100644 --- a/editors/xemacs/patches/patch-src_lisp.h +++ b/editors/xemacs/patches/patch-src_lisp.h @@ -1,16 +1,20 @@ -$NetBSD: patch-src_lisp.h,v 1.2 2015/02/04 09:19:20 hauke Exp $ +$NetBSD: patch-src_lisp.h,v 1.3 2016/03/26 23:26:14 joerg Exp $ ---- src/lisp.h.orig 2015-01-29 15:04:29.000000000 +0000 +--- src/lisp.h.orig 2016-03-26 15:03:47.482901440 +0000 +++ src/lisp.h -@@ -265,6 +265,11 @@ void assert_failed (const char *, int, c - /*#define REGISTER register*/ - /*#endif*/ +@@ -195,6 +195,7 @@ void xfree (void *); -+#if SIZEOF_LONG == 8 -+#define UINT_64_BIT unsigned long -+#elif SIZEOF_LONG_LONG == 8 -+#define UINT_64_BIT unsigned long long + /* No type has a greater alignment requirement than max_align_t. + (except perhaps for types we don't use, like long double) */ ++#if (__STDC_VERSION__ - 0) < 201112L && (__cplusplus - 0) < 201103L + typedef union + { + struct { long l; } l; +@@ -202,6 +203,7 @@ typedef union + struct { void (*f)(void); } f; + struct { double d; } d; + } max_align_t; +#endif - /* EMACS_INT is the underlying integral type into which a Lisp_Object must fit. - In particular, it must be large enough to contain a pointer. + #ifndef ALIGNOF + # if defined (__GNUC__) && (__GNUC__ >= 2) From 0129c44193220fc1359e00dac914552a845cef2f Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 26 Mar 2016 23:45:21 +0000 Subject: [PATCH 0444/2457] Fix rpath. Bump revision. --- graphics/MesaLib7/Makefile | 6 ++-- graphics/MesaLib7/distinfo | 4 +-- graphics/MesaLib7/patches/patch-configure.ac | 29 +++++++++++++++++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/graphics/MesaLib7/Makefile b/graphics/MesaLib7/Makefile index 143a936c1fda5..89535209d5be5 100644 --- a/graphics/MesaLib7/Makefile +++ b/graphics/MesaLib7/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2016/02/25 13:37:46 jperkin Exp $ +# $NetBSD: Makefile,v 1.6 2016/03/26 23:45:21 joerg Exp $ DISTNAME?= ${MESA_DISTNAME} PKGNAME= MesaLib7-${MESA_PKGVERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MESA_SITES} EXTRACT_SUFX= .tar.bz2 @@ -29,6 +29,8 @@ CONFLICTS+= xf86driproto<2.0.4 PLIST_VARS= dri nodri +BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/MesaLib7/lib + PKGCONFIG_OVERRIDE+= src/mesa/drivers/dri/dri.pc.in PKGCONFIG_OVERRIDE+= src/mesa/gl.pc.in PKGCONFIG_OVERRIDE+= src/mesa/osmesa.pc.in diff --git a/graphics/MesaLib7/distinfo b/graphics/MesaLib7/distinfo index 8eda1d75aba48..722943bfd3cef 100644 --- a/graphics/MesaLib7/distinfo +++ b/graphics/MesaLib7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 21:33:51 agc Exp $ +$NetBSD: distinfo,v 1.3 2016/03/26 23:45:21 joerg Exp $ SHA1 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 5981ac2de8438e5f4a1f3561f2044d700c5f0de9 RMD160 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea @@ -6,7 +6,7 @@ SHA512 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = f9f93aeb5ba3e4f0cdd7041a7bba6cd18d Size (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 6257280 bytes SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba SHA1 (patch-bin_mklib) = 8c54bf5382541cab9d971b0e0e627035db1af468 -SHA1 (patch-configure.ac) = 0e3f9a1f21ba3a50161312683e9a0ad36f9f3e61 +SHA1 (patch-configure.ac) = a35dabc387d78282b3eadf3be98380cb84b796d7 SHA1 (patch-include_GL_gl.h) = a97ab309556c78d818d0b8bd867b5f2412c141b0 SHA1 (patch-src_gallium_auxiliary_util_u__atomic.h) = 68ba9694aca506add2aa96a6892a7227481c2c11 SHA1 (patch-src_gallium_include_pipe_p__config.h) = 34f4c2a033dd7a494dd3f51db407002a3388f84e diff --git a/graphics/MesaLib7/patches/patch-configure.ac b/graphics/MesaLib7/patches/patch-configure.ac index 64e36587d3f13..0940fba211971 100644 --- a/graphics/MesaLib7/patches/patch-configure.ac +++ b/graphics/MesaLib7/patches/patch-configure.ac @@ -1,4 +1,4 @@ -$NetBSD: patch-configure.ac,v 1.1 2015/04/05 17:01:37 tnn Exp $ +$NetBSD: patch-configure.ac,v 1.2 2016/03/26 23:45:21 joerg Exp $ --- configure.ac.orig 2011-10-15 00:43:58.000000000 +0000 +++ configure.ac @@ -11,3 +11,30 @@ $NetBSD: patch-configure.ac,v 1.1 2015/04/05 17:01:37 tnn Exp $ ;; cygwin*) DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER" +@@ -1430,7 +1432,7 @@ if test "x$enable_glu" = xyes; then + GLU_PC_LIB_PRIV="-lm" + if test "$enable_static" = no; then + GLU_LIB_DEPS="-lm" +- GLU_MESA_DEPS='-l$(GL_LIB)' ++ GLU_MESA_DEPS='$(COMPILER_RPATH_FLAG)$(prefix)/lib -l$(GL_LIB)' + else + GLU_LIB_DEPS="" + GLU_MESA_DEPS="" +@@ -1509,7 +1511,7 @@ if test "x$enable_glw" = xyes; then + # If static, empty GLW_LIB_DEPS and add libs for programs to link + GLW_PC_LIB_PRIV="$GLW_PC_LIB_PRIV" + if test "$enable_static" = no; then +- GLW_MESA_DEPS='-l$(GL_LIB)' ++ GLW_MESA_DEPS='$(COMPILER_RPATH_FLAG)$(prefix)/lib -l$(GL_LIB)' + GLW_LIB_DEPS="$GLW_LIB_DEPS" + else + APP_LIB_DEPS="$APP_LIB_DEPS $GLW_LIB_DEPS" +@@ -1574,7 +1576,7 @@ if test "x$enable_glut" = xyes; then + + # If static, empty GLUT_LIB_DEPS and add libs for programs to link + if test "$enable_static" = no; then +- GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)' ++ GLUT_MESA_DEPS='$(COMPILER_RPATH_FLAG)$(prefix)/lib -l$(GLU_LIB) -l$(GL_LIB)' + else + APP_LIB_DEPS="$APP_LIB_DEPS $GLUT_LIB_DEPS" + GLUT_LIB_DEPS="" From df22d0215a34148e1106f18b4909686a60f20673 Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 26 Mar 2016 23:52:37 +0000 Subject: [PATCH 0445/2457] Drop support for SSLv2. Bump revision. --- mail/qpopper/Makefile | 4 +-- mail/qpopper/distinfo | 4 ++- .../patches/patch-popper_pop__config.c | 16 +++++++++++ .../patches/patch-popper_pop__tls__openssl.c | 27 +++++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 mail/qpopper/patches/patch-popper_pop__config.c create mode 100644 mail/qpopper/patches/patch-popper_pop__tls__openssl.c diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index e2521ba1dcf6e..3bafa670c6dcd 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.68 2016/03/05 11:28:50 jperkin Exp $ +# $NetBSD: Makefile,v 1.69 2016/03/26 23:52:37 joerg Exp $ # DISTNAME= qpopper${VERSION} PKGNAME= qpopper-${VERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= mail MASTER_SITES= ${QPOPPER_MASTER_SITES} diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo index 80f9208e048dd..50b2e15ca87a4 100644 --- a/mail/qpopper/distinfo +++ b/mail/qpopper/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2015/11/03 23:27:18 agc Exp $ +$NetBSD: distinfo,v 1.20 2016/03/26 23:52:37 joerg Exp $ SHA1 (qpopper4.1.0.tar.gz) = 7806c230cb2b87d131c356de6ce85160650b5aea RMD160 (qpopper4.1.0.tar.gz) = 5254dd252739b2465795a0161bc2fed82adffbcc @@ -14,3 +14,5 @@ SHA1 (patch-ag) = 401408f7c6150ec41cecb85d166e7e338b9a9e5f SHA1 (patch-al) = 93d3c6cc3deee57c707abeb131febbd057a1ef57 SHA1 (patch-am) = 05cc53a56205d4db8bb7914437e788117d58b212 SHA1 (patch-ap) = 1a9df8496a0190fc56db04630b415b04ba125a21 +SHA1 (patch-popper_pop__config.c) = 504b98bf5d4ee93d8530f68a1f4ea813b46b5c92 +SHA1 (patch-popper_pop__tls__openssl.c) = 7de9032306df0993c3455bf3a64a9e4cc4da4058 diff --git a/mail/qpopper/patches/patch-popper_pop__config.c b/mail/qpopper/patches/patch-popper_pop__config.c new file mode 100644 index 0000000000000..a07081e60eed4 --- /dev/null +++ b/mail/qpopper/patches/patch-popper_pop__config.c @@ -0,0 +1,16 @@ +$NetBSD: patch-popper_pop__config.c,v 1.1 2016/03/26 23:52:37 joerg Exp $ + +Remove SSLv2 support. + +--- popper/pop_config.c.orig 2016-03-26 21:49:03.159886179 +0000 ++++ popper/pop_config.c +@@ -433,7 +433,9 @@ static mnemonic_map mnem_map_tls_sup [] + static mnemonic_map mnem_map_tls_vers [] = + { + { "default" , QPOP_TLSvDEFAULT }, ++#if 0 + { "SSLv2" , QPOP_SSLv2 }, ++#endif + { "SSLv3" , QPOP_SSLv3 }, + { "TLSv1" , QPOP_TLSv1 }, + { "SSLv23" , QPOP_SSLv23 }, diff --git a/mail/qpopper/patches/patch-popper_pop__tls__openssl.c b/mail/qpopper/patches/patch-popper_pop__tls__openssl.c new file mode 100644 index 0000000000000..5805b7513e977 --- /dev/null +++ b/mail/qpopper/patches/patch-popper_pop__tls__openssl.c @@ -0,0 +1,27 @@ +$NetBSD: patch-popper_pop__tls__openssl.c,v 1.1 2016/03/26 23:52:37 joerg Exp $ + +Disable SSLv2. + +--- popper/pop_tls_openssl.c.orig 2016-03-26 21:49:05.471963098 +0000 ++++ popper/pop_tls_openssl.c +@@ -318,10 +318,12 @@ openssl_init ( pop_tls *pTLS, POP *pPOP + pTLS->m_OpenSSLmeth = SSLv23_server_method(); + break; + ++#if 0 + case QPOP_SSLv2: /* SSL version 2 only */ + DEBUG_LOG0 ( pPOP, "...setting method to SSLv2_server_method" ); + pTLS->m_OpenSSLmeth = SSLv2_server_method(); + break; ++#endif + + case QPOP_SSLv3: /* SSL version 3 only */ + DEBUG_LOG0 ( pPOP, "...setting method to SSLv3_server_method" ); +@@ -350,6 +352,7 @@ openssl_init ( pop_tls *pTLS, POP *pPOP + log_openssl_err ( pPOP, HERE, "Unable to allocate SSL_CTX" ); + goto Done; + } ++ SSL_CTX_set_options(pTLS->m_OpenSSLctx, SSL_OP_NO_SSLv2); + + /* + * Set desired options From d217fac925d27c791cf642c3fc894697b449d981 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 27 Mar 2016 08:41:45 +0000 Subject: [PATCH 0446/2457] + afl-2.09b, cups-filters-1.8.3, gst-plugins1-bad-1.8.0, gst-plugins1-base-1.8.0, gst-plugins1-good-1.8.0, gst-plugins1-libav-1.8.0, gst-plugins1-ugly-1.8.0, gstreamer1-1.8.0, innoextract-1.6, liblangtag-0.6.0, octave-4.0.1, py-atomicwrites-1.0.0, py-click-6.4, py-cryptography-1.3.1, py-foolscap-0.11.0, py-idna-2.1, py-rsa-3.4.1, py-vdirsyncer-0.9.3, x264-devel-20160326. --- doc/TODO | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/doc/TODO b/doc/TODO index f61bc28068969..6b6f19a1964bb 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.15612 2016/03/24 20:58:10 bsiegert Exp $ +$NetBSD: TODO,v 1.15613 2016/03/27 08:41:45 wiz Exp $ Suggested new packages ====================== @@ -407,7 +407,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o adocman-0.13 o adodb-5.20 o aewm++-1.0.27 - o afl-2.08b + o afl-2.09b o afterstep-2.2.12 o aget-0.4.1 o alacarte-0.13.2 @@ -578,6 +578,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o crossfire-client-gtk2-1.60.0 o csharp-mysql-6.9.8 o cue-20151214 + o cups-filters-1.8.3 o cvm-0.97 o cvs-fast-export-1.38 o cvs2p4-2.5.5 [schmonz] @@ -862,7 +863,13 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o groonga-6.0.0 o gsharutils-4.15.2 o gss-1.0.3 + o gst-plugins1-bad-1.8.0 + o gst-plugins1-base-1.8.0 + o gst-plugins1-good-1.8.0 + o gst-plugins1-libav-1.8.0 + o gst-plugins1-ugly-1.8.0 o gst-rtsp-server-1.6.2 + o gstreamer1-1.8.0 o gthumb-3.4.0 o gtk-gnutella-0.98.4 o gtk-systrace-20030623 @@ -961,6 +968,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o inform-6.32.1 o ingo-3.2.8 o inn-2.6.0 + o innoextract-1.6 o input-pad-1.4.2 o inspircd-1.2.1 o instiki-0.13 @@ -1069,6 +1077,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o libkface-4.14.0 o libkgeomap-4.14.0 o libkvkontakte-4.14.0 + o liblangtag-0.6.0 o liblzo-2.09 o libmatheval-1.1.11 o libmcs-0.7.2 @@ -1239,6 +1248,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o ocamlgraph-1.8.6 o ocamlnet-4.1.1 o ocrad-0.25 + o octave-4.0.1 o odbc-postgresql-09.03.0400 o olvwm-4.5 o oniguruma-5.9.6 @@ -1655,16 +1665,18 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-Unidecode-0.04.19 o py-acora-1.9 o py-apache-libcloud-0.20.1 + o py-atomicwrites-1.0.0 o py-bleach-1.4.2 o py-borgbackup-1.0 o py-bsddb3-6.1.1 o py-buildbot-0.9.0b5 o py-buildbot-slave-0.9.0b5 o py-cassa-1.11.0 + o py-click-6.4 o py-collectd-5.5.1 o py-colorama-0.3.6 o py-creole-1.1.1 - o py-cryptography-1.3 + o py-cryptography-1.3.1 o py-cups-1.9.73 o py-d2to1-0.2.12 o py-daemon-2.1.1 @@ -1676,10 +1688,12 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-doctor-15.1.0 o py-ephem3-3.7.6.0 o py-flake8-2.5.4 + o py-foolscap-0.11.0 o py-gmpy-1.17 o py-gnome-menus-3.8.0 o py-hsm-1.1.1 o py-httpbin-0.4.1 + o py-idna-2.1 o py-input-pad-1.4.2 o py-ipython-4.0 o py-isodate-0.5.4 @@ -1711,6 +1725,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-radare2-0.10.1 o py-reportlab-3.0 o py-rope-0.9.4 + o py-rsa-3.4.1 o py-scgi-1.15 o py-serpent-1.12 o py-setuptools-20.3.1 @@ -1729,7 +1744,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o py-twisted-16.0.0 o py-uliweb-0.5b0 o py-uwsgi-2.0.12 - o py-vdirsyncer-0.9.2 + o py-vdirsyncer-0.9.3 o py-virtualenv-15.0.1 o py-wxWidgets-3.0.0 o py-yubiauth-0.3.10 @@ -2033,7 +2048,7 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o wwwoffle-2.9i o wxGTK-3.1.0 o wxRemind-101 - o x264-devel-20160319 + o x264-devel-20160326 o x2vnc-1.31 o xa65-2.3.7 o xaric-0.13.7 From debf41f3f555d9d9e0000ed5394c2cadbab84402 Mon Sep 17 00:00:00 2001 From: taca Date: Sun, 27 Mar 2016 15:05:27 +0000 Subject: [PATCH 0447/2457] Fix build problem on ruby23. --- multimedia/mkvtoolnix/distinfo | 5 +++- ...ake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb | 24 +++++++++++++++++++ ..._drake-0.8.7.0.2.4_lib_rake_alt__system.rb | 15 ++++++++++++ ..._drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb | 15 ++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb create mode 100644 multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb create mode 100644 multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo index 4d83116c08b05..68ae968c06c1b 100644 --- a/multimedia/mkvtoolnix/distinfo +++ b/multimedia/mkvtoolnix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2015/11/03 23:54:30 agc Exp $ +$NetBSD: distinfo,v 1.36 2016/03/27 15:05:27 taca Exp $ SHA1 (mkvtoolnix-5.0.1.tar.bz2) = 900211d47ba6cbeb4188bb45a492a2b9edf08ed2 RMD160 (mkvtoolnix-5.0.1.tar.bz2) = 3c6220a1ff304a18e4d7125d6981966c3e9d368e @@ -6,5 +6,8 @@ SHA512 (mkvtoolnix-5.0.1.tar.bz2) = 5ac0077bdef7426fc4f978bae5965f868dcc5b5a7898 Size (mkvtoolnix-5.0.1.tar.bz2) = 2155095 bytes SHA1 (patch-aa) = f34d52914908e54fef20c857c3fde28aa560ff91 SHA1 (patch-lib_boost_utf8__codecvt__facet_utf8__codecvt__facet.cpp) = 42e184abf518fd4d77a6b9737abe6bbe20a5ca41 +SHA1 (patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb) = 8806c9f516fbbc575b1ba1f4c44288bfbc846686 +SHA1 (patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb) = 44b07525151ec716271445f76de2327b7279f266 +SHA1 (patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb) = 6ea4000953717497baf16dd1f11834becc77879a SHA1 (patch-src_common_common.cpp) = 04955bcef7fdc825bd97aed62211ad91b7a58c30 SHA1 (patch-src_common_terminal.cpp) = 7bb0178f1fe58ce50feed7c8fc5974ba1172fa13 diff --git a/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb new file mode 100644 index 0000000000000..ffd42093e9b19 --- /dev/null +++ b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb @@ -0,0 +1,24 @@ +$NetBSD: patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake.rb,v 1.1 2016/03/27 15:05:27 taca Exp $ + +Avoid to use obsolete module name. + +--- rake.d/vendor/drake-0.8.7.0.2.4/lib/rake.rb.orig 2011-10-09 09:48:12.000000000 +0000 ++++ rake.d/vendor/drake-0.8.7.0.2.4/lib/rake.rb +@@ -984,13 +984,13 @@ end + # added to the FileUtils utility functions. + # + module FileUtils +- RUBY_EXT = ((Config::CONFIG['ruby_install_name'] =~ /\.(com|cmd|exe|bat|rb|sh)$/) ? ++ RUBY_EXT = ((RbConfig::CONFIG['ruby_install_name'] =~ /\.(com|cmd|exe|bat|rb|sh)$/) ? + "" : +- Config::CONFIG['EXEEXT']) ++ RbConfig::CONFIG['EXEEXT']) + + RUBY = File.join( +- Config::CONFIG['bindir'], +- Config::CONFIG['ruby_install_name'] + RUBY_EXT). ++ RbConfig::CONFIG['bindir'], ++ RbConfig::CONFIG['ruby_install_name'] + RUBY_EXT). + sub(/.*\s.*/m, '"\&"') + + OPT_TABLE['sh'] = %w(noop verbose) diff --git a/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb new file mode 100644 index 0000000000000..930e704d5ce27 --- /dev/null +++ b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb @@ -0,0 +1,15 @@ +$NetBSD: patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_alt__system.rb,v 1.1 2016/03/27 15:05:27 taca Exp $ + +Avoid to use obsolete module name. + +--- rake.d/vendor/drake-0.8.7.0.2.4/lib/rake/alt_system.rb.orig 2011-10-09 09:48:12.000000000 +0000 ++++ rake.d/vendor/drake-0.8.7.0.2.4/lib/rake/alt_system.rb +@@ -29,7 +29,7 @@ require 'rbconfig' + # for ruby-1.8 and earlier. + # + module Rake::AltSystem +- WINDOWS = Config::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! ++ WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! + + class << self + def define_module_function(name, &block) diff --git a/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb new file mode 100644 index 0000000000000..8a5d4d3b54664 --- /dev/null +++ b/multimedia/mkvtoolnix/patches/patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb @@ -0,0 +1,15 @@ +$NetBSD: patch-rake.d_vendor_drake-0.8.7.0.2.4_lib_rake_contrib_sys.rb,v 1.1 2016/03/27 15:05:27 taca Exp $ + +Avoid to use obsolete module name. + +--- rake.d/vendor/drake-0.8.7.0.2.4/lib/rake/contrib/sys.rb.orig 2011-10-09 09:48:12.000000000 +0000 ++++ rake.d/vendor/drake-0.8.7.0.2.4/lib/rake/contrib/sys.rb +@@ -40,7 +40,7 @@ require 'rbconfig' + # in Ruby 1.8. + # + module Sys +- RUBY = Config::CONFIG['ruby_install_name'] ++ RUBY = RbConfig::CONFIG['ruby_install_name'] + + # Install all the files matching +wildcard+ into the +dest_dir+ + # directory. The permission mode is set to +mode+. From 2b61fe0bca8c225692b1daad19ff5cd94c3ab763 Mon Sep 17 00:00:00 2001 From: riastradh Date: Sun, 27 Mar 2016 16:56:49 +0000 Subject: [PATCH 0448/2457] Need GCC >=4.7 for C++11. Otherwise net/ekiga fails to build altogether on NetBSD 6. ok dholland --- net/ekiga/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile index b702396dcff45..f7791db35334e 100644 --- a/net/ekiga/Makefile +++ b/net/ekiga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2016/03/05 11:29:03 jperkin Exp $ +# $NetBSD: Makefile,v 1.68 2016/03/27 16:56:49 riastradh Exp $ # DISTNAME= ekiga-3.2.6 @@ -27,6 +27,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ CXXFLAGS+= -std=c++11 +GCC_REQD+= 4.7 .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) From 8f6042007546304d02b554a8924d0a77476698b9 Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 27 Mar 2016 17:11:37 +0000 Subject: [PATCH 0449/2457] Fix build of the Scintilla control. Bump revision. --- x11/wxGTK30/Makefile | 8 ++-- x11/wxGTK30/distinfo | 10 ++--- x11/wxGTK30/patches/manual-regen.diff | 62 ++++++++++++++++++++------- 3 files changed, 55 insertions(+), 25 deletions(-) diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index 6b800a017a131..a3ea78baf153d 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.15 2016/02/26 11:27:17 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2016/03/27 17:11:37 joerg Exp $ VERSION= 3.0.2 -PKGREVISION= 5 +PKGREVISION= 6 DISTNAME= wxWidgets-${VERSION} PKGNAME= wxGTK30-${VERSION} CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} EXTRACT_SUFX= .tar.bz2 -PATCHFILES= ${DISTNAME}-libtool.2.diff.bz2 +PATCHFILES= ${DISTNAME}-libtool.3.diff.bz2 PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_DIST_STRIP.${DISTNAME}-libtool.2.diff.bz2= -p1 +PATCH_DIST_STRIP.${DISTNAME}-libtool.3.diff.bz2= -p1 MAINTAINER= dbj@NetBSD.org HOMEPAGE= http://www.wxwidgets.org/ diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo index 4b242de2109b0..b0cd18b5d8c78 100644 --- a/x11/wxGTK30/distinfo +++ b/x11/wxGTK30/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2016/02/17 10:16:05 dbj Exp $ +$NetBSD: distinfo,v 1.7 2016/03/27 17:11:37 joerg Exp $ -SHA1 (wxWidgets-3.0.2-libtool.2.diff.bz2) = 789f0ff586f36ee88ebd3016d959600e2e8e76dc -RMD160 (wxWidgets-3.0.2-libtool.2.diff.bz2) = a18e8007c4a51796a5178d96550c3596393ea2b1 -SHA512 (wxWidgets-3.0.2-libtool.2.diff.bz2) = af02e74b68625a2315531ddde99fd1ca58f77b7bc73d24c4d6baa1e42efb368314f827976a6702efa39fa4b77b9746ea0009ee17b5911928e6d477c251fee8df -Size (wxWidgets-3.0.2-libtool.2.diff.bz2) = 201508 bytes +SHA1 (wxWidgets-3.0.2-libtool.3.diff.bz2) = ffc3fbec9b1a8a9c19ac5f3750c78559b6bb2c81 +RMD160 (wxWidgets-3.0.2-libtool.3.diff.bz2) = 54f4aa932208172496e620def1d854602d87b12e +SHA512 (wxWidgets-3.0.2-libtool.3.diff.bz2) = 31ea745d9d989e20fcb16e152c5312080d4eca5da9c2b27bf1a9ce7c8d40479711959bce3e33e6d3f10116c85a00e8f0b0b5699633966ebaf5afb418e69e6488 +Size (wxWidgets-3.0.2-libtool.3.diff.bz2) = 209972 bytes SHA1 (wxWidgets-3.0.2.tar.bz2) = 6461eab4428c0a8b9e41781b8787510484dea800 RMD160 (wxWidgets-3.0.2.tar.bz2) = a7f404c8a64ca68fa31e408bded4387c2722196b SHA512 (wxWidgets-3.0.2.tar.bz2) = 098f79863103f3be0b7e21e4f0f1b34ab5277ef0033c1ef1387a9c673b0e0b76a2d732b183fa11b22cfcbbfdb7a4884f243d12f65cd49baa1772852307b393c4 diff --git a/x11/wxGTK30/patches/manual-regen.diff b/x11/wxGTK30/patches/manual-regen.diff index f5e2af57df07a..d29e261bbf9b6 100644 --- a/x11/wxGTK30/patches/manual-regen.diff +++ b/x11/wxGTK30/patches/manual-regen.diff @@ -1,6 +1,6 @@ -diff -ru wxWidgets-3.0.2.dist/build/bakefiles/common.bkl wxWidgets-3.0.2/build/bakefiles/common.bkl ---- wxWidgets-3.0.2.dist/build/bakefiles/common.bkl 2014-10-06 14:33:44.000000000 -0700 -+++ wxWidgets-3.0.2/build/bakefiles/common.bkl 2016-02-13 18:31:34.000000000 -0800 +diff -ru wxWidgets-3.0.2.old/build/bakefiles/common.bkl wxWidgets-3.0.2/build/bakefiles/common.bkl +--- wxWidgets-3.0.2.old/build/bakefiles/common.bkl 2016-03-24 13:27:07.034451400 +0000 ++++ wxWidgets-3.0.2/build/bakefiles/common.bkl 2016-03-24 13:27:18.295690311 +0000 @@ -708,7 +708,6 @@ $(RCDEFDIR) @@ -9,10 +9,9 @@ diff -ru wxWidgets-3.0.2.dist/build/bakefiles/common.bkl wxWidgets-3.0.2/build/b $(WXTOPDIR)src/msw/version.rc -Only in wxWidgets-3.0.2/build/bakefiles: common.bkl.orig -diff -ru wxWidgets-3.0.2.dist/build/bakefiles/config.bkl wxWidgets-3.0.2/build/bakefiles/config.bkl ---- wxWidgets-3.0.2.dist/build/bakefiles/config.bkl 2014-10-06 14:33:44.000000000 -0700 -+++ wxWidgets-3.0.2/build/bakefiles/config.bkl 2016-02-13 18:31:34.000000000 -0800 +diff -ru wxWidgets-3.0.2.old/build/bakefiles/config.bkl wxWidgets-3.0.2/build/bakefiles/config.bkl +--- wxWidgets-3.0.2.old/build/bakefiles/config.bkl 2016-03-24 13:27:07.034623707 +0000 ++++ wxWidgets-3.0.2/build/bakefiles/config.bkl 2016-03-24 13:27:18.296182090 +0000 @@ -425,8 +425,6 @@