- adoption of optionsNG

- convert to USES in some cases (pkgconfig,pathfix)
- trim COMMENT/historical headers in some cases

Approved by:	portmgr (miwi)

1 files changed, 56 insertions, 51 deletions

diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index aa0e62dfc126..074a030395aa 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	digikam-plugins
-# Date created: 			15 February 2004
-# Whom:					Arjan van Leeuwen <avleeuwen@piwebs.com>
-#
+# Created by: Arjan van Leeuwen <avleeuwen@piwebs.com>
 # $FreeBSD$
-#
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	0.1.7
@@ -20,28 +16,37 @@ LIB_DEPENDS=	kipi.2:${PORTSDIR}/graphics/libkipi \
 		png15:${PORTSDIR}/graphics/png \
 		kdcraw.4:${PORTSDIR}/graphics/libkdcraw
 
-OPTIONS=	ACQUIREIMAGES "scanner/screenshot plugin" on \
-		BATCHPROCESSIMAGES "batch processing on images" on \
-		CALENDAR "create calendars" on \
-		CDARCHIVING "create album CDs" on \
-		FINDIMAGES "find duplicate images in albums" on \
-		FLICKREXPORT "export images to flickr account" on \
-		GALLERYEXPORT "export images to remote Gallery server" on \
-		GPSSYNC "geolocalize pictures" on \
-		HTMLEXPORT "export images collections into HTML page" on \
-		IMAGEVIEWER "OpenGL based image viewer" on \
-		JPEGLOSSLESS "batch processing without losing metainfo" on \
-		KAMERAKLIENT "GPhoto2 interface (import from cameras)" on \
-		METADATAEDIT "edit EXIF and IPTC pictures metadata" on \
-		MPEGENCODER "tool to build a video from images" on \
-		PICASAWEBEXPORT "export images to Picasa web service" on \
-		PRINTWIZARD "a print wizard" on \
-		RAWCONVERTER "convert RAW images from digital cameras" on \
-		SENDIMAGES "send images by email" on \
-		SIMPLEVIEWEREXPORT "export images to SimpleViewer" on \
-		SLIDESHOW "create a slideshow" on \
-		TIMEADJUST "adjust image file time and date" on \
-		WALLPAPER "set your image as wallpaper" on
+OPTIONS_DEFINE=	ACQUIREIMAGES BATCHPROCESSIMAGES CALENDAR CDARCHIVING FINDIMAGES \
+		FLICKREXPORT GALLERYEXPORT GPSSYNC HTMLEXPORT IMAGEVIEWER JPEGLOSSLESS \
+		KAMERAKLIENT METADATAEDIT MPEGENCODER PICASAWEBEXPORT PRINTWIZARD RAWCONVERTER \
+		SENDIMAGES SIMPLEVIEWEREXPORT SLIDESHOW TIMEADJUST WALLPAPER
+ACQUIREIMAGES_DESC=	scanner/screenshot plugin
+BATCHPROCESSIMAGES_DESC=	batch processing on images
+CALENDAR_DESC=	create calendars
+CDARCHIVING_DESC=	create album CDs
+FINDIMAGES_DESC=	find duplicate images in albums
+FLICKREXPORT_DESC=	export images to flickr account
+GALLERYEXPORT_DESC=	export images to remote Gallery server
+GPSSYNC_DESC=	geolocalize pictures
+HTMLEXPORT_DESC=	export images collections into HTML page
+IMAGEVIEWER_DESC=	OpenGL based image viewer
+JPEGLOSSLESS_DESC=	batch processing without losing metainfo
+KAMERAKLIENT_DESC=	GPhoto2 interface (import from cameras)
+METADATAEDIT_DESC=	edit EXIF and IPTC pictures metadata
+MPEGENCODER_DESC=	tool to build a video from images
+PICASAWEBEXPORT_DESC=	export images to Picasa web service
+PRINTWIZARD_DESC=	a print wizard
+RAWCONVERTER_DESC=	convert RAW images from digital cameras
+SENDIMAGES_DESC=	send images by email
+SIMPLEVIEWEREXPORT_DESC=	export images to SimpleViewer
+SLIDESHOW_DESC=	create a slideshow
+TIMEADJUST_DESC=	adjust image file time and date
+WALLPAPER_DESC=	set your image as wallpaper
+
+OPTIONS_DEFAULT=	ACQUIREIMAGES BATCHPROCESSIMAGES CALENDAR CDARCHIVING FINDIMAGES \
+		FLICKREXPORT GALLERYEXPORT GPSSYNC HTMLEXPORT IMAGEVIEWER JPEGLOSSLESS \
+		KAMERAKLIENT METADATAEDIT MPEGENCODER PICASAWEBEXPORT PRINTWIZARD RAWCONVERTER \
+		SENDIMAGES SIMPLEVIEWEREXPORT SLIDESHOW TIMEADJUST WALLPAPER
 
 PORTSCOUT=	limit:^0\.1\.
 
