From a6e37fa63406b6a7beb86dc943d8be6a39fae206 Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Wed, 8 May 2013 12:29:14 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- archivers/lhasa/Makefile | 6 +- archivers/lhasa/distinfo | 8 +-- doc/CHANGES-2013 | 7 ++- doc/TODO | 5 +- graphics/ilmbase/Makefile | 9 ++- graphics/ilmbase/PLIST | 16 +++++- graphics/ilmbase/distinfo | 17 +++--- .../ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp | 4 +- graphics/ilmbase/patches/patch-ab | 52 +++++++++++++++++- graphics/ilmbase/patches/patch-ac | 14 ----- graphics/openexr/Makefile | 8 +-- graphics/openexr/PLIST | 30 +++++++++- graphics/openexr/distinfo | 16 +++--- graphics/openexr/patches/patch-aa | 64 ++++++++++++++++++++-- graphics/openexr/patches/patch-ab | 32 +++++------ graphics/openexr/patches/patch-ac | 14 ----- graphics/openexr/patches/patch-ai | 21 ------- misc/tmux/Makefile | 3 +- misc/tmux/distinfo | 3 +- misc/tmux/patches/patch-utf8.c | 16 ++++++ 20 files changed, 226 insertions(+), 119 deletions(-) rewrite graphics/ilmbase/distinfo (88%) delete mode 100644 graphics/ilmbase/patches/patch-ac rewrite graphics/openexr/distinfo (99%) rewrite graphics/openexr/patches/patch-ab (68%) delete mode 100644 graphics/openexr/patches/patch-ac delete mode 100644 graphics/openexr/patches/patch-ai create mode 100644 misc/tmux/patches/patch-utf8.c diff --git a/archivers/lhasa/Makefile b/archivers/lhasa/Makefile index f99332c3333..f435729678d 100644 --- a/archivers/lhasa/Makefile +++ b/archivers/lhasa/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2012/06/03 10:20:04 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2012/09/11 19:46:56 asau Exp $ # -DISTNAME= lhasa-0.0.7 +DISTNAME= lhasa-0.1.0 CATEGORIES= archivers -MASTER_SITES= http://cloud.github.com/downloads/fragglet/lhasa/ +MASTER_SITES= http://www.soulsphere.org/projects/lhasa/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://fragglet.github.com/lhasa/ diff --git a/archivers/lhasa/distinfo b/archivers/lhasa/distinfo index e7cf054f760..bc61785b9f4 100644 --- a/archivers/lhasa/distinfo +++ b/archivers/lhasa/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2012/05/08 06:13:27 wiz Exp $ +$NetBSD: distinfo,v 1.3 2012/06/03 10:20:04 wiz Exp $ -SHA1 (lhasa-0.0.7.tar.gz) = 40890150483c2075a6cd108fee5bbe23a96d5d71 -RMD160 (lhasa-0.0.7.tar.gz) = 4f0217e88d3fda0528242ed70657326b91b62826 -Size (lhasa-0.0.7.tar.gz) = 2646160 bytes +SHA1 (lhasa-0.1.0.tar.gz) = c1714dd534004a80044b4fbdbe3d41a5fe1548fc +RMD160 (lhasa-0.1.0.tar.gz) = 49dfc45792e78fde80791e84845a66652960ae31 +Size (lhasa-0.1.0.tar.gz) = 2694901 bytes diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index 3971fbda69b..81eeac75dac 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.1603 2013/05/08 12:40:10 wen Exp $ +$NetBSD: CHANGES-2013,v 1.1606 2013/05/08 17:50:46 adam Exp $ Changes to the packages collection and infrastructure in 2013: @@ -2451,4 +2451,7 @@ Changes to the packages collection and infrastructure in 2013: Updated x11/ruby-gnome2-vte to 2.0.0 [obache 2013-05-08] Updated x11/ruby-gnome2-gtksourceview2 to 2.0.0 [obache 2013-05-08] Updated x11/ruby-gnome2-gtksourceview3 to 2.0.0 [obache 2013-05-08] - + Updated archivers/lhasa to 0.1.0 [shattered 2013-05-08] + Updated graphics/ilmbase to 2.0.0 [adam 2013-05-08] + Updated graphics/openexr to 2.0.0 [adam 2013-05-08] + Updated misc/tmux to 1.8nb1 [minskim 2013-05-08] diff --git a/doc/TODO b/doc/TODO index 9c52f3531f9..bed885bd7a8 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.12129 2013/05/06 19:56:00 gls Exp $ +$NetBSD: TODO,v 1.12131 2013/05/08 17:40:54 shattered Exp $ Suggested new packages ====================== @@ -719,7 +719,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o icewm-1.3.7 o idutils-4.6 o ike-2.0.1 [pkg/37032] - o ilmbase-2.0.0 o imapfilter-2.5.4 o imapsync-1.452 o imp-6.0.4 @@ -775,7 +774,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o level9-4.1 o lftp-4.4.0 o lgeneral-1.2.3 - o lhasa-0.1.0 o libAppleWM-1.4.1 o libarchive-3.0.4 o libcaca-0.99beta18 @@ -919,7 +917,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o opal-3.8.3 o open-vm-tools-2010.09.19.301124 o opendkim-2.8.3 - o openexr-2.0.0 o opengrok-0.11.1 o openmortal-0.7.1 o openoffice-3.4 diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile index e464ec4febe..5eac1eafbe4 100644 --- a/graphics/ilmbase/Makefile +++ b/graphics/ilmbase/Makefile @@ -1,18 +1,17 @@ -# $NetBSD: Makefile,v 1.7 2012/07/26 10:58:46 bsiegert Exp $ +# $NetBSD: Makefile,v 1.8 2012/10/06 14:10:59 asau Exp $ -DISTNAME= ilmbase-1.0.2 -PKGREVISION= 2 +DISTNAME= ilmbase-2.0.0 CATEGORIES= graphics -MASTER_SITES= http://savannah.nongnu.org/download/openexr/ +MASTER_SITES= http://download.savannah.nongnu.org/releases/openexr/ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.openexr.com/ COMMENT= High dynamic-range (HDR) image file format library and tools LICENSE= modified-bsd -USE_TOOLS+= gmake USE_LANGUAGES= c c++ USE_LIBTOOL= yes +USE_TOOLS+= gmake GNU_CONFIGURE= yes TEST_TARGET= check LIBS.SunOS= -lm diff --git a/graphics/ilmbase/PLIST b/graphics/ilmbase/PLIST index 065474150f5..e58fc17082f 100644 --- a/graphics/ilmbase/PLIST +++ b/graphics/ilmbase/PLIST @@ -1,13 +1,22 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/30 21:50:22 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:18 joerg Exp $ include/OpenEXR/Iex.h include/OpenEXR/IexBaseExc.h include/OpenEXR/IexErrnoExc.h +include/OpenEXR/IexExport.h +include/OpenEXR/IexForward.h include/OpenEXR/IexMacros.h include/OpenEXR/IexMathExc.h +include/OpenEXR/IexMathFloatExc.h +include/OpenEXR/IexMathFpu.h +include/OpenEXR/IexMathIeeeExc.h +include/OpenEXR/IexNamespace.h include/OpenEXR/IexThrowErrnoExc.h include/OpenEXR/IlmBaseConfig.h include/OpenEXR/IlmThread.h +include/OpenEXR/IlmThreadExport.h +include/OpenEXR/IlmThreadForward.h include/OpenEXR/IlmThreadMutex.h +include/OpenEXR/IlmThreadNamespace.h include/OpenEXR/IlmThreadPool.h include/OpenEXR/IlmThreadSemaphore.h include/OpenEXR/ImathBox.h @@ -16,6 +25,8 @@ include/OpenEXR/ImathColor.h include/OpenEXR/ImathColorAlgo.h include/OpenEXR/ImathEuler.h include/OpenEXR/ImathExc.h +include/OpenEXR/ImathExport.h +include/OpenEXR/ImathForward.h include/OpenEXR/ImathFrame.h include/OpenEXR/ImathFrustum.h include/OpenEXR/ImathFun.h @@ -30,6 +41,7 @@ include/OpenEXR/ImathLineAlgo.h include/OpenEXR/ImathMath.h include/OpenEXR/ImathMatrix.h include/OpenEXR/ImathMatrixAlgo.h +include/OpenEXR/ImathNamespace.h include/OpenEXR/ImathPlane.h include/OpenEXR/ImathPlatform.h include/OpenEXR/ImathQuat.h @@ -40,10 +52,12 @@ include/OpenEXR/ImathSphere.h include/OpenEXR/ImathVec.h include/OpenEXR/ImathVecAlgo.h include/OpenEXR/half.h +include/OpenEXR/halfExport.h include/OpenEXR/halfFunction.h include/OpenEXR/halfLimits.h lib/libHalf.la lib/libIex.la +lib/libIexMath.la lib/libIlmThread.la lib/libImath.la lib/pkgconfig/IlmBase.pc diff --git a/graphics/ilmbase/distinfo b/graphics/ilmbase/distinfo dissimilarity index 88% index 8f4e55dd8e9..b46467eaf5a 100644 --- a/graphics/ilmbase/distinfo +++ b/graphics/ilmbase/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.4 2011/01/03 07:58:43 dsainty Exp $ - -SHA1 (ilmbase-1.0.2.tar.gz) = fe6a910a90cde80137153e25e175e2b211beda36 -RMD160 (ilmbase-1.0.2.tar.gz) = 40aed65079ee174be8ed237e5def941ae2b761b3 -Size (ilmbase-1.0.2.tar.gz) = 496540 bytes -SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 0cb0680bddcc80feba04ad3d5a902dcf6f25dd00 -SHA1 (patch-aa) = 7498a0cfafaec4f1e43dd57270f514bc5a8e7b1f -SHA1 (patch-ab) = a4e80234beb617861d1ab01a8bcfd34e03675da4 -SHA1 (patch-ac) = af3991c83db7bece1575a29a0445016c8618e6a2 +$NetBSD: distinfo,v 1.5 2012/07/26 10:58:46 bsiegert Exp $ + +SHA1 (ilmbase-2.0.0.tar.gz) = 0f047217d287627ddc37ed06d573a2099e67f447 +RMD160 (ilmbase-2.0.0.tar.gz) = 9fbea3895cd690d945fbcf387ec65f4aecbd9303 +Size (ilmbase-2.0.0.tar.gz) = 549714 bytes +SHA1 (patch-Iex_IexThrowErrnoExc.cpp) = 1a4206619320a2a95378b7c2db14fde20b0ffd71 +SHA1 (patch-aa) = 7498a0cfafaec4f1e43dd57270f514bc5a8e7b1f +SHA1 (patch-ab) = 9c332afdcf04e239c597546089f50b0db0b038b4 diff --git a/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp b/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp index 383224c7633..ec79b98cf5b 100644 --- a/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp +++ b/graphics/ilmbase/patches/patch-Iex_IexThrowErrnoExc.cpp @@ -1,8 +1,8 @@ -$NetBSD$ +$NetBSD: patch-Iex_IexThrowErrnoExc.cpp,v 1.1 2012/07/26 10:58:47 bsiegert Exp $ --- Iex/IexThrowErrnoExc.cpp.orig Thu Jul 26 10:46:21 2012 +++ Iex/IexThrowErrnoExc.cpp -@@ -410,7 +410,7 @@ void throwErrnoExc (const std::string &t +@@ -419,7 +419,7 @@ void throwErrnoExc (const std::string &t throw EnametoolongExc (tmp); #endif diff --git a/graphics/ilmbase/patches/patch-ab b/graphics/ilmbase/patches/patch-ab index 06e5cd7a58c..4256ef3f247 100644 --- a/graphics/ilmbase/patches/patch-ab +++ b/graphics/ilmbase/patches/patch-ab @@ -1,8 +1,56 @@ $NetBSD$ ---- configure.orig 2010-12-14 09:46:18.000000000 +0000 +Compatibility fix. +Disable univeral binary build on Mac OS X. + +--- configure.orig 2013-03-14 16:58:22.000000000 +0000 +++ configure -@@ -20385,23 +20385,7 @@ else +@@ -20524,7 +20524,7 @@ LIB_SUFFIX="" + lib_suffix_valid="no" + + lib_namespace="" +-if test "x${library_namespace_versioning}" == xyes ; then ++if test "x${library_namespace_versioning}" = xyes ; then + cat >>confdefs.h <<_ACEOF + #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API} + _ACEOF +@@ -20545,7 +20545,7 @@ _ACEOF + lib_namespace="${ILMBASE_VERSION_API}" + LIB_SUFFIX="${ILMBASE_VERSION_API}" + lib_suffix_valid="yes" +-elif test "x${library_namespace_versioning}" == xno ; then ++elif test "x${library_namespace_versioning}" = xno ; then + cat >>confdefs.h <<_ACEOF + #define IMATH_INTERNAL_NAMESPACE Imath + _ACEOF +@@ -20583,7 +20583,7 @@ _ACEOF + fi + + +-if test "x${lib_suffix_valid}" == xyes ; then ++if test "x${lib_suffix_valid}" = xyes ; then + LIB_SUFFIX_DASH="-${LIB_SUFFIX}" + + +@@ -20622,7 +20622,7 @@ else + custom_public_namespace=no + fi; + +-if test "x${custom_public_namespace}" == xyes ; then ++if test "x${custom_public_namespace}" = xyes ; then + { echo "$as_me:$LINENO: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5 + echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;} + cat >>confdefs.h <<\_ACEOF +@@ -20640,7 +20640,7 @@ _ACEOF + + public_namespace="" + custom_public_namespace=no +-elif test "x${custom_public_namespace}" == xno ; then ++elif test "x${custom_public_namespace}" = xno ; then + cat >>confdefs.h <<\_ACEOF + #define IMATH_NAMESPACE Imath + _ACEOF +@@ -20690,23 +20690,7 @@ else fi; if test "${osx_arch}" != default ; then diff --git a/graphics/ilmbase/patches/patch-ac b/graphics/ilmbase/patches/patch-ac deleted file mode 100644 index 9688c4594b6..00000000000 --- a/graphics/ilmbase/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD$ - -Include to declare memset(), used from this header in inlines. - ---- Imath/ImathMatrix.h.orig 2010-07-17 10:48:40.000000000 +1200 -+++ Imath/ImathMatrix.h 2011-01-03 20:30:27.543078712 +1300 -@@ -49,6 +49,7 @@ - #include "ImathVec.h" - #include "ImathShear.h" - -+#include - #include - #include - diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile index 251128d77ad..1d1e06e2344 100644 --- a/graphics/openexr/Makefile +++ b/graphics/openexr/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.24 2011/01/03 17:58:35 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2012/10/06 14:11:08 asau Exp $ -DISTNAME= openexr-1.7.0 +DISTNAME= openexr-2.0.0 CATEGORIES= graphics -MASTER_SITES= http://savannah.nongnu.org/download/openexr/ +MASTER_SITES= http://download.savannah.nongnu.org/releases/openexr/ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.openexr.com/ COMMENT= High dynamic-range (HDR) image file format library and tools LICENSE= modified-bsd -USE_TOOLS+= gmake pkg-config USE_LANGUAGES= c c++ USE_LIBTOOL= yes +USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= OpenEXR.pc.in TEST_TARGET= check diff --git a/graphics/openexr/PLIST b/graphics/openexr/PLIST index 62169bf2900..4c63dbe7ac9 100644 --- a/graphics/openexr/PLIST +++ b/graphics/openexr/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:59:24 joerg Exp $ -bin/exr2aces +@comment $NetBSD: PLIST,v 1.7 2010/12/14 09:55:56 adam Exp $ bin/exrenvmap bin/exrheader bin/exrmakepreview bin/exrmaketiled +bin/exrmultipart bin/exrmultiview bin/exrstdattr include/OpenEXR/ImfAcesFile.h @@ -16,19 +16,35 @@ include/OpenEXR/ImfChannelList.h include/OpenEXR/ImfChannelListAttribute.h include/OpenEXR/ImfChromaticities.h include/OpenEXR/ImfChromaticitiesAttribute.h +include/OpenEXR/ImfCompositeDeepScanLine.h include/OpenEXR/ImfCompression.h include/OpenEXR/ImfCompressionAttribute.h include/OpenEXR/ImfConvert.h +include/OpenEXR/ImfDeepCompositing.h +include/OpenEXR/ImfDeepFrameBuffer.h +include/OpenEXR/ImfDeepScanLineInputFile.h +include/OpenEXR/ImfDeepScanLineInputPart.h +include/OpenEXR/ImfDeepScanLineOutputFile.h +include/OpenEXR/ImfDeepScanLineOutputPart.h +include/OpenEXR/ImfDeepTiledInputFile.h +include/OpenEXR/ImfDeepTiledInputPart.h +include/OpenEXR/ImfDeepTiledOutputFile.h +include/OpenEXR/ImfDeepTiledOutputPart.h include/OpenEXR/ImfDoubleAttribute.h include/OpenEXR/ImfEnvmap.h include/OpenEXR/ImfEnvmapAttribute.h +include/OpenEXR/ImfExport.h include/OpenEXR/ImfFloatAttribute.h +include/OpenEXR/ImfForward.h include/OpenEXR/ImfFrameBuffer.h include/OpenEXR/ImfFramesPerSecond.h +include/OpenEXR/ImfGenericInputFile.h +include/OpenEXR/ImfGenericOutputFile.h include/OpenEXR/ImfHeader.h include/OpenEXR/ImfHuf.h include/OpenEXR/ImfIO.h include/OpenEXR/ImfInputFile.h +include/OpenEXR/ImfInputPart.h include/OpenEXR/ImfInt64.h include/OpenEXR/ImfIntAttribute.h include/OpenEXR/ImfKeyCode.h @@ -37,10 +53,17 @@ include/OpenEXR/ImfLineOrder.h include/OpenEXR/ImfLineOrderAttribute.h include/OpenEXR/ImfLut.h include/OpenEXR/ImfMatrixAttribute.h +include/OpenEXR/ImfMisc.h +include/OpenEXR/ImfMultiPartInputFile.h +include/OpenEXR/ImfMultiPartOutputFile.h include/OpenEXR/ImfMultiView.h include/OpenEXR/ImfName.h +include/OpenEXR/ImfNamespace.h include/OpenEXR/ImfOpaqueAttribute.h include/OpenEXR/ImfOutputFile.h +include/OpenEXR/ImfOutputPart.h +include/OpenEXR/ImfPartHelper.h +include/OpenEXR/ImfPartType.h include/OpenEXR/ImfPixelType.h include/OpenEXR/ImfPreviewImage.h include/OpenEXR/ImfPreviewImageAttribute.h @@ -57,7 +80,9 @@ include/OpenEXR/ImfThreading.h include/OpenEXR/ImfTileDescription.h include/OpenEXR/ImfTileDescriptionAttribute.h include/OpenEXR/ImfTiledInputFile.h +include/OpenEXR/ImfTiledInputPart.h include/OpenEXR/ImfTiledOutputFile.h +include/OpenEXR/ImfTiledOutputPart.h include/OpenEXR/ImfTiledRgbaFile.h include/OpenEXR/ImfTimeCode.h include/OpenEXR/ImfTimeCodeAttribute.h @@ -88,3 +113,4 @@ share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceExamples.cpp share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceExamples.h share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceTiledExamples.cpp share/doc/OpenEXR-${PKGVERSION}/examples/rgbaInterfaceTiledExamples.h +share/doc/OpenEXR-2.0.0/examples/namespaceAlias.h diff --git a/graphics/openexr/distinfo b/graphics/openexr/distinfo dissimilarity index 99% index 02483e5e815..ddbe8354f31 100644 --- a/graphics/openexr/distinfo +++ b/graphics/openexr/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.17 2011/01/20 11:23:54 markd Exp $ - -SHA1 (openexr-1.7.0.tar.gz) = 91d0d4e69f06de956ec7e0710fc58ec0d4c4dc2b -RMD160 (openexr-1.7.0.tar.gz) = 410ae4490988067cc80324e776b52ae6a261f157 -Size (openexr-1.7.0.tar.gz) = 13542910 bytes -SHA1 (patch-aa) = 5c0d585e623d66d60e535ce3dc84c4db845c6382 -SHA1 (patch-ab) = 7d4fdf8d36f58ea5126b8c72dae901d1d68e6a60 -SHA1 (patch-ac) = 44a777615f0d969d9c80f76aa93a8812de414560 -SHA1 (patch-ai) = 18c26a8ec227f43c4091afc59d7468700e2d50f5 +$NetBSD: distinfo,v 1.18 2011/01/22 08:10:27 wiz Exp $ + +SHA1 (openexr-2.0.0.tar.gz) = 774ae69ac01bbe4443b6fa0a9b12e276d0af44f5 +RMD160 (openexr-2.0.0.tar.gz) = a8f69447bcff1d7c4881b33fdb12f61a702c2caf +Size (openexr-2.0.0.tar.gz) = 12589533 bytes +SHA1 (patch-aa) = e8a6349203327937923367995a6721a5159ac7cf +SHA1 (patch-ab) = df9a5ceea5702c08265ea884813c965122241802 diff --git a/graphics/openexr/patches/patch-aa b/graphics/openexr/patches/patch-aa index d08c3777c2f..02b59936d3b 100644 --- a/graphics/openexr/patches/patch-aa +++ b/graphics/openexr/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.5 2008/02/03 03:37:32 heinz Exp $ +$NetBSD: patch-aa,v 1.6 2010/12/14 09:55:57 adam Exp $ - - Shell portability fix: see - https://savannah.nongnu.org/bugs/index.php?22222 +Shell portability fix: see +https://savannah.nongnu.org/bugs/index.php?22222 ---- configure.orig 2007-11-30 19:18:05.000000000 +0000 +--- configure.orig 2013-03-14 17:03:39.000000000 +0000 +++ configure -@@ -18937,7 +18937,7 @@ else +@@ -18981,7 +18981,7 @@ else multithread=yes fi; @@ -14,3 +14,57 @@ $NetBSD: patch-aa,v 1.5 2008/02/03 03:37:32 heinz Exp $ +@@ -20980,7 +20980,7 @@ LIB_SUFFIX="" + lib_suffix_valid="no" + + lib_namespace="Imf" +-if test "x${library_namespace_versioning}" == xyes ; then ++if test "x${library_namespace_versioning}" = xyes ; then + cat >>confdefs.h <<_ACEOF + #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf_${OPENEXR_VERSION_API} + _ACEOF +@@ -20993,7 +20993,7 @@ _ACEOF + lib_namespace="Imf_${OPENEXR_VERSION_API}" + LIB_SUFFIX="Imf_${OPENEXR_VERSION_API}" + lib_suffix_valid="yes" +-elif test "x${library_namespace_versioning}" == xno ; then ++elif test "x${library_namespace_versioning}" = xno ; then + cat >>confdefs.h <<_ACEOF + #define OPENEXR_IMF_INTERNAL_NAMESPACE Imf + _ACEOF +@@ -21016,7 +21016,7 @@ _ACEOF + fi + + +-if test "x${lib_suffix_valid}" == xyes ; then ++if test "x${lib_suffix_valid}" = xyes ; then + LIB_SUFFIX_DASH="-${LIB_SUFFIX}" + + +@@ -21055,7 +21055,7 @@ else + custom_usr_namespace=no + fi; + +-if test "x${custom_usr_namespace}" == xyes ; then ++if test "x${custom_usr_namespace}" = xyes ; then + { echo "$as_me:$LINENO: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&5 + echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'" >&2;} + cat >>confdefs.h <<_ACEOF +@@ -21063,7 +21063,7 @@ echo "$as_me: WARNING: Enabling 'custom + _ACEOF + + usr_namespace="Imf" +-elif test "x${custom_usr_namespace}" == xno ; then ++elif test "x${custom_usr_namespace}" = xno ; then + cat >>confdefs.h <<_ACEOF + #define OPENEXR_IMF_NAMESPACE Imf + _ACEOF +@@ -22620,7 +22622,7 @@ enable large stack optimizations + internal library namespace $lib_namespace + user-client namespace $usr_namespace" >&6 + +-if test "x$build_osxuniversal" == xyes; then ++if test "x$build_osxuniversal" = xyes; then + echo "$as_me:$LINENO: result: + build OS X universal binaries $build_osxuniversal" >&5 + echo "${ECHO_T} diff --git a/graphics/openexr/patches/patch-ab b/graphics/openexr/patches/patch-ab dissimilarity index 68% index 0dbacee89d3..36f6dafc3dd 100644 --- a/graphics/openexr/patches/patch-ab +++ b/graphics/openexr/patches/patch-ab @@ -1,16 +1,16 @@ -$NetBSD: patch-ab,v 1.1 2006/10/11 18:47:28 rillig Exp $ - - - Shell portability fix: see - https://savannah.nongnu.org/bugs/index.php?22222 - ---- bootstrap.orig 2006-10-11 20:46:46.000000000 +0200 -+++ bootstrap 2006-10-11 20:46:27.000000000 +0200 -@@ -1,7 +1,7 @@ - #! /bin/sh - # If we're on OS X, use glibtoolize instead of toolize - HOSTTYPE=`uname` --if [ "$HOSTTYPE" == "Darwin" ]; then -+if [ "$HOSTTYPE" = "Darwin" ]; then - LIBTOOLIZE=glibtoolize - else - LIBTOOLIZE=libtoolize +$NetBSD: patch-ab,v 1.2 2008/02/03 03:37:33 heinz Exp $ + +Shell portability fix: see +https://savannah.nongnu.org/bugs/index.php?22222 + +--- bootstrap.orig 2013-04-09 17:07:52.000000000 +0000 ++++ bootstrap +@@ -2,7 +2,7 @@ + # If we're on OS X, use glibtoolize instead of toolize + HOSTTYPE=`uname` + LIBTOOLIZE=libtoolize +-if [ "$HOSTTYPE" == "Darwin" ]; then ++if [ "$HOSTTYPE" = "Darwin" ]; then + GLIBTOOLIZE=`which glibtoolize` + if [ "x$GLIBTOOLIZE" != "x" ]; then + LIBTOOLIZE=glibtoolize diff --git a/graphics/openexr/patches/patch-ac b/graphics/openexr/patches/patch-ac deleted file mode 100644 index c46682d0fa2..00000000000 --- a/graphics/openexr/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD$ - -Include to declare memcpy(), used by blurImage(). - ---- exrenvmap/blurImage.cpp.orig 2009-02-26 12:39:27.000000000 +1300 -+++ exrenvmap/blurImage.cpp 2010-12-26 12:11:57.891117560 +1300 -@@ -45,6 +45,7 @@ - #include "Iex.h" - #include - #include -+#include - - using namespace std; - using namespace Imf; diff --git a/graphics/openexr/patches/patch-ai b/graphics/openexr/patches/patch-ai deleted file mode 100644 index 210fb196a74..00000000000 --- a/graphics/openexr/patches/patch-ai +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2009/08/28 21:33:08 hasso Exp $ - ---- IlmImf/ImfAutoArray.h.orig 2007-04-23 20:26:56.000000000 -0500 -+++ IlmImf/ImfAutoArray.h 2009-07-29 13:22:08.309288375 -0500 -@@ -45,6 +45,7 @@ - //----------------------------------------------------------------------------- - - #include "OpenEXRConfig.h" -+#include - - namespace Imf { - -@@ -57,7 +57,7 @@ namespace Imf { - { - public: - -- AutoArray (): _data (new T [size]) {} -+ AutoArray (): _data (new T [size]) {memset(_data, 0, size * sizeof(T));} - ~AutoArray () {delete [] _data;} - - operator T * () {return _data;} diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile index 0fade2141d7..c77435473a4 100644 --- a/misc/tmux/Makefile +++ b/misc/tmux/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2013/02/06 23:23:03 jperkin Exp $ +# $NetBSD: Makefile,v 1.22 2013/04/02 10:59:50 fhajny Exp $ DISTNAME= tmux-1.8 +PKGREVISION= 1 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tmux/} diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo index 4616b9cf4fd..32c2727649c 100644 --- a/misc/tmux/distinfo +++ b/misc/tmux/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2013/04/02 10:59:50 fhajny Exp $ +$NetBSD: distinfo,v 1.21 2013/04/07 04:00:39 schmonz Exp $ SHA1 (tmux-1.8.tar.gz) = 08677ea914e1973ce605b0008919717184cbd033 RMD160 (tmux-1.8.tar.gz) = b267ab54f6f55292fa1fa9cd0e892bfd5fd27cfb @@ -6,3 +6,4 @@ Size (tmux-1.8.tar.gz) = 417537 bytes SHA1 (patch-client.c) = e37053d721bd26d31783af883a7d1f6870095325 SHA1 (patch-osdep-darwin.c) = 259230c4437364fc3c956f2ab1429316e697d228 SHA1 (patch-server-client.c) = 6c8dd82e2dc1965b8c8f9a8808a262366c80d6b4 +SHA1 (patch-utf8.c) = d1703d90131f32eef8688f6255e84a315fccfa1d diff --git a/misc/tmux/patches/patch-utf8.c b/misc/tmux/patches/patch-utf8.c new file mode 100644 index 00000000000..b400031c277 --- /dev/null +++ b/misc/tmux/patches/patch-utf8.c @@ -0,0 +1,16 @@ +$NetBSD$ + +Remove some Korean characters from the zero-width list. +(http://sourceforge.net/p/tmux/tickets/41/) + +--- utf8.c.orig 2013-02-10 16:20:15.000000000 +0000 ++++ utf8.c +@@ -173,7 +173,7 @@ struct utf8_width_entry utf8_width_table + { 0x30000, 0x3fffd, 2, NULL, NULL }, + { 0x00711, 0x00711, 0, NULL, NULL }, + { 0x0fe00, 0x0fe0f, 0, NULL, NULL }, +- { 0x01160, 0x011ff, 0, NULL, NULL }, ++ { 0x01160, 0x011ff, 1, NULL, NULL }, + { 0x0180b, 0x0180d, 0, NULL, NULL }, + { 0x10a3f, 0x10a3f, 0, NULL, NULL }, + { 0x00981, 0x00981, 0, NULL, NULL }, -- 2.11.4.GIT