From 08aa7b5e335d42fa8ea1d53e5e429d8bfd8134b4 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Mon, 16 Nov 2009 12:03:12 +0000
Subject: [PATCH] add lensfun flavour, tweak Makefile and DESCR, bump.

---
 graphics/ufraw/Makefile  | 62 +++++++++++++++++++++++-----------------
 graphics/ufraw/pkg/DESCR | 19 ++++++------
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index b4ce604c69c..a2b0aecce9c 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -1,14 +1,15 @@
-# $OpenBSD: Makefile,v 1.20 2009/10/21 22:44:52 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2009/11/16 12:03:12 sthen Exp $
 
-COMMENT=		read and manipulate raw images from digital cameras
+COMMENT=	read and manipulate raw images from digital cameras
 
-DISTNAME=		ufraw-0.16
+DISTNAME=	ufraw-0.16
+PKGNAME=	${DISTNAME}p0
 
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ufraw/}
-HOMEPAGE=		http://ufraw.sourceforge.net/
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ufraw/}
+HOMEPAGE=	http://ufraw.sourceforge.net/
 
-MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
+MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=   Yes
@@ -16,28 +17,35 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=		atk-1.0 c cairo expat fontconfig freetype \
-			gdk_pixbuf-2.0 gdk-x11-2.0 gio-2.0 glib-2.0 glitz \
-			gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
-			m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
-			pthread stdc++ X11 Xau Xcursor Xext Xfixes Xi \
-			Xinerama Xrandr Xcomposite Xdamage Xdmcp Xrender \
-			z jpeg tiff pthread-stubs xcb
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
+WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += glitz gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
+WANTLIB += jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
+WANTLIB += png pthread pthread-stubs stdc++ tiff xcb z
 
-LIB_DEPENDS=		gimp-2.0,gimpbase-2.0,gimpcolor-2.0,gimpconfig-2.0,gimpmath-2.0,gimpui-2.0,gimpwidgets-2.0,gimpmodule-2.0:gimp->=2,<3:graphics/gimp/stable \
-			lcms.>=1.15::graphics/lcms \
-			bz2.>=10::archivers/bzip2 \
-			exiv2::graphics/exiv2 \
-			gtkimageview::graphics/gtkimageview
+LIB_DEPENDS=	gimp-2.0,gimpbase-2.0,gimpcolor-2.0,gimpconfig-2.0,gimpmath-2.0,gimpui-2.0,gimpwidgets-2.0,gimpmodule-2.0:gimp->=2,<3:graphics/gimp/stable \
+		lcms.>=1.15::graphics/lcms \
+		bz2.>=10::archivers/bzip2 \
+		exiv2::graphics/exiv2 \
+		gtkimageview::graphics/gtkimageview
 
-MODULES=		devel/gettext
+MODULES=	devel/gettext
 
-USE_X11=		Yes
-USE_GMAKE=		Yes
-USE_LIBTOOL=		Yes
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -pthread"
-CONFIGURE_ARGS=		--enable-extras
+USE_X11=	Yes
+USE_GMAKE=	Yes
+USE_LIBTOOL=	Yes
+CONFIGURE_STYLE=gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -pthread"
+CONFIGURE_ARGS=	--enable-extras
+
+FLAVORS=	lensfun
+FLAVOR?=
+
+.if ${FLAVOR:L:Mlensfun}
+CONFIGURE_ARGS+=--with-lensfun
+LIB_DEPENDS+=	lensfun::graphics/lensfun
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/ufraw/pkg/DESCR b/graphics/ufraw/pkg/DESCR
index 64ee11d51fc..aa9accccad8 100644
--- a/graphics/ufraw/pkg/DESCR
+++ b/graphics/ufraw/pkg/DESCR
@@ -1,11 +1,10 @@
-Raw photo loader plugin for The GIMP by Udi Fuchs,
+UFRaw is a utility to read and manipulate raw images from digital
+cameras. It can be used by itself or as a GIMP plug-in.
 
-UFRaw is a utility to read and manipulate raw images from digital cameras.
-It can be used by itself or as a GIMP plug-in.
-It reads raw images using Dave Coffin's raw conversion utility DCRaw.
-And it supports basic color management using Little CMS, allowing
-the user to apply color profiles.
- 
-Ufraw was originally based on the GIMP plug-in by Dave Coffin
-http://www.cybercom.net/~dcoffin/
-and on Pawel T. Jochym's (jochym at ifj edu pl) plug-in.
+It reads raw images using an internal copy of Dave Coffin's raw
+conversion utility DCRaw and supports basic color management using
+Little CMS, allowing the user to apply color profiles.
+
+The optional lensfun flavor allows use of the lensfun library to
+correct for distortion, transversal chromatic aberrations, vignetting
+and colour contribution of the lens.