@@ -53,9 +58,9 @@ USES=		gettext
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-ipodexport
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_ACQUIREIMAGES)
+.if ${PORT_OPTIONS:MACQUIREIMAGES}
 PLIST_SUB+=	ACQUIREIMAGES:=""
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .else
@@ -63,7 +68,7 @@ PLIST_SUB+=	ACQUIREIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-acquireimages
 .endif
 
-.if !defined(WITHOUT_BATCHPROCESSIMAGES)
+.if ${PORT_OPTIONS:MBATCHPROCESSIMAGES}
 PLIST_SUB+=	BATCHPROCESSIMAGES:=""
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .else
@@ -71,7 +76,7 @@ PLIST_SUB+=	BATCHPROCESSIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-batchprocessimages
 .endif
 
-.if !defined(WITHOUT_CALENDAR)
+.if ${PORT_OPTIONS:MCALENDAR}
 PLIST_SUB+=	CALENDAR:=""
 LIB_DEPENDS+=	kcal.2:${PORTSDIR}/deskutils/kdepim3
 .else
@@ -79,7 +84,7 @@ PLIST_SUB+=	CALENDAR:="@comment "
 CONFIGURE_ARGS+=--disable-calendar
 .endif
 
-.if !defined(WITHOUT_CDARCHIVING)
+.if ${PORT_OPTIONS:MCDARCHIVING}
 PLIST_SUB+=	CDARCHIVING:=""
 RUN_DEPENDS+=	k3b:${PORTSDIR}/sysutils/k3b
 .else
@@ -87,35 +92,35 @@ PLIST_SUB+=	CDARCHIVING:="@comment "
 CONFIGURE_ARGS+=--disable-cdarchiving
 .endif
 
-.if !defined(WITHOUT_FINDIMAGES)
+.if ${PORT_OPTIONS:MFINDIMAGES}
 PLIST_SUB+=	FINDIMAGES:=""
 .else
 PLIST_SUB+=	FINDIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-findimages
 .endif
 
-.if !defined(WITHOUT_FLICKREXPORT)
+.if ${PORT_OPTIONS:MFLICKREXPORT}
 PLIST_SUB+=	FLICKREXPORT:=""
 .else
 PLIST_SUB+=	FLICKREXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-flickrexport
 .endif
 
-.if !defined(WITHOUT_GALLERYEXPORT)
+.if ${PORT_OPTIONS:MGALLERYEXPORT}
 PLIST_SUB+=	GALLERYEXPORT:=""
 .else
 PLIST_SUB+=	GALLERYEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-galleryexport
 .endif
 
-.if !defined(WITHOUT_GPSSYNC)
+.if ${PORT_OPTIONS:MGPSSYNC}
 PLIST_SUB+=	GPSSYNC:=""
 .else
 PLIST_SUB+=	GPSSYNC:="@comment "
 CONFIGURE_ARGS+=--disable-gpssync
 .endif
 
-.if !defined(WITHOUT_HTMLEXPORT)
+.if ${PORT_OPTIONS:MHTMLEXPORT}
 PLIST_SUB+=	HTMLEXPORT:=""
 LIB_DEPENDS+=	xslt.2:${PORTSDIR}/textproc/libxslt
 .else
@@ -123,14 +128,14 @@ PLIST_SUB+=	HTMLEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-htmlexport
 .endif
 
-.if !defined(WITHOUT_IMAGEVIEWER)
+.if ${PORT_OPTIONS:MIMAGEVIEWER}
 PLIST_SUB+=	IMAGEVIEWER:=""
 .else
 PLIST_SUB+=	IMAGEVIEWER:="@comment "
 CONFIGURE_ARGS+=--disable-imageviewer
 .endif
 
