- Fix pkg-plist and unbreak

- Fix Flickr export plugin [1]
- Bump PORTREVISION

PR:		ports/103355 [1]
Submitted by:	Artem Naluzhny <tut@nhamon.com.ua> [1]
Approved by:	portmgr (marcus), maintainer

6 files changed, 74 insertions, 6 deletions

diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index 928ada2b6349..1b82fdadb96c 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	0.1.0.r1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,8 +22,6 @@ LIB_DEPENDS=	kexif.1:${PORTSDIR}/graphics/libkexif \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 		Imlib2.3:${PORTSDIR}/graphics/imlib2
 
-BROKEN=		Incomplete pkg-plist
-
 OPTIONS=	ACQUIREIMAGES "scanner/screenshot plugin" on \
 		BATCHPROCESSIMAGES "batch processing on images" on \
 		CALENDAR "create calendars" on \
diff --git a/graphics/kipi-plugins-kde4/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp b/graphics/kipi-plugins-kde4/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp
new file mode 100644
index 000000000000..ae61eb046d7c
--- /dev/null
+++ b/graphics/kipi-plugins-kde4/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp
@@ -0,0 +1,19 @@
+--- kipi-plugins/flickrexport/flickrtalker.cpp.orig	Tue Oct 24 18:07:24 2006
++++ kipi-plugins/flickrexport/flickrtalker.cpp	Tue Oct 24 18:09:52 2006
+@@ -277,7 +277,7 @@
+ 
+ 		QString isfriend=(info.is_friend==1)?"1":"0";
+ 		form.addPair("is_friend",isfriend);
+-		headers.append("api_key="+ isfriend);
++		headers.append("is_friend="+ isfriend);
+ 
+ 		QString tags=info.tags.join(" ");
+ 		if(tags.length()>0){	
+@@ -297,6 +297,7 @@
+ 		}
+ 
+ 		QString md5=getApiSig(m_secret,headers);
++		form.addPair("api_sig", md5);
+ 		headers.append("api_sig="+ md5);
+ 		QString queryStr=headers.join("&");
+ 		QString postUrl=url+queryStr;
diff --git a/graphics/kipi-plugins-kde4/pkg-plist b/graphics/kipi-plugins-kde4/pkg-plist
index 1d3f013d72bd..1253e94c9889 100644
--- a/graphics/kipi-plugins-kde4/pkg-plist
+++ b/graphics/kipi-plugins-kde4/pkg-plist
@@ -1,7 +1,9 @@
+%%ACQUIREIMAGES:%%lib/kde3/kipiplugin_acquireimages.a
 %%ACQUIREIMAGES:%%lib/kde3/kipiplugin_acquireimages.la
 %%ACQUIREIMAGES:%%lib/kde3/kipiplugin_acquireimages.so
 %%ACQUIREIMAGES:%%share/services/kipiplugin_acquireimages.desktop
 
+%%BATCHPROCESSIMAGES:%%lib/kde3/kipiplugin_batchprocessimages.a
 %%BATCHPROCESSIMAGES:%%lib/kde3/kipiplugin_batchprocessimages.la
 %%BATCHPROCESSIMAGES:%%lib/kde3/kipiplugin_batchprocessimages.so
 %%BATCHPROCESSIMAGES:%%share/apps/kipiplugin_batchprocessimages/data/handcursor.png
@@ -21,10 +23,12 @@
 %%BATCHPROCESSIMAGES:%%@dirrm share/apps/kipiplugin_batchprocessimages/data
 %%BATCHPROCESSIMAGES:%%@dirrm share/apps/kipiplugin_batchprocessimages
 
+%%CALENDAR:%%lib/kde3/kipiplugin_calendar.a
 %%CALENDAR:%%lib/kde3/kipiplugin_calendar.la
 %%CALENDAR:%%lib/kde3/kipiplugin_calendar.so
 %%CALENDAR:%%share/services/kipiplugin_calendar.desktop
 
+%%CDARCHIVING:%%lib/kde3/kipiplugin_cdarchiving.a
 %%CDARCHIVING:%%lib/kde3/kipiplugin_cdarchiving.la
 %%CDARCHIVING:%%lib/kde3/kipiplugin_cdarchiving.so
 %%CDARCHIVING:%%share/apps/kipi/data/autorun/ShellExecute.bat
