[pkgsrc/trunk]: pkgsrc/devel/devIL Prefer the in-tree bsdtar. Fix patch to us...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2a9b285f1f9
branches:  trunk
changeset: 400952:b2a9b285f1f9
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Oct 30 20:02:54 2009 +0000

description:
Prefer the in-tree bsdtar. Fix patch to use the correct branches on NetBSD.

diffstat:

 devel/devIL/Makefile         |   4 ++--
 devel/devIL/distinfo         |   4 ++--
 devel/devIL/patches/patch-aa |  10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r 8c8b2d6a63fb -r b2a9b285f1f9 devel/devIL/Makefile
--- a/devel/devIL/Makefile      Fri Oct 30 19:57:58 2009 +0000
+++ b/devel/devIL/Makefile      Fri Oct 30 20:02:54 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/10/30 19:42:55 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2009/10/30 20:02:54 joerg Exp $
 #
 
 DISTNAME=      DevIL-${DEVIL_VERSION}
@@ -16,7 +16,7 @@
 
 WRKSRC=                        ${WRKDIR}/devil-${DEVIL_VERSION}
 GNU_CONFIGURE=         yes
-EXTRACT_USING=         gtar
+EXTRACT_USING=         bsdtar
 USE_LIBTOOL=           yes
 USE_LANGUAGES=         c c++
 
diff -r 8c8b2d6a63fb -r b2a9b285f1f9 devel/devIL/distinfo
--- a/devel/devIL/distinfo      Fri Oct 30 19:57:58 2009 +0000
+++ b/devel/devIL/distinfo      Fri Oct 30 20:02:54 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/09/01 16:44:26 hasso Exp $
+$NetBSD: distinfo,v 1.5 2009/10/30 20:02:54 joerg Exp $
 
 SHA1 (DevIL-1.7.8.tar.gz) = bc27e3e830ba666a3af03548789700d10561fcb1
 RMD160 (DevIL-1.7.8.tar.gz) = a3cdb14fcca5e75ada240a53cbdc3e749a759da5
 Size (DevIL-1.7.8.tar.gz) = 2051993 bytes
-SHA1 (patch-aa) = 19709646bddabe8160adaf2b03b6f9628b712a94
+SHA1 (patch-aa) = 2784234ee79ada44f04219c5f49d5ea2c9e6bf4c
diff -r 8c8b2d6a63fb -r b2a9b285f1f9 devel/devIL/patches/patch-aa
--- a/devel/devIL/patches/patch-aa      Fri Oct 30 19:57:58 2009 +0000
+++ b/devel/devIL/patches/patch-aa      Fri Oct 30 20:02:54 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2009/09/01 16:44:26 hasso Exp $
+$NetBSD: patch-aa,v 1.3 2009/10/30 20:02:54 joerg Exp $
 
 --- src-ILUT/src/ilut_opengl.c.orig    2009-08-30 23:51:10 +0300
 +++ src-ILUT/src/ilut_opengl.c 2009-08-30 23:53:28 +0300
@@ -7,7 +7,7 @@
  #endif
  
 -#ifdef linux
-+#if defined(linux) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD) || defined(__OpenBSD__)
++#if defined(linux) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
        // fix for glXGetProcAddressARB
        #define GLX_GLXEXT_PROTOTYPES
        #include <GL/glx.h>
@@ -16,7 +16,7 @@
  static ILboolean HasCubemapHardware = IL_FALSE;
  static ILboolean HasNonPowerOfTwoHardware = IL_FALSE;
 -#if defined(_WIN32) || defined(_WIN64) || defined(linux) || defined(__APPLE__)
-+#if defined(_WIN32) || defined(_WIN64) || defined(linux) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD) || defined(__OpenBSD__)
++#if defined(_WIN32) || defined(_WIN64) || defined(linux) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
        ILGLTEXIMAGE3DARBPROC                   ilGLTexImage3D = NULL;
        ILGLTEXSUBIMAGE3DARBPROC                ilGLTexSubImage3D = NULL;
        ILGLCOMPRESSEDTEXIMAGE2DARBPROC ilGLCompressed2D = NULL;
@@ -34,7 +34,7 @@
  {
        ILimage *ImageCopy, *OldImage;
 -#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__)
-+#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD) || defined(__OpenBSD__)
++#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
        ILenum  DXTCFormat;
        ILuint  Size;
        ILubyte *Buffer;
@@ -43,7 +43,7 @@
        OldImage = ilGetCurImage();
  
 -#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__)
-+#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD) || defined(__OpenBSD__)
++#if defined (_MSC_VER) || defined (linux) || defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
        if (ilutGetBoolean(ILUT_GL_USE_S3TC) && ilGLCompressed2D != NULL) {
                if (Image->DxtcData != NULL && Image->DxtcSize != 0) {
                        DXTCFormat = GLGetDXTCNum(Image->DxtcFormat);