7 files changed, 139 insertions, 96 deletions

diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index 807ae142eb1b..0159360768fb 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -5,31 +5,42 @@
 # $FreeBSD$
 
 PORTNAME=	k9copy
-PORTVERSION=	1.0.4
-PORTREVISION=	5
+PORTVERSION=	2.3.4
 CATEGORIES=	multimedia kde
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-kde4/${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
-MAINTAINER=	triosoft@triosoft.com.ua
+MAINTAINER=	egoliveira@gmail.com
 COMMENT=	A DVD-9 to DVD-5 shrinking application for KDE
 
-LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
-RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
-		vamps:${PORTSDIR}/multimedia/vamps
+LIB_DEPENDS=	xine:${PORTSDIR}/multimedia/libxine \
+		mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
+		avcodec:${PORTSDIR}/multimedia/ffmpeg
 
-USE_KDELIBS_VER=3
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:22
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_CMAKE=	yes
+USE_KDE4=	kdeprefix kdelibs automoc4
+USE_QT_VER=	4
+QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build
+# MAKE_JOBS_SAFE=	yes
 
-USE_LDCONFIG=	yes
+LATEST_LINK=	${PORTNAME}-kde4
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,-O2,,g ; \
-		s,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e \
-		's,$$(LIB_KDEUI),$$(LIB_KDEUI) $$(LIBPTHREAD) -lcam,g' \
-		${WRKSRC}/src/Makefile.in
+OPTIONS=	MENCODER	"Install MEncoder (requires MPlayer)"	Off \
+		MPLAYER		"Install MPlayer"			Off \
+		DVDAUTHOR	"Install DVD Author"			Off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_MENCODER)
+RUN_DEPENDS+=	mencoder:${PORTSDIR}/multimedia/mencoder
+.endif
+
+.if defined(WITH_MPLAYER)
+RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
+.endif
+
+.if defined(WITH_DVDAUTHOR)
+RUN_DEPENDS+=	dvdauthor:${PORTSDIR}/multimedia/dvdauthor
+.endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/k9copy-kde4/distinfo b/multimedia/k9copy-kde4/distinfo
index 5eca20d79bc0..a4e8e9875d18 100644
--- a/multimedia/k9copy-kde4/distinfo
+++ b/multimedia/k9copy-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (k9copy-1.0.4.tar.gz) = a73a0ec35084c5ea59b047d9654e0036
-SHA256 (k9copy-1.0.4.tar.gz) = 566b7cb0180ffb1fde8f1d0281432b9914755a646cca60f89a6372f79e256039
-SIZE (k9copy-1.0.4.tar.gz) = 1099333
+MD5 (k9copy-2.3.4-Source.tar.gz) = 7b266bb548c4c649f3a691490ccae81c
+SHA256 (k9copy-2.3.4-Source.tar.gz) = 64950492059c22e8e434b4bc8487b9ba91ad647c2907084a2b9a1076db23693b
+SIZE (k9copy-2.3.4-Source.tar.gz) = 1551486
diff --git a/multimedia/k9copy-kde4/files/patch-CMakeLists.txt b/multimedia/k9copy-kde4/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..24d86ea205fe
--- /dev/null
+++ b/multimedia/k9copy-kde4/files/patch-CMakeLists.txt
@@ -0,0 +1,38 @@
+--- ./CMakeLists.txt.orig	2009-12-06 13:13:36.000000000 +0300
++++ ./CMakeLists.txt	2010-01-30 23:39:22.211155391 +0300
+@@ -45,6 +45,14 @@
+ MESSAGE(STATUS "Checking dependencies" )
+ FINDXINE("xine.h" "xine")
+ FINDLIBMPEG2("mpeg2dec/mpeg2.h" "mpeg2")
++
++FIND_LIBRARY(LIBMPEG2CONVERT_LIBRARY NAMES mpeg2convert PATHS )
++IF (LIBMPEG2CONVERT_LIBRARY)
++      MESSAGE(STATUS "Found library mpeg2convert: ${LIBMPEG2CONVERT_LIBRARY}")
++ELSE (LIBMPEG2CONVERT_LIBRARY)
++      MESSAGE(FATAL_ERROR "Could not find mpeg2convert")
++ENDIF (LIBMPEG2CONVERT_LIBRARY)
++
+ #FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread")
+ 
+ FINDAVFORMAT("avformat")
+@@ -318,7 +326,7 @@
+ 
+ 
+ kde4_add_library(k9copylib STATIC ${k9copylib_SRCS})
+-target_link_libraries(k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lkdesu -lmpeg2 -lmpeg2convert )
++target_link_libraries(k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDESU_LIBS} ${LIBMPEG2_LIBRARY} ${LIBMPEG2CONVERT_LIBRARY} )
+ 
+ kde4_add_ui_files(k9copy_SRCS )
+ 
+@@ -326,9 +334,9 @@
+ kde4_add_executable(k9play ${k9play_SRCS})
+ kde4_add_executable(k9xineplayer ${k9xineplayer_SRCS})
+ 
+-target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  -lphonon )
++target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  ${PHONON_LIBRARY} )
+ target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  )
+-target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lxine )
++target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${XINE_LIBRARY} )
+ 
+ 
+ install(TARGETS k9copy DESTINATION ${BIN_INSTALL_DIR} )
diff --git a/multimedia/k9copy-kde4/files/patch-libk3bdevice-k3bdevice.h b/multimedia/k9copy-kde4/files/patch-libk3bdevice-k3bdevice.h
deleted file mode 100644
index 5ed937e362d3..000000000000
--- a/multimedia/k9copy-kde4/files/patch-libk3bdevice-k3bdevice.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- libk3bdevice/k3bdevice.h.orig      Mon Dec 12 10:32:59 2005
-+++ libk3bdevice/k3bdevice.h   Wed Dec 14 23:49:42 2005
-@@ -28,6 +28,7 @@
-
- #ifdef Q_OS_FREEBSD
- struct cam_device;
-+#define stat64 stat
- #endif
-
- namespace K3bDevice
diff --git a/multimedia/k9copy-kde4/files/patch-libk9copy_k9dvd.cpp b/multimedia/k9copy-kde4/files/patch-libk9copy_k9dvd.cpp
deleted file mode 100644
index 76558a7e5623..000000000000
--- a/multimedia/k9copy-kde4/files/patch-libk9copy_k9dvd.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- libk9copy/k9dvd.cpp.orig   Mon Jan 16 10:40:01 2006
-+++ libk9copy/k9dvd.cpp        Mon Jan 16 10:40:33 2006
-@@ -199,7 +199,7 @@
-         return -1;
-     }
-
--    if ( fseek(filehandle, 32808, SEEK_SET )) {
-+    if ( fseek(filehandle, 32768, SEEK_SET )) {
-         fclose(filehandle);
-         c=i18n("Couldn't seek in %1 for title\n").arg( dvd_device);
-         setError(c);
-@@ -207,12 +207,19 @@
-         return -1;
-     }
-
--    if ( 32 != (i = fread(title, 1, 32, filehandle)) ) {
-+    {
-+    #define DVD_SEC_SIZ 2048
-+    char tempBuf[ DVD_SEC_SIZ ];
-+    if ( DVD_SEC_SIZ != fread(tempBuf, 1, DVD_SEC_SIZ, filehandle) ) {
-         fclose(filehandle);
- //        c=tr2i18n("Couldn't read enough bytes for title.\n");
- //        setError(c);
-         strcpy(title, "unknown");
-         return 0;
-+    }
-+    snprintf( title, 32, "%s", tempBuf + 40 );
-+    i=32;
-+
-     }
-
-     fclose (filehandle);
diff --git a/multimedia/k9copy-kde4/pkg-descr b/multimedia/k9copy-kde4/pkg-descr
index dbf77007a39d..14de961bb3f2 100644
--- a/multimedia/k9copy-kde4/pkg-descr
+++ b/multimedia/k9copy-kde4/pkg-descr
@@ -1,24 +1,22 @@
-From K9copy website:
-
-K9Copy is a small utility which allows the copy of DVD on Linux.
+K9Copy is a small utility which allows copying DVDs.
 The DVD video stream is compressed by the program Vamps.
 
-1. Copy without menus :
-In this case, dvdauthor is used to create a new DVD structure. It is possible
-to choose the order in which the video sequences are played.
-2. Copy with menus :
-As dvdauthor does not make it possible to integrate the original menus,
-K9Copy reproduces the original structure of the DVD. The navigation packs as
-well as IFO files are modified to point on the compressed MPEG stream.
+1. Copy without menus:
+Here, dvdauthor creates a new structure for the DVD. It is possible to 
+arbitrarily set the order of the videos.
+2. Copy with menus:
+Because dvdauthor can't copy the original menus, K9Copy recreates the original
+DVD structure. The menus as well as IFO files are modified to point to the 
+compressed MPEG2 stream.
+
+Creating personalized menus was not brought back with version 1.0.0
 
 Features
 * The video stream is compressed to make the DVD fit on 4.7 Gb recordable DVD
 * DVD Burning
 * Creation of ISO images
-* Possibility of selecting the audio tracks and subtitles to be copied
+* Choosing which audio and subtitle tracks are copied
 * Title preview (video only)
-* Possibility of preserving the original menus
-
-WWW: http://k9copy.free.fr
+* The ability to preserve the original menus
 
-- Alexander V. Ribchansky triosoft@triosoft.com.ua
+WWW:	http://k9copy.sourceforge.net
diff --git a/multimedia/k9copy-kde4/pkg-plist b/multimedia/k9copy-kde4/pkg-plist
index 7689b34b9590..0c59555a2aa1 100644
--- a/multimedia/k9copy-kde4/pkg-plist
+++ b/multimedia/k9copy-kde4/pkg-plist
@@ -1,32 +1,70 @@
 bin/k9copy
-include/k9backupdlg.h
-include/k9cell.h
-include/k9cellcopylist.h
-include/k9common.h
-include/k9dvd.h
-include/k9dvdauthor.h
-include/k9dvdbackup.h
-include/k9dvdprogress.h
-include/k9dvdsize.h
-include/k9dvdtitle.h
-include/k9ifo.h
-lib/libk9copy.a
-lib/libk9copy.la
-lib/libk9copy.so
-lib/libk9copy.so.0
-share/applnk/Multimedia/k9copy.desktop
+bin/k9play
+bin/k9xineplayer
+share/applications/kde4/k9copy.desktop
+share/applications/kde4/k9copy_assistant.desktop
+share/apps/k9copy/anim.mng
+share/apps/k9copy/icons/hicolor/16x16/actions/dvdcopy.png
+share/apps/k9copy/icons/hicolor/16x16/actions/mp4.png
+share/apps/k9copy/icons/hicolor/16x16/actions/mpeg.png
+share/apps/k9copy/icons/hicolor/22x22/actions/author.png
+share/apps/k9copy/icons/hicolor/22x22/actions/cycle.png
+share/apps/k9copy/icons/hicolor/22x22/actions/dvdcopy.png
+share/apps/k9copy/icons/hicolor/22x22/actions/mp4.png
+share/apps/k9copy/icons/hicolor/22x22/actions/mpeg.png
+share/apps/k9copy/icons/hicolor/22x22/actions/sound.png
+share/apps/k9copy/icons/hicolor/22x22/actions/subtitle.png
+share/apps/k9copy/icons/hicolor/22x22/actions/title.png
+share/apps/k9copy/icons/hicolor/22x22/actions/video.png
+share/apps/k9copy/icons/hicolor/32x32/actions/author.png
+share/apps/k9copy/icons/hicolor/32x32/actions/dvdcopy.png
+share/apps/k9copy/icons/hicolor/32x32/actions/mp4.png
+share/apps/k9copy/icons/hicolor/32x32/actions/mpeg.png
+share/apps/k9copy/icons/hicolor/48x48/actions/author.png
+share/apps/k9copy/icons/hicolor/48x48/actions/dvdcopy.png
+share/apps/k9copy/icons/hicolor/48x48/actions/mencoder.png
+share/apps/k9copy/icons/hicolor/48x48/actions/mp4.png
+share/apps/k9copy/icons/hicolor/48x48/actions/mpeg.png
 share/apps/k9copy/k9copyui.rc
+share/apps/k9copy/mencoder.xml
+share/apps/solid/actions/k9copy_assistant_open.desktop
+share/apps/solid/actions/k9copy_open.desktop
+share/doc/HTML/en/k9copy/assistant.png
+share/doc/HTML/en/k9copy/common
+share/doc/HTML/en/k9copy/index.cache.bz2
+share/doc/HTML/en/k9copy/index.docbook
+share/doc/HTML/en/k9copy/screenshot.png
 share/icons/hicolor/16x16/apps/k9copy.png
+share/icons/hicolor/22x22/apps/k9copy.png
 share/icons/hicolor/32x32/apps/k9copy.png
 share/icons/hicolor/48x48/apps/k9copy.png
+share/locale/ca/LC_MESSAGES/k9copy.mo
 share/locale/cs/LC_MESSAGES/k9copy.mo
 share/locale/de/LC_MESSAGES/k9copy.mo
 share/locale/el/LC_MESSAGES/k9copy.mo
-share/locale/en_GB/LC_MESSAGES/k9copy.mo
 share/locale/es/LC_MESSAGES/k9copy.mo
+share/locale/es_AR/LC_MESSAGES/k9copy.mo
 share/locale/fr/LC_MESSAGES/k9copy.mo
 share/locale/it/LC_MESSAGES/k9copy.mo
+share/locale/nl/LC_MESSAGES/k9copy.mo
 share/locale/pl/LC_MESSAGES/k9copy.mo
 share/locale/pt_BR/LC_MESSAGES/k9copy.mo
 share/locale/ru/LC_MESSAGES/k9copy.mo
+share/locale/sr/LC_MESSAGES/k9copy.mo
+share/locale/sr@Latn/LC_MESSAGES/k9copy.mo
+share/locale/tr/LC_MESSAGES/k9copy.mo
+share/locale/zh_TW/LC_MESSAGES/k9copy.mo
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrm share/doc/HTML/en/k9copy
+@dirrm share/apps/k9copy/icons/hicolor/48x48/actions
+@dirrm share/apps/k9copy/icons/hicolor/48x48
+@dirrm share/apps/k9copy/icons/hicolor/32x32/actions
+@dirrm share/apps/k9copy/icons/hicolor/32x32
+@dirrm share/apps/k9copy/icons/hicolor/22x22/actions
+@dirrm share/apps/k9copy/icons/hicolor/22x22
+@dirrm share/apps/k9copy/icons/hicolor/16x16/actions
+@dirrm share/apps/k9copy/icons/hicolor/16x16
+@dirrm share/apps/k9copy/icons/hicolor
+@dirrm share/apps/k9copy/icons
 @dirrm share/apps/k9copy