@@ -34,6 +38,7 @@
 %%CDARCHIVING:%%share/services/kipiplugin_cdarchiving.desktop
 %%CDARCHIVING:%%@dirrm share/apps/kipi/data/autorun
 
+%%FINDIMAGES:%%lib/kde3/kipiplugin_findimages.a
 %%FINDIMAGES:%%lib/kde3/kipiplugin_findimages.la
 %%FINDIMAGES:%%lib/kde3/kipiplugin_findimages.so
 %%FINDIMAGES:%%share/apps/kipiplugin_findimages/icons/hicolor/32x32/actions/finddupplicateimages.png
@@ -44,14 +49,17 @@
 %%FINDIMAGES:%%@dirrm share/apps/kipiplugin_findimages/icons
 %%FINDIMAGES:%%@dirrm share/apps/kipiplugin_findimages
 
+%%FLICKREXPORT:%%lib/kde3/kipiplugin_flickrexport.a
 %%FLICKREXPORT:%%lib/kde3/kipiplugin_flickrexport.la
 %%FLICKREXPORT:%%lib/kde3/kipiplugin_flickrexport.so
 %%FLICKREXPORT:%%share/services/kipiplugin_flickrexport.desktop
 
+%%GALLERYEXPORT:%%lib/kde3/kipiplugin_galleryexport.a
 %%GALLERYEXPORT:%%lib/kde3/kipiplugin_galleryexport.so
 %%GALLERYEXPORT:%%lib/kde3/kipiplugin_galleryexport.la
 %%GALLERYEXPORT:%%share/services/kipiplugin_galleryexport.desktop
 
+%%IMAGESGALLERY:%%lib/kde3/kipiplugin_imagesgallery.a
 %%IMAGESGALLERY:%%lib/kde3/kipiplugin_imagesgallery.la
 %%IMAGESGALLERY:%%lib/kde3/kipiplugin_imagesgallery.so
 %%IMAGESGALLERY:%%share/apps/kipi/gohome.png
@@ -59,6 +67,7 @@
 %%IMAGESGALLERY:%%share/apps/kipi/valid-html401.png
 %%IMAGESGALLERY:%%share/services/kipiplugin_imagesgallery.desktop
 
+%%JPEGLOSSLESS:%%lib/kde3/kipiplugin_jpeglossless.a
 %%JPEGLOSSLESS:%%lib/kde3/kipiplugin_jpeglossless.la
 %%JPEGLOSSLESS:%%lib/kde3/kipiplugin_jpeglossless.so
 %%JPEGLOSSLESS:%%share/apps/kipiplugin_jpeglossless/icons/hicolor/32x32/actions/flip_image.png
@@ -70,20 +79,24 @@
 %%JPEGLOSSLESS:%%@dirrm share/apps/kipiplugin_jpeglossless/icons
 %%JPEGLOSSLESS:%%@dirrm share/apps/kipiplugin_jpeglossless
 
+%%KAMERAKLIENT:%%lib/kde3/kipiplugin_kameraklient.a
 %%KAMERAKLIENT:%%lib/kde3/kipiplugin_kameraklient.la
 %%KAMERAKLIENT:%%lib/kde3/kipiplugin_kameraklient.so
 %%KAMERAKLIENT:%%share/services/kipiplugin_kameraklient.desktop
 
 %%MPEGENCODER:%%bin/images2mpg
+%%MPEGENCODER:%%lib/kde3/kipiplugin_mpegencoder.a
 %%MPEGENCODER:%%lib/kde3/kipiplugin_mpegencoder.la
 %%MPEGENCODER:%%lib/kde3/kipiplugin_mpegencoder.so
 %%MPEGENCODER:%%share/services/kipiplugin_mpegencoder.desktop
 
+%%PRINTWIZARD:%%lib/kde3/kipiplugin_printwizard.a
 %%PRINTWIZARD:%%lib/kde3/kipiplugin_printwizard.la
 %%PRINTWIZARD:%%lib/kde3/kipiplugin_printwizard.so
 %%PRINTWIZARD:%%share/services/kipiplugin_printwizard.desktop
 
 %%RAWCONVERTER:%%bin/kipidcrawclient
