4 files changed, 54 insertions, 43 deletions

diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
index eab30d394f00..732fdb120259 100644
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@@ -6,23 +6,25 @@
 #
 
 PORTNAME=	kuickshow
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.2
 CATEGORIES=	graphics
-MASTER_SITES=	http://master.kde.org/~pfeiffer/kuickshow/ \
-		ftp://ftp.nuug.no/pub/anders/distfiles/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	anders@fix.no
 
 GNU_CONFIGURE=	yes
 
+USE_IMLIB=	yes
 USE_KDELIBS_VER=	2
 USE_GMAKE=	yes
 
-CONFIGURE_ENV+=	LIBQT="-lqt2" MOC="moc2" KDEDIR="${LOCALBASE}"
-CONFIGURE_ARGS+=	--with-qt-includes=${X11BASE}/include/qt2 \
-			--with-qt-libraries=${X11BASE}/lib \
-			--with-imlib-config=${X11BASE}/bin
+CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
+CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin
+
+post-patch:
+	@${PERL} -pi -e 's,-O2,,g' ${WRKSRC}/configure
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/graphics/kuickshow-kde4/distinfo b/graphics/kuickshow-kde4/distinfo
index adc6b2834b78..7e7bdb118515 100644
--- a/graphics/kuickshow-kde4/distinfo
+++ b/graphics/kuickshow-kde4/distinfo
@@ -1 +1 @@
-MD5 (kuickshow-0.8.1.tgz) = 16cc2c0ffe1f61deae3cd1e86e3ecce1
+MD5 (kuickshow-0.8.2.tgz) = a1378b9caaaa4546981adc3dced76c4a
diff --git a/graphics/kuickshow-kde4/pkg-descr b/graphics/kuickshow-kde4/pkg-descr
index 24761e6e5733..c16003a34858 100644
--- a/graphics/kuickshow-kde4/pkg-descr
+++ b/graphics/kuickshow-kde4/pkg-descr
@@ -6,6 +6,6 @@ adjust brightness, contrast, and gamma, and do a slideshow. It is fully
 configurable through dialogs. It offers a filebrowser with basic filemanager
 capabilities like renaming, deleting, creating directories, etc.
 
-WWW: http://master.kde.org/~pfeiffer/kuickshow/
+WWW: http://kuickshow.sourceforge.net/
 
 - Anders Nordby <anders@fix.no>
diff --git a/graphics/kuickshow-kde4/pkg-plist b/graphics/kuickshow-kde4/pkg-plist
index e222a6958fa3..d2f776e58f32 100644
--- a/graphics/kuickshow-kde4/pkg-plist
+++ b/graphics/kuickshow-kde4/pkg-plist
@@ -1,44 +1,53 @@
 bin/kuickshow
-lib/kuickshow.so
 lib/kuickshow.la
-%%PORTDOCS%%share/doc/HTML/en/kuickshow/index.html
-%%PORTDOCS%%share/doc/HTML/en/kuickshow/logo.gif
-%%PORTDOCS%%share/doc/HTML/en/kuickshow/ChangeLog
-%%PORTDOCS%%share/doc/HTML/de/kuickshow/index.html
-%%PORTDOCS%%share/doc/HTML/de/kuickshow/logo.gif
-%%PORTDOCS%%share/doc/HTML/de/kuickshow/ChangeLog
-%%PORTDOCS%%@dirrm share/doc/HTML/en/kuickshow
-%%PORTDOCS%%@dirrm share/doc/HTML/de/kuickshow
-share/locale/es/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/pt_BR/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/pl/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/de/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/da/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/fr/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/nl/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/no/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/pt/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/sv/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/cs/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/hr/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/ro/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/uk/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/hu/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/po/LC_MESSAGES/kuickshow-0.8.1.mo
-share/locale/br/LC_MESSAGES/kuickshow-0.8.1.mo
+lib/kuickshow.so
 share/applnk/Graphics/kuickshow.desktop
-share/icons/locolor/16x16/actions/ksslide.png
-share/icons/locolor/16x16/actions/about.png
-share/icons/locolor/16x16/apps/kuickshow.png
-share/icons/locolor/32x32/apps/kuickshow.png
 share/apps/kuickshow/im_palette.pal
+share/apps/kuickshow/pics/about.png
 share/apps/kuickshow/pics/calibrate.png
-share/apps/kuickshow/pics/kuickshow-day.jpg
-share/apps/kuickshow/pics/kuickshow-night.jpg
-share/apps/kuickshow/pics/logo.png
 share/apps/kuickshow/pics/eqx2.png
+share/apps/kuickshow/pics/handcursor.png
 share/apps/kuickshow/pics/imageviewer-medium.png
 share/apps/kuickshow/pics/imageviewer-small.png
-share/apps/kuickshow/pics/handcursor.png
+share/apps/kuickshow/pics/ksslide.png
+share/apps/kuickshow/pics/kuickshow-day.jpg
+share/apps/kuickshow/pics/kuickshow-night.jpg
+share/apps/kuickshow/pics/logo.png
+%%PORTDOCS%%share/doc/HTML/de/kuickshow/ChangeLog
+%%PORTDOCS%%share/doc/HTML/de/kuickshow/index.html
+%%PORTDOCS%%share/doc/HTML/de/kuickshow/logo.gif
+%%PORTDOCS%%share/doc/HTML/en/kuickshow/ChangeLog
+%%PORTDOCS%%share/doc/HTML/en/kuickshow/index.html
+%%PORTDOCS%%share/doc/HTML/en/kuickshow/logo.gif
+share/icons/locolor/16x16/apps/kuickshow.png
+share/icons/locolor/32x32/apps/kuickshow.png
+share/icons/hicolor/32x32/apps/kuickshow.png
+share/icons/hicolor/16x16/apps/kuickshow.png
+share/locale/af/LC_MESSAGES/kuickshow.mo
+share/locale/bg/LC_MESSAGES/kuickshow.mo
+share/locale/br/LC_MESSAGES/kuickshow.mo
+share/locale/cs/LC_MESSAGES/kuickshow.mo
+share/locale/da/LC_MESSAGES/kuickshow.mo
+share/locale/de/LC_MESSAGES/kuickshow.mo
+share/locale/en_GB/LC_MESSAGES/kuickshow.mo
+share/locale/es/LC_MESSAGES/kuickshow.mo
+share/locale/fr/LC_MESSAGES/kuickshow.mo
+share/locale/hr/LC_MESSAGES/kuickshow.mo
+share/locale/hu/LC_MESSAGES/kuickshow.mo
+share/locale/lv/LC_MESSAGES/kuickshow.mo
+share/locale/nl/LC_MESSAGES/kuickshow.mo
+share/locale/no/LC_MESSAGES/kuickshow.mo
+share/locale/pl/LC_MESSAGES/kuickshow.mo
+share/locale/po/LC_MESSAGES/kuickshow.mo
+share/locale/pt/LC_MESSAGES/kuickshow.mo
+share/locale/pt_BR/LC_MESSAGES/kuickshow.mo
+share/locale/ro/LC_MESSAGES/kuickshow.mo
+share/locale/sv/LC_MESSAGES/kuickshow.mo
+share/locale/uk/LC_MESSAGES/kuickshow.mo
+@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/* 2>/dev/null || true
+@unexec rmdir %D/share/locale 2>/dev/null || true
+%%PORTDOCS%%@dirrm share/doc/HTML/en/kuickshow
+%%PORTDOCS%%@dirrm share/doc/HTML/de/kuickshow
 @dirrm share/apps/kuickshow/pics
 @dirrm share/apps/kuickshow