-.if !defined(WITHOUT_JPEGLOSSLESS)
+.if ${PORT_OPTIONS:MJPEGLOSSLESS}
 PLIST_SUB+=	JPEGLOSSLESS:=""
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .else
@@ -138,7 +143,7 @@ PLIST_SUB+=	JPEGLOSSLESS:="@comment "
 CONFIGURE_ARGS+=--disable-jpeglossless
 .endif
 
-.if !defined(WITHOUT_KAMERAKLIENT)
+.if ${PORT_OPTIONS:MKAMERAKLIENT}
 PLIST_SUB+=	KAMERAKLIENT:=""
 LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
 .else
@@ -146,14 +151,14 @@ PLIST_SUB+=	KAMERAKLIENT:="@comment "
 CONFIGURE_ARGS+=--disable-kameraklient
 .endif
 
-.if !defined(WITHOUT_METADATAEDIT)
+.if ${PORT_OPTIONS:MMETADATAEDIT}
 PLIST_SUB+=	METADATAEDIT:=""
 .else
 PLIST_SUB+=	METADATAEDIT:="@comment "
 CONFIGURE_ARGS+=--disable-metadataedit
 .endif
 
-.if !defined(WITHOUT_MPEGENCODER)
+.if ${PORT_OPTIONS:MMPEGENCODER}
 PLIST_SUB+=	MPEGENCODER:=""
 RUN_DEPENDS+=	mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
 		convert:${PORTSDIR}/graphics/ImageMagick
@@ -163,21 +168,21 @@ PLIST_SUB+=	MPEGENCODER:="@comment "
 CONFIGURE_ARGS+=--disable-mpegencoder
 .endif
 
-.if !defined(WITHOUT_PICASAWEBEXPORT)
+.if ${PORT_OPTIONS:MPICASAWEBEXPORT}
 PLIST_SUB+=	PICASAWEBEXPORT:=""
 .else
 PLIST_SUB+=	PICASAWEBEXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-picasawebexport
 .endif
 
-.if !defined(WITHOUT_PRINTWIZARD)
+.if ${PORT_OPTIONS:MPRINTWIZARD}
 PLIST_SUB+=	PRINTWIZARD:=""
 .else
 PLIST_SUB+=	PRINTWIZARD:="@comment "
 CONFIGURE_ARGS+=--disable-printwizard
 .endif
 
-.if !defined(WITHOUT_RAWCONVERTER)
+.if ${PORT_OPTIONS:MRAWCONVERTER}
 PLIST_SUB+=	RAWCONVERTER:=""
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .else
@@ -185,35 +190,35 @@ PLIST_SUB+=	RAWCONVERTER:="@comment "
 CONFIGURE_ARGS+=--disable-rawconverter
 .endif
 
-.if !defined(WITHOUT_SENDIMAGES)
+.if ${PORT_OPTIONS:MSENDIMAGES}
 PLIST_SUB+=	SENDIMAGES:=""
 .else
 PLIST_SUB+=	SENDIMAGES:="@comment "
 CONFIGURE_ARGS+=--disable-sendimages
 .endif
 
-.if !defined(WITHOUT_SIMPLEVIEWEREXPORT)
+.if ${PORT_OPTIONS:MSIMPLEVIEWEREXPORT}
 PLIST_SUB+=	SIMPLEVIEWEREXPORT:=""
 .else
 PLIST_SUB+=	SIMPLEVIEWEREXPORT:="@comment "
 CONFIGURE_ARGS+=--disable-simpleviewerexport
 .endif
 
-.if !defined(WITHOUT_SLIDESHOW)
+.if ${PORT_OPTIONS:MSLIDESHOW}
 PLIST_SUB+=	SLIDESHOW:=""
 .else
 PLIST_SUB+=	SLIDESHOW:="@comment "
 CONFIGURE_ARGS+=--disable-slideshow
 .endif
 
-.if !defined(WITHOUT_TIMEADJUST)
+.if ${PORT_OPTIONS:MTIMEADJUST}
 PLIST_SUB+=	TIMEADJUST:=""
 .else
 PLIST_SUB+=	TIMEADJUST:="@comment "
 CONFIGURE_ARGS+=--disable-timeadjust
 .endif
 
-.if !defined(WITHOUT_WALLPAPER)
+.if ${PORT_OPTIONS:MWALLPAPER}
 PLIST_SUB+=	WALLPAPER:=""
 .else
 PLIST_SUB+=	WALLPAPER:="@comment "
@@ -225,4 +230,4 @@ post-patch::
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>