+%%RAWCONVERTER:%%lib/kde3/kipiplugin_rawconverter.a
 %%RAWCONVERTER:%%lib/kde3/kipiplugin_rawconverter.la
 %%RAWCONVERTER:%%lib/kde3/kipiplugin_rawconverter.so
 %%RAWCONVERTER:%%share/apps/kipiplugin_rawconverter/icons/hicolor/32x32/actions/rawconverterbatch.png
@@ -95,10 +108,12 @@
 %%RAWCONVERTER:%%@dirrm share/apps/kipiplugin_rawconverter/icons
 %%RAWCONVERTER:%%@dirrm share/apps/kipiplugin_rawconverter
 
+%%SENDIMAGES:%%lib/kde3/kipiplugin_sendimages.a
 %%SENDIMAGES:%%lib/kde3/kipiplugin_sendimages.la
 %%SENDIMAGES:%%lib/kde3/kipiplugin_sendimages.so
 %%SENDIMAGES:%%share/services/kipiplugin_sendimages.desktop
 
+%%SLIDESHOW:%%lib/kde3/kipiplugin_slideshow.a
 %%SLIDESHOW:%%lib/kde3/kipiplugin_slideshow.la
 %%SLIDESHOW:%%lib/kde3/kipiplugin_slideshow.so
 %%SLIDESHOW:%%share/apps/kipiplugin_slideshow/icons/hicolor/22x22/actions/slideshow.png
@@ -109,10 +124,12 @@
 %%SLIDESHOW:%%@dirrm share/apps/kipiplugin_slideshow/icons
 %%SLIDESHOW:%%@dirrm share/apps/kipiplugin_slideshow
 
+%%TIMEADJUST:%%lib/kde3/kipiplugin_timeadjust.a
 %%TIMEADJUST:%%lib/kde3/kipiplugin_timeadjust.la
 %%TIMEADJUST:%%lib/kde3/kipiplugin_timeadjust.so
 %%TIMEADJUST:%%share/services/kipiplugin_timeadjust.desktop
 
+%%WALLPAPER:%%lib/kde3/kipiplugin_wallpaper.a
 %%WALLPAPER:%%lib/kde3/kipiplugin_wallpaper.la
 %%WALLPAPER:%%lib/kde3/kipiplugin_wallpaper.so
 %%WALLPAPER:%%share/services/kipiplugin_wallpaper.desktop
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 928ada2b6349..1b82fdadb96c 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kipi-plugins
 PORTVERSION=	0.1.0.r1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,8 +22,6 @@ LIB_DEPENDS=	kexif.1:${PORTSDIR}/graphics/libkexif \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
 		Imlib2.3:${PORTSDIR}/graphics/imlib2
 
-BROKEN=		Incomplete pkg-plist
-
 OPTIONS=	ACQUIREIMAGES "scanner/screenshot plugin" on \
 		BATCHPROCESSIMAGES "batch processing on images" on \
 		CALENDAR "create calendars" on \
diff --git a/graphics/kipi-plugins/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp b/graphics/kipi-plugins/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp
new file mode 100644
index 000000000000..ae61eb046d7c
--- /dev/null
+++ b/graphics/kipi-plugins/files/patch-kipi-plugins-flickrexport-flickrtalker.cpp
@@ -0,0 +1,19 @@
+--- kipi-plugins/flickrexport/flickrtalker.cpp.orig	Tue Oct 24 18:07:24 2006
++++ kipi-plugins/flickrexport/flickrtalker.cpp	Tue Oct 24 18:09:52 2006
+@@ -277,7 +277,7 @@
+ 
+ 		QString isfriend=(info.is_friend==1)?"1":"0";
+ 		form.addPair("is_friend",isfriend);
+-		headers.append("api_key="+ isfriend);
++		headers.append("is_friend="+ isfriend);
+ 
+ 		QString tags=info.tags.join(" ");
+ 		if(tags.length()>0){	
+@@ -297,6 +297,7 @@
+ 		}
+ 
+ 		QString md5=getApiSig(m_secret,headers);
++		form.addPair("api_sig", md5);
+ 		headers.append("api_sig="+ md5);
+ 		QString queryStr=headers.join("&");
+ 		QString postUrl=url+queryStr;
diff --git a/graphics/kipi-plugins/pkg-plist b/graphics/kipi-plugins/pkg-plist
index 1d3f013d72bd..1253e94c9889 100644
--- a/graphics/kipi-plugins/pkg-plist
+++ b/graphics/kipi-plugins/pkg-plist
@@ -1,7 +1,9 @@
+%%ACQUIREIMAGES:%%lib/kde3/kipiplugin_acquireimages.a
 %%ACQUIREIMAGES:%%lib/kde3/kipiplugin_acquireimages.la
 %%ACQUIREIMAGES:%%lib/kde3/kipiplugin_acquireimages.so
 %%ACQUIREIMAGES:%%share/services/kipiplugin_acquireimages.desktop
 
