ports/174003: graphics/ufraw optionsng

[Rodrigo OSORIO (ros)]

>Number:         174003
>Category:       ports
>Synopsis:       graphics/ufraw optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 29 20:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Rodrigo (ros) OSORIO
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD sisko 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:46:30 UTC 2012 root at farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
	Update port makefile and introduces optionsng
	
>How-To-Repeat:
	
>Fix:

	



--- ufraw.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 307812)
+++ Makefile	(working copy)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	UFRaw
-# Date created:				Sun 10 Apr 2005 14:44:15 BST
-# Whom:					Mark Murray <markm at FreeBSD.org>
-#
+# Created by: Mark Murray <markm at FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ufraw
 PORTVERSION=	0.18
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -16,10 +12,10 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+		tiff:${PORTSDIR}/graphics/tiff \
 		png15:${PORTSDIR}/graphics/png \
-		lcms.1:${PORTSDIR}/graphics/lcms
+		lcms:${PORTSDIR}/graphics/lcms
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules --enable-extras
@@ -32,45 +28,46 @@
 
 MAN1=		ufraw.1
 
-OPTIONS=	CONTRAST "Enable contrast setting option"	on \
-		DST	"Use local time for timestamps"		off \
-		EXIV2	"Enable EXIF support via exiv2 library"	on \
-		LENSFUN	"Enable LensFun library support"	on \
-		FITS	"Enable FITS output support"		off \
-		GIMP	"Install GIMP plugin"			off \
-		GTK	"Build Gtk+2 GUI"			on \
-		GNOME	"Register .desktop file and GConf2 schemas" off
+OPTIONS_DEFINE=  CONTRAST DST EXIV2 LENSFUN FITS GIMP GTK2 GNOME
+CONTRAST_DESC= 	Enable contrast setting option
+DST_DESC=	Use local time for timestamps
+EXIV2_DESC=	Enable EXIF support via exiv2 library
+LENSFUN_DESC=	Enable LensFun library support
+FITS_DESC=	Enable FITS output support
+GIMP_DESC=	Install GIMP plugin
 
+OPTIONS_DEFAULT= CONTRAST EXIV2 LENSFUN GTK2
+
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CONTRAST)
+.if ${PORT_OPTIONS:MCONTRAST}
 CONFIGURE_ARGS+=	--enable-contrast
 .endif
 
-.if defined(WITH_DST)
+.if ${PORT_OPTIONS:MDST}
 CONFIGURE_ARGS+=	--enable-dst-correction
 .endif
 
-.if defined(WITH_EXIV2)
-LIB_DEPENDS+=	exiv2.12:${PORTSDIR}/graphics/exiv2
+.if ${PORT_OPTIONS:MEXIV2}
+LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
 .else
 PC_FALSE+=	exiv2
 .endif
 
-.if defined(WITH_LENSFUN)
-LIB_DEPENDS+=	lensfun.2:${PORTSDIR}/graphics/lensfun
+.if ${PORT_OPTIONS:MLENSFUN}
+LIB_DEPENDS+=	lensfun:${PORTSDIR}/graphics/lensfun
 .else
 PC_FALSE+=	lensfun
 .endif
 
-.if defined(WITH_FITS)
-LIB_DEPENDS+=	cfitsio.0:${PORTSDIR}/astro/cfitsio
+.if ${PORT_OPTIONS:MFITS}
+LIB_DEPENDS+=	cfitsio:${PORTSDIR}/astro/cfitsio
 .else
 PC_FALSE+=	cfitsio
 .endif
 
-.if defined(WITH_GIMP)
-LIB_DEPENDS+=	gimp-2.0.0:${PORTSDIR}/graphics/gimp-app
+.if ${PORT_OPTIONS:MGIMP}
+LIB_DEPENDS+=	gimp-2:${PORTSDIR}/graphics/gimp-app
 PLIST_SUB+=	GIMP=""
 .else
 CONFIGURE_ARGS+=--without-gimp
@@ -78,14 +75,14 @@
 PLIST_SUB+=	GIMP="@comment "
 .endif
 
-.if defined(WITH_GTK)
-LIB_DEPENDS+=	gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview
+.if ${PORT_OPTIONS:MGTK2}
+LIB_DEPENDS+=	gtkimageview:${PORTSDIR}/x11-toolkits/gtkimageview
 PLIST_FILES+=	bin/ufraw
 .else
 CONFIGURE_ARGS+=--without-gtk
 .endif
 
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 CATEGORIES+=	gnome
 USE_GNOME=	desktopfileutils gconf2
 CONFIGURE_ARGS+=	--enable-mime
@@ -113,7 +110,7 @@
 		${WRKSRC}
 
 post-install:
-.if defined(WITH_GNOME)
+.if ${PORT_OPTIONS:MGNOME}
 	@${SETENV} GCONF_CONFIG_SOURCE=${GCONF_CONFIG_SOURCE} \
 		gconftool-2 --makefile-install-rule \
 		${PREFIX}/etc/gconf/schemas/${PORTNAME}.schemas
--- ufraw.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: