1 files changed, 73 insertions, 45 deletions

diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 79248b23eb80..28f2a34af870 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -5,30 +5,35 @@
 # $FreeBSD$
 #
 
-PORTNAME=	digikamplugins
-PORTVERSION=	0.6
-PORTREVISION=	2
+PORTNAME=	kipi-plugins
+PORTVERSION=	0.1.b.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	digikam
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b.1/-beta1/}
 
 MAINTAINER=	avleeuwen@piwebs.com
-COMMENT=	Collection of plugins for Digikam
-
-BUILD_DEPENDS=	imlib-config:${PORTSDIR}/graphics/imlib
-LIB_DEPENDS=	digikam.0:${PORTSDIR}/graphics/digikam
-
-OPTIONS=	ACQUIREIMAGES "scanner plugin" on \
-		CDARCHIVING "plugin to create album CDs" on \
-		COMMENTSEDITOR "plugin to edit image comments" on \
+COMMENT=	KDE Image Plugin Interface plugins
+
+LIB_DEPENDS=	kexif:${PORTSDIR}/graphics/libkexif \
+		kipi:${PORTSDIR}/graphics/libkipi \
+		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
+		Imlib2.2:${PORTSDIR}/graphics/imlib2
+
+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 \
 		IMAGESGALLERY "album to HTML gallery export" on \
 		JPEGLOSSLESS "batch processing without losing meta info" on \
-		MISCSOPERATIONS "Image2Desktop and Album2FileManager apps" on \
 		MPEGENCODER "tool to build a video from images" on \
 		PRINTWIZARD "a print wizard" on \
 		RAWCONVERTER "convert RAW images from digital cameras" on \
 		SENDIMAGES "an email images plugin" on \
-		SLIDESHOW "create a slideshow" on
+		SLIDESHOW "create a slideshow" on \
+		TIMEADJUST "adjust image file time and date" on \
+		WALLPAPER "set your image as wallpaper" on
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -36,92 +41,115 @@ USE_GMAKE=	yes
 USE_KDELIBS_VER=3
 USE_REINPLACE=	yes
 CONFIGURE_ARGS+=--program-prefix=''
-CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_ACQUIREIMAGES)
+.if !defined(WITHOUT_ACQUIREIMAGES)
 PLIST_SUB+=	ACQUIREIMAGES:=""
+SUBDIRS+=	acquireimages
 .else
-DO_NOT_COMPILE+=acquireimages
 PLIST_SUB+=	ACQUIREIMAGES:="@comment "
 .endif
 
-.if defined(WITH_CDARCHIVING)
+.if !defined(WITHOUT_BATCHPROCESSIMAGES)
+PLIST_SUB+=	BATCHPROCESSIMAGES:=""
+SUBDIRS+=	batchprocessimages
+.else
+PLIST_SUB+=	BATCHPROCESSIMAGES:="@comment "
+.endif
+
+.if !defined(WITHOUT_CALENDAR)
+PLIST_SUB+=	CALENDAR:=""
+SUBDIRS+=	calendar
+.else
+PLIST_SUB+=	CALENDAR:="@comment "
+.endif
+
+.if !defined(WITHOUT_CDARCHIVING)
 PLIST_SUB+=	CDARCHIVING:=""
 RUN_DEPENDS+=	k3b:${PORTSDIR}/sysutils/k3b
+SUBDIRS+=	cdarchiving
 .else
-DO_NOT_COMPILE+=cdarchiving
 PLIST_SUB+=	CDARCHIVING:="@comment "
 .endif
 
-.if defined(WITH_COMMENTSEDITOR)
-PLIST_SUB+=	COMMENTSEDITOR:=""
+.if !defined(WITHOUT_FINDIMAGES)
+PLIST_SUB+=	FINDIMAGES:=""
+SUBDIRS+=	findimages
 .else
-DO_NOT_COMPILE+=commentseditor
-PLIST_SUB+=	COMMENTSEDITOR:="@comment "
+PLIST_SUB+=	FINDIMAGES:="@comment "
 .endif
 
