Update libraw to 0.12.0

Complete changelist:

* DCB interpolation and FBDD denoising integrated into main LibRaw.
* Two addtional demosaic packs:
o GPL2-licensed: AFD, LMMSE, VCD, Modified AHD and AHD+VCD interpolations.
Additional median filters from 'Modified DCRAW' package. Foveon support also
included in this pack.
o GPL3-licensed: AMaZE interpolation and chromatic aberrations correction from
RawTherapee
* LCMS 2.x support
* New ./configure script, based on GNU autotools.
* Bugfixes:
o Fix in green_matching code to support nonstandard Bayer pattern
o Fixed bug in add_masked_borders_to_bitmap() call for cameras with masked
border composed of odd number of pixels.
* New command line options for unprocessed_raw sample: -B - subtract black
level, -M - add masked pixels to bitmap.

5 files changed, 22 insertions, 37 deletions

diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile
index db96c7778e4..e9998f96d08 100644
--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/12/02 15:35:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/13 20:32:30 gls Exp $
 #
 
-DISTNAME=		LibRaw-0.11.3
+DISTNAME=		LibRaw-0.12.0
 PKGNAME=		${DISTNAME:tl}
 CATEGORIES=		graphics
 MASTER_SITES=	http://www.libraw.org/data/
@@ -9,27 +9,16 @@ MASTER_SITES=	http://www.libraw.org/data/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.libraw.org/
 COMMENT=	Raw decoding/processing library
-LICENSE=	gnu-lgpl-v2.1
+LICENSE=	gnu-lgpl-v2.1 OR cddl-1.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c c++
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-P ${PREFIX}
+GNU_CONFIGURE=	yes
+USE_TOOLS+=		pkg-config gmake
 
-SUBST_CLASSES+=		pc
-SUBST_STAGE.pc=		post-configure
-SUBST_MESSAGE.pc=	Fixing prefix and version in raw.pc file.
-SUBST_FILES.pc=		raw.pc
-SUBST_SED.pc=		-e 's,@@PREFIX@@,${PREFIX},'
-SUBST_SED.pc+=		-e 's,@@VERSION@@,${PKGVERSION_NOREV},'
-
-INSTALLATION_DIRS+= lib/pkgconfig
-
-pre-configure:
-	${CP} ${FILESDIR}/raw.pc ${WRKSRC}
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/raw.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
+PKGCONFIG_OVERRIDE+=	libraw.pc.in
+PKGCONFIG_OVERRIDE+=	libraw_r.pc.in
 
+.include "../../graphics/lcms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libraw/PLIST b/graphics/libraw/PLIST
index 466a774aa70..b48463bd520 100644
--- a/graphics/libraw/PLIST
+++ b/graphics/libraw/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/15 18:59:38 gls Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/12/13 20:32:30 gls Exp $
 bin/4channels
 bin/dcraw_emu
 bin/dcraw_half
@@ -16,4 +16,10 @@ include/libraw/libraw_types.h
 include/libraw/libraw_version.h
 lib/libraw.a
 lib/libraw_r.a
-lib/pkgconfig/raw.pc
+lib/pkgconfig/libraw.pc
+lib/pkgconfig/libraw_r.pc
+share/doc/libraw/COPYRIGHT
+share/doc/libraw/Changelog.txt
+share/doc/libraw/LICENSE.CDDL
+share/doc/libraw/LICENSE.LGPL
+share/doc/libraw/LICENSE.LibRaw.pdf
diff --git a/graphics/libraw/buildlink3.mk b/graphics/libraw/buildlink3.mk
index 6fea10e371f..51e06b6af47 100644
--- a/graphics/libraw/buildlink3.mk
+++ b/graphics/libraw/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/11/15 18:59:38 gls Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/12/13 20:32:30 gls Exp $
 
 BUILDLINK_TREE+=	libraw
 
 .if !defined(LIBRAW_BUILDLINK3_MK)
 LIBRAW_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libraw+=	libraw>=0.10.0
+BUILDLINK_API_DEPENDS.libraw+=	libraw>=0.12.0
 BUILDLINK_PKGSRCDIR.libraw?=	../../graphics/libraw
 .endif	# LIBRAW_BUILDLINK3_MK
 
diff --git a/graphics/libraw/distinfo b/graphics/libraw/distinfo
index fc849e09b73..7af1cd330e1 100644
--- a/graphics/libraw/distinfo
+++ b/graphics/libraw/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2010/12/02 15:35:57 wiz Exp $
+$NetBSD: distinfo,v 1.3 2010/12/13 20:32:30 gls Exp $
 
-SHA1 (LibRaw-0.11.3.tar.gz) = a380b710bf52c35285591434383022f880a38c58
-RMD160 (LibRaw-0.11.3.tar.gz) = d378450bd138fe3e76b01437572a2f09ff4bfead
-Size (LibRaw-0.11.3.tar.gz) = 574145 bytes
+SHA1 (LibRaw-0.12.0.tar.gz) = 44f75546c6e11e023b00c263be1b3ae1a32d532a
+RMD160 (LibRaw-0.12.0.tar.gz) = 44b2ca756e44634d1eb52ba7ed06144914f81640
+Size (LibRaw-0.12.0.tar.gz) = 766484 bytes
diff --git a/graphics/libraw/files/raw.pc b/graphics/libraw/files/raw.pc
deleted file mode 100644
index 2e7c8fe23ee..00000000000
--- a/graphics/libraw/files/raw.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@@PREFIX@@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: raw
-Description: libraw
-Version: @@VERSION@@
-Libs: -Wl,-R${libdir} -L${libdir} -lraw
-Cflags: -I${includedir}/libraw