Update to 0.4

4 files changed, 22 insertions, 27 deletions

diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index f0ee223b32eb..52f9fee9ae2b 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	okle
-PORTVERSION=	0.3
-PORTREVISION=	2
+PORTVERSION=	0.4
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://okle.sourceforge.net/
 
@@ -17,10 +16,9 @@ COMMENT=	A KDE frontend to the Ogle DVD player
 BUILD_DEPENDS=	${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle
 RUN_DEPENDS=	ogle:${PORTSDIR}/multimedia/ogle
 
-USE_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	257
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
-USE_SIZE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogle-dir=${LOCALBASE}/bin \
 		--with-ogle-includes=${LOCALBASE}/include \
diff --git a/multimedia/okle/distinfo b/multimedia/okle/distinfo
index 211816b7150c..dee4a930952f 100644
--- a/multimedia/okle/distinfo
+++ b/multimedia/okle/distinfo
@@ -1,2 +1,2 @@
-MD5 (okle-0.3.tar.gz) = a81fce48f7c32ad3904077bf11f3976b
-SIZE (okle-0.3.tar.gz) = 570183
+MD5 (okle-0.4.tar.gz) = c5472e6f377809d97caed90fa2719de3
+SIZE (okle-0.4.tar.gz) = 652037
diff --git a/multimedia/okle/files/patch-src::okle_win.cpp b/multimedia/okle/files/patch-src::okle_win.cpp
index f2b8321aca14..2b9d03310f9c 100644
--- a/multimedia/okle/files/patch-src::okle_win.cpp
+++ b/multimedia/okle/files/patch-src::okle_win.cpp
@@ -1,6 +1,6 @@
---- src/okle_win.cpp.orig	Tue Feb 25 11:19:50 2003
-+++ src/okle_win.cpp	Sun Apr  6 01:50:55 2003
-@@ -34,6 +34,7 @@
+--- src/okle_win.cpp.orig	Sun Nov 23 09:26:07 2003
++++ src/okle_win.cpp	Thu Mar 11 22:41:26 2004
+@@ -37,6 +37,7 @@
  #include <kstandarddirs.h>
  #include <qtooltip.h>
  #include <dcopclient.h>
@@ -8,33 +8,21 @@
  
  extern "C" {
  #include <X11/Xlib.h>
-@@ -519,16 +520,16 @@
- void OkleWin::slotFileOpenDisc()
- {
-  conf->setGroup("DVD");
-- QString dvdp = conf->readEntry("dvdpath","/dev/dvd");
-+ QString dvdp = conf->readEntry("dvdpath","/dev/acd0c");
+@@ -737,14 +738,14 @@
+     return;
+   }
  
 - QFileInfo fi(dvdp);
 - if(!fi.exists())
 + KFileItem fi(KFileItem::Unknown, KFileItem::Unknown, dvdp);
 + if(!QFile::exists(dvdp))
    {
-    KMessageBox::error(0,QString(i18n("%1 does not exist!")).arg(dvdp),i18n("Error"));
+    KMessageBox::error(0,QString(i18n("%1 does not exist.\n\nEither set the correct DVD path in File -> Settings or create a symlink from your DVD device to %2.")).arg(dvdp).arg(dvdp),i18n("DVD device file not found"));
     return;
    }
  
 - if(!fi.isFile() && !fi.isSymLink())
 + if(!fi.isFile() && !fi.isLink())
    {
-    KMessageBox::error(0,QString(i18n("%1 exists but is not a file or symlink!")).arg(dvdp),i18n("Error"));
+    KMessageBox::error(0,QString(i18n("%1 exists but is not a file or symlink.\n\nMake sure that %2 really refers to your DVD device or change the DVD device path in File -> Settings.")).arg(dvdp).arg(dvdp),i18n("DVD device file not usable"));
     return;
-@@ -714,7 +715,7 @@
- {
-  PrefsWin* prefs = new PrefsWin(this);
-  conf->setGroup("DVD");
-- prefs->setDVDPath(conf->readEntry("dvdpath","/dev/dvd"));
-+ prefs->setDVDPath(conf->readEntry("dvdpath","/dev/acd0c"));
-  prefs->setRegion(conf->readNumEntry("region",1));
-  if(prefs->exec())
-   {
diff --git a/multimedia/okle/pkg-plist b/multimedia/okle/pkg-plist
index bc49495e42d9..52c8bdc8486b 100644
--- a/multimedia/okle/pkg-plist
+++ b/multimedia/okle/pkg-plist
@@ -10,6 +10,7 @@ share/apps/okle/pics/enter.png
 share/apps/okle/pics/fastforward.png
 share/apps/okle/pics/forward.png
 share/apps/okle/pics/goup.png
+share/apps/okle/pics/mute.png
 share/apps/okle/pics/pause.png
 share/apps/okle/pics/play.png
 share/apps/okle/pics/playfast.png
@@ -24,9 +25,14 @@ share/apps/okle/pics/stepreverse.png
 share/apps/okle/pics/stop.png
 share/apps/okle/pics/subtitleselect.png
 share/apps/okle/pics/up.png
+share/apps/okle/pics/volume.png
+share/doc/HTML/en/okle/common
+share/doc/HTML/en/okle/index.cache.bz2
+share/doc/HTML/en/okle/index.docbook
 share/icons/hicolor/16x16/apps/okle.png
 share/icons/hicolor/32x32/apps/okle.png
 share/locale/de/LC_MESSAGES/okle.mo
+share/locale/es/LC_MESSAGES/okle.mo
 share/locale/hu/LC_MESSAGES/okle.mo
 share/locale/it/LC_MESSAGES/okle.mo
 share/locale/sv/LC_MESSAGES/okle.mo
@@ -45,7 +51,10 @@ share/locale/sv/LC_MESSAGES/okle.mo
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
-@dirrm share/apps/okle/pics 
+@dirrm share/doc/HTML/en/okle
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrm share/apps/okle/pics
 @dirrm share/apps/okle
 @unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true