-.if defined(WITH_IMAGESGALLERY)
+.if !defined(WITHOUT_IMAGESGALLERY)
 PLIST_SUB+=	IMAGESGALLERY:=""
+SUBDIRS+=	imagesgallery
 .else
-DO_NOT_COMPILE+=imagesgallery
 PLIST_SUB+=	IMAGESGALLERY:="@comment "
 .endif
 
-.if defined(WITH_JPEGLOSSLESS)
+.if !defined(WITHOUT_JPEGLOSSLESS)
 PLIST_SUB+=	JPEGLOSSLESS:=""
+SUBDIRS+=	jpeglossless
 .else
-DO_NOT_COMPILE+=jpeglossless
 PLIST_SUB+=	JPEGLOSSLESS:="@comment "
 .endif
 
-.if defined(WITH_MISCSOPERATIONS)
-PLIST_SUB+=	MISCSOPERATIONS:=""
-.else
-DO_NOT_COMPILE+=miscsoperations
-PLIST_SUB+=	MISCSOPERATIONS:="@comment "
-.endif
-
-.if defined(WITH_MPEGENCODER)
+.if !defined(WITHOUT_MPEGENCODER)
 PLIST_SUB+=	MPEGENCODER:=""
 RUN_DEPENDS+=	mpeg2enc:${PORTSDIR}/multimedia/mjpegtools \
 		convert:${PORTSDIR}/graphics/ImageMagick
+MAN1+=		images2mpg.1
+SUBDIRS+=	mpegencoder
 .else
-DO_NOT_COMPILE+=mpegencoder
 PLIST_SUB+=	MPEGENCODER:="@comment "
 .endif
 
-.if defined(WITH_PRINTWIZARD)
+.if !defined(WITHOUT_PRINTWIZARD)
 PLIST_SUB+=	PRINTWIZARD:=""
+SUBDIRS+=	printwizard
 .else
-DO_NOT_COMPILE+=printwizard
 PLIST_SUB+=	PRINTWIZARD:="@comment "
 .endif
 
-.if defined(WITH_RAWCONVERTER)
+.if !defined(WITHOUT_RAWCONVERTER)
 PLIST_SUB+=	RAWCONVERTER:=""
 RUN_DEPENDS+=	dcraw:${PORTSDIR}/graphics/dcraw
+MAN1+=		kipidcrawclient.1
+SUBDIRS+=	rawconverter
 .else
-DO_NOT_COMPILE+=rawconverter
 PLIST_SUB+=	RAWCONVERTER:="@comment "
 .endif
 
-.if defined(WITH_SENDIMAGES)
+.if !defined(WITHOUT_SENDIMAGES)
 PLIST_SUB+=	SENDIMAGES:=""
+SUBDIRS+=	sendimages
 .else
-DO_NOT_COMPILE+=sendimages
 PLIST_SUB+=	SENDIMAGES:="@comment "
 .endif
 
-.if defined(WITH_SLIDESHOW)
+.if !defined(WITHOUT_SLIDESHOW)
 PLIST_SUB+=	SLIDESHOW:=""
+SUBDIRS+=	slideshow
 .else
-DO_NOT_COMPILE+=slideshow
 PLIST_SUB+=	SLIDESHOW:="@comment "
 .endif
 
-pre-configure::
-	${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
+.if !defined(WITHOUT_TIMEADJUST)
+PLIST_SUB+=	TIMEADJUST:=""
+SUBDIRS+=	timeadjust
+.else
+PLIST_SUB+=	TIMEADJUST:="@comment "
+.endif
+
+.if !defined(WITHOUT_WALLPAPER)
+PLIST_SUB+=	WALLPAPER:=""
+SUBDIRS+=	wallpaper
+.else
+PLIST_SUB+=	WALLPAPER:="@comment "
+.endif
+
+post-patch::
+	@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${SUBDIRS}@g' ${WRKSRC}/kipi-plugins/Makefile.in
 
 .include <bsd.port.post.mk>