+%%BATCHPROCESSIMAGES:%%lib/kde3/kipiplugin_batchprocessimages.a
 %%BATCHPROCESSIMAGES:%%lib/kde3/kipiplugin_batchprocessimages.la
 %%BATCHPROCESSIMAGES:%%lib/kde3/kipiplugin_batchprocessimages.so
 %%BATCHPROCESSIMAGES:%%share/apps/kipiplugin_batchprocessimages/data/handcursor.png
@@ -21,10 +23,12 @@
 %%BATCHPROCESSIMAGES:%%@dirrm share/apps/kipiplugin_batchprocessimages/data
 %%BATCHPROCESSIMAGES:%%@dirrm share/apps/kipiplugin_batchprocessimages
 
+%%CALENDAR:%%lib/kde3/kipiplugin_calendar.a
 %%CALENDAR:%%lib/kde3/kipiplugin_calendar.la
 %%CALENDAR:%%lib/kde3/kipiplugin_calendar.so
 %%CALENDAR:%%share/services/kipiplugin_calendar.desktop
 
+%%CDARCHIVING:%%lib/kde3/kipiplugin_cdarchiving.a
 %%CDARCHIVING:%%lib/kde3/kipiplugin_cdarchiving.la
 %%CDARCHIVING:%%lib/kde3/kipiplugin_cdarchiving.so
 %%CDARCHIVING:%%share/apps/kipi/data/autorun/ShellExecute.bat
@@ -34,6 +38,7 @@
 %%CDARCHIVING:%%share/services/kipiplugin_cdarchiving.desktop
 %%CDARCHIVING:%%@dirrm share/apps/kipi/data/autorun
 
+%%FINDIMAGES:%%lib/kde3/kipiplugin_findimages.a
 %%FINDIMAGES:%%lib/kde3/kipiplugin_findimages.la
 %%FINDIMAGES:%%lib/kde3/kipiplugin_findimages.so
 %%FINDIMAGES:%%share/apps/kipiplugin_findimages/icons/hicolor/32x32/actions/finddupplicateimages.png
@@ -44,14 +49,17 @@
 %%FINDIMAGES:%%@dirrm share/apps/kipiplugin_findimages/icons
 %%FINDIMAGES:%%@dirrm share/apps/kipiplugin_findimages
 
+%%FLICKREXPORT:%%lib/kde3/kipiplugin_flickrexport.a
 %%FLICKREXPORT:%%lib/kde3/kipiplugin_flickrexport.la
 %%FLICKREXPORT:%%lib/kde3/kipiplugin_flickrexport.so
 %%FLICKREXPORT:%%share/services/kipiplugin_flickrexport.desktop
 
+%%GALLERYEXPORT:%%lib/kde3/kipiplugin_galleryexport.a
 %%GALLERYEXPORT:%%lib/kde3/kipiplugin_galleryexport.so
 %%GALLERYEXPORT:%%lib/kde3/kipiplugin_galleryexport.la
 %%GALLERYEXPORT:%%share/services/kipiplugin_galleryexport.desktop
 
+%%IMAGESGALLERY:%%lib/kde3/kipiplugin_imagesgallery.a
 %%IMAGESGALLERY:%%lib/kde3/kipiplugin_imagesgallery.la
 %%IMAGESGALLERY:%%lib/kde3/kipiplugin_imagesgallery.so
 %%IMAGESGALLERY:%%share/apps/kipi/gohome.png
@@ -59,6 +67,7 @@
 %%IMAGESGALLERY:%%share/apps/kipi/valid-html401.png
 %%IMAGESGALLERY:%%share/services/kipiplugin_imagesgallery.desktop
 
