o Update to 0.2.3

o Remove patches/scripts merged into distribution

6 files changed, 4 insertions, 64 deletions

diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile
index 774d86d563f8..5e60e8609c13 100644
--- a/multimedia/okle/Makefile
+++ b/multimedia/okle/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	okle
-PORTVERSION=	0.2.2
-PORTREVISION=	1
+PORTVERSION=	0.2.3
 CATEGORIES=	graphics kde
 MASTER_SITES=	http://okle.sourceforge.net/
 
@@ -22,6 +21,7 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogle-dir=${LOCALBASE}/bin \
 		--with-ogle-includes=${LOCALBASE}/include \
+		--program-transform-name="s|,|,|" \
 		--with-ogle-libs=${LOCALBASE}/lib/ogle
 
 # location of okle ogle_gui
@@ -39,11 +39,6 @@ pre-everything::
 pre-configure:
 	@cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && ${LOCALBASE}/bin/autoheader
 
-post-install:
-	@${MKDIR} ${PREFIX}/lib/okle
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/ogle_gui ${PREFIX}/lib/okle
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/${PORTNAME}
-
 .include <bsd.port.pre.mk>
 
 .ifdef(WITH_DVD_DEVICE)
@@ -53,15 +48,6 @@ DEFAULT_DVD_DEVICE=/dev/acd0c
 .endif
 
 post-patch:
-# wrapper hack to allow ogle to have both ogle-gui and oKle installed
-# at same time
-	@${SED} -e "s|%%DVDP_UI%%|${DVDP_UI}|; \
-		s|%%ENV%%|${SETENV}|; \
-		s|%%OGLE%%|${OGLE}|" \
-		${FILESDIR}/wrapper.sh > \
-		${WRKDIR}/wrapper.sh
-	@${REINPLACE_CMD} -E -e 's|^(Exec=).+$$|\1${PORTNAME}|' \
-		${WRKSRC}/src/okle.desktop
 # point to specific device
 	@${REINPLACE_CMD} -e "s|\"/dev/dvd\"|\"${DEFAULT_DVD_DEVICE}\"|" \
 		${WRKSRC}/src/okle_win.cpp
diff --git a/multimedia/okle/distinfo b/multimedia/okle/distinfo
index e77dd07d625f..0f390067914a 100644
--- a/multimedia/okle/distinfo
+++ b/multimedia/okle/distinfo
@@ -1 +1 @@
-MD5 (okle-0.2.2.tar.gz) = 1fe13301f071f9aa52b1c9093d7b4677
+MD5 (okle-0.2.3.tar.gz) = 40b5fafb27ab093049260696d02d0207
diff --git a/multimedia/okle/files/patch-configure.in b/multimedia/okle/files/patch-configure.in
deleted file mode 100644
index b8ad1201387f..000000000000
--- a/multimedia/okle/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Mon Jul 15 14:00:59 2002
-+++ configure.in	Mon Jul 15 14:01:18 2002
-@@ -63,7 +63,7 @@
- AC_HEADER_DIRENT
- AC_HEADER_STDC
- AC_HEADER_TIME
--AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h stdlib.h paths.h)
-+AC_CHECK_HEADERS(fcntl.h sys/param.h sys/time.h unistd.h stdlib.h paths.h)
- AC_CHECK_FUNCS(usleep)
- 
- dnl Checks for ogle.
diff --git a/multimedia/okle/files/patch-src::sniffer.cpp b/multimedia/okle/files/patch-src::sniffer.cpp
deleted file mode 100644
index 069862b7c9bb..000000000000
--- a/multimedia/okle/files/patch-src::sniffer.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/sniffer.cpp.orig	Sun Jul 14 07:58:36 2002
-+++ src/sniffer.cpp	Mon Jul 15 14:20:26 2002
-@@ -1,3 +1,9 @@
-+#include "config.h"
-+
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>  
-+#endif
-+
- #include "sniffer.h"
- 
- #include <kapp.h>
-@@ -37,7 +43,13 @@
- 
-  while(1) 
-   {
--   DVDNextEvent(nav2, &mev);
-+#if (defined(BSD) && (BSD >= 199306))
-+   if (DVDNextEventNonBlocking(nav2, &mev) != DVD_E_Ok)
-+    QThread::exit();
-+#else
-+   if (DVDNextEvent(nav2, &mev) != DVD_E_Ok)
-+    QThread::exit();
-+#endif
-    switch(mev.type) 
-     {
-      case MsgEventQInputPointerMotion:
diff --git a/multimedia/okle/files/wrapper.sh b/multimedia/okle/files/wrapper.sh
deleted file mode 100644
index 98bcd8c1d26f..000000000000
--- a/multimedia/okle/files/wrapper.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-DVDP_UI="%%DVDP_UI%%"
-ENV="%%ENV%%"
-OGLE="%%OGLE%%"
-
-${ENV} DVDP_UI="${DVDP_UI}" ${OGLE}
diff --git a/multimedia/okle/pkg-plist b/multimedia/okle/pkg-plist
index 0ebdda557457..fccac43dd1db 100644
--- a/multimedia/okle/pkg-plist
+++ b/multimedia/okle/pkg-plist
@@ -1,5 +1,5 @@
 bin/okle
-lib/okle/ogle_gui
+bin/okle_gui
 share/applnk/Multimedia/okle.desktop
 share/apps/okle/okleui.rc
 share/apps/okle/pics/angleselect.png
@@ -38,4 +38,3 @@ share/locale/sv/LC_MESSAGES/okle.mo
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @dirrm share/apps/okle/pics
 @dirrm share/apps/okle
-@dirrm lib/okle