+%%JPEGLOSSLESS:%%lib/kde3/kipiplugin_jpeglossless.a
 %%JPEGLOSSLESS:%%lib/kde3/kipiplugin_jpeglossless.la
 %%JPEGLOSSLESS:%%lib/kde3/kipiplugin_jpeglossless.so
 %%JPEGLOSSLESS:%%share/apps/kipiplugin_jpeglossless/icons/hicolor/32x32/actions/flip_image.png
@@ -70,20 +79,24 @@
 %%JPEGLOSSLESS:%%@dirrm share/apps/kipiplugin_jpeglossless/icons
 %%JPEGLOSSLESS:%%@dirrm share/apps/kipiplugin_jpeglossless
 
+%%KAMERAKLIENT:%%lib/kde3/kipiplugin_kameraklient.a
 %%KAMERAKLIENT:%%lib/kde3/kipiplugin_kameraklient.la
 %%KAMERAKLIENT:%%lib/kde3/kipiplugin_kameraklient.so
 %%KAMERAKLIENT:%%share/services/kipiplugin_kameraklient.desktop
 
 %%MPEGENCODER:%%bin/images2mpg
+%%MPEGENCODER:%%lib/kde3/kipiplugin_mpegencoder.a
 %%MPEGENCODER:%%lib/kde3/kipiplugin_mpegencoder.la
 %%MPEGENCODER:%%lib/kde3/kipiplugin_mpegencoder.so
 %%MPEGENCODER:%%share/services/kipiplugin_mpegencoder.desktop
 
+%%PRINTWIZARD:%%lib/kde3/kipiplugin_printwizard.a
 %%PRINTWIZARD:%%lib/kde3/kipiplugin_printwizard.la
 %%PRINTWIZARD:%%lib/kde3/kipiplugin_printwizard.so
 %%PRINTWIZARD:%%share/services/kipiplugin_printwizard.desktop
 
 %%RAWCONVERTER:%%bin/kipidcrawclient
+%%RAWCONVERTER:%%lib/kde3/kipiplugin_rawconverter.a
 %%RAWCONVERTER:%%lib/kde3/kipiplugin_rawconverter.la
 %%RAWCONVERTER:%%lib/kde3/kipiplugin_rawconverter.so
 %%RAWCONVERTER:%%share/apps/kipiplugin_rawconverter/icons/hicolor/32x32/actions/rawconverterbatch.png
@@ -95,10 +108,12 @@
 %%RAWCONVERTER:%%@dirrm share/apps/kipiplugin_rawconverter/icons
 %%RAWCONVERTER:%%@dirrm share/apps/kipiplugin_rawconverter
 
+%%SENDIMAGES:%%lib/kde3/kipiplugin_sendimages.a
 %%SENDIMAGES:%%lib/kde3/kipiplugin_sendimages.la
 %%SENDIMAGES:%%lib/kde3/kipiplugin_sendimages.so
 %%SENDIMAGES:%%share/services/kipiplugin_sendimages.desktop
 
+%%SLIDESHOW:%%lib/kde3/kipiplugin_slideshow.a
 %%SLIDESHOW:%%lib/kde3/kipiplugin_slideshow.la
 %%SLIDESHOW:%%lib/kde3/kipiplugin_slideshow.so
 %%SLIDESHOW:%%share/apps/kipiplugin_slideshow/icons/hicolor/22x22/actions/slideshow.png
@@ -109,10 +124,12 @@
 %%SLIDESHOW:%%@dirrm share/apps/kipiplugin_slideshow/icons
 %%SLIDESHOW:%%@dirrm share/apps/kipiplugin_slideshow
 
+%%TIMEADJUST:%%lib/kde3/kipiplugin_timeadjust.a
 %%TIMEADJUST:%%lib/kde3/kipiplugin_timeadjust.la
 %%TIMEADJUST:%%lib/kde3/kipiplugin_timeadjust.so
 %%TIMEADJUST:%%share/services/kipiplugin_timeadjust.desktop
 
+%%WALLPAPER:%%lib/kde3/kipiplugin_wallpaper.a
 %%WALLPAPER:%%lib/kde3/kipiplugin_wallpaper.la
 %%WALLPAPER:%%lib/kde3/kipiplugin_wallpaper.so
 %%WALLPAPER:%%share/services/kipiplugin_wallpaper.desktop