6 files changed, 116 insertions, 54 deletions

diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index 510dec710c08..1d5ecb3f51f3 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -5,15 +5,17 @@
 # $FreeBSD$
 
 PORTNAME=	k9copy
-PORTVERSION=	1.0.4
-PORTREVISION=	9
+PORTVERSION=	1.2.4
 CATEGORIES=	multimedia kde
 MASTER_SITES=	SF
 
 MAINTAINER=	triosoft@triosoft.com.ua
 COMMENT=	A DVD-9 to DVD-5 shrinking application for KDE
 
-LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread \
+		avcodec:${PORTSDIR}/multimedia/ffmpeg \
+		hal:${PORTSDIR}/sysutils/hal \
+		dbus:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		vamps:${PORTSDIR}/multimedia/vamps
@@ -21,19 +23,18 @@ RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
 
 USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 900044
-BROKEN=		does not compile on FreeBSD 9.X
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,-O2,,g ; \
-		s,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+		s,-lpthread,${PTHREAD_LIBS},g ; \
+		s,/usr/local/lib/dbus-1.0/include,/usr/local/include/dbus-1.0/include,g' \
+	       	${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e \
 		's,$$(LIB_KDEUI),$$(LIB_KDEUI) $$(LIBPTHREAD) -lcam,g' \
 		${WRKSRC}/src/Makefile.in
diff --git a/multimedia/k9copy/distinfo b/multimedia/k9copy/distinfo
index 4072e631b74a..07758059b67a 100644
--- a/multimedia/k9copy/distinfo
+++ b/multimedia/k9copy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (k9copy-1.0.4.tar.gz) = 566b7cb0180ffb1fde8f1d0281432b9914755a646cca60f89a6372f79e256039
-SIZE (k9copy-1.0.4.tar.gz) = 1099333
+SHA256 (k9copy-1.2.4.tar.gz) = f5aab0947e2fe20b8adf4a95d907ab0d2846ddb85cca5fb755c3178b09b7edac
+SIZE (k9copy-1.2.4.tar.gz) = 2554245
diff --git a/multimedia/k9copy/files/patch-k9author-k9avidecode.cpp b/multimedia/k9copy/files/patch-k9author-k9avidecode.cpp
new file mode 100644
index 000000000000..f94658333011
--- /dev/null
+++ b/multimedia/k9copy/files/patch-k9author-k9avidecode.cpp
@@ -0,0 +1,14 @@
+--- k9author/k9avidecode.cpp.orig	2012-05-04 03:23:44.723888015 +0600
++++ k9author/k9avidecode.cpp	2012-05-04 03:24:56.101895834 +0600
+@@ -263,3 +263,11 @@
+ QString k9AviDecode::getError() const {
+     return m_error;
+ }
++
++
++void av_free_packet(AVPacket *pkt) {
++	if (pkt) {
++		if (pkt->destruct) pkt->destruct(pkt);
++			pkt->data = NULL; pkt->size = 0;
++	}
++}
diff --git a/multimedia/k9copy/files/patch-libk3bdevice-k3bdevice.h b/multimedia/k9copy/files/patch-libk3bdevice-k3bdevice.h
deleted file mode 100644
index 5ed937e362d3..000000000000
--- a/multimedia/k9copy/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/files/patch-libk9copy_k9dvd.cpp b/multimedia/k9copy/files/patch-libk9copy_k9dvd.cpp
index 76558a7e5623..c7e4273bd42f 100644
--- a/multimedia/k9copy/files/patch-libk9copy_k9dvd.cpp
+++ b/multimedia/k9copy/files/patch-libk9copy_k9dvd.cpp
@@ -1,32 +1,32 @@
---- 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 @@
+--- libk9copy/k9dvd.cpp.orig	2012-05-03 20:44:13.584889344 +0600
++++ libk9copy/k9dvd.cpp	2012-05-03 20:46:39.212894579 +0600
+@@ -192,7 +192,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 @@
+@@ -200,12 +200,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) ) {
++	#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");
+         //        c=tr2i18n("Couldn't read enough bytes for title.\n");
+         //        setError(c);
+         strcpy(title, i18n("unknown").latin1());
          return 0;
-+    }
-+    snprintf( title, 32, "%s", tempBuf + 40 );
-+    i=32;
++	}
++	snprintf( title, 32, "%s", tempBuf + 40 );
++	i=32;
 +
      }
-
+ 
      fclose (filehandle);
diff --git a/multimedia/k9copy/pkg-plist b/multimedia/k9copy/pkg-plist
index 7689b34b9590..f6925473b339 100644
--- a/multimedia/k9copy/pkg-plist
+++ b/multimedia/k9copy/pkg-plist
@@ -1,32 +1,89 @@
 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
+share/applications/kde/k9copy.desktop
 share/apps/k9copy/k9copyui.rc
+share/apps/k9copy/anim.mng
+share/apps/k9copy/mencoder.xml
+share/apps/k9copy/icons/hicolor/16x16/actions/mpeg.png
+share/apps/k9copy/icons/hicolor/16x16/actions/mp4.png
+share/apps/k9copy/icons/hicolor/16x16/actions/dvdcopy.png
+share/apps/k9copy/icons/hicolor/22x22/actions/author.png
+share/apps/k9copy/icons/hicolor/22x22/actions/mp4.png
+share/apps/k9copy/icons/hicolor/22x22/actions/cycle.png
+share/apps/k9copy/icons/hicolor/22x22/actions/mpeg.png
+share/apps/k9copy/icons/hicolor/22x22/actions/dvdcopy.png
+share/apps/k9copy/icons/hicolor/22x22/actions/title.png
+share/apps/k9copy/icons/hicolor/32x32/actions/mpeg.png
+share/apps/k9copy/icons/hicolor/32x32/actions/dvdcopy.png
+share/apps/k9copy/icons/hicolor/32x32/actions/author.png
+share/apps/k9copy/icons/hicolor/32x32/actions/mp4.png
+share/apps/k9copy/icons/hicolor/48x48/actions/mencoder.png
+share/apps/k9copy/icons/hicolor/48x48/actions/mpeg.png
+share/apps/k9copy/icons/hicolor/48x48/actions/dvdcopy.png
+share/apps/k9copy/icons/hicolor/48x48/actions/author.png
+share/apps/k9copy/icons/hicolor/48x48/actions/mplayer.png
+share/apps/k9copy/icons/hicolor/48x48/actions/mp4.png
+share/apps/konqueror/servicemenus/k9copy_open.desktop
+share/doc/HTML/en/k9copy/open2.png
+share/doc/HTML/en/k9copy/settingsDVD.png
+share/doc/HTML/en/k9copy/btnmp4.png
+share/doc/HTML/en/k9copy/settingsMP4.png
+share/doc/HTML/en/k9copy/index.docbook
+share/doc/HTML/en/k9copy/btncopy.png
+share/doc/HTML/en/k9copy/treeview.png
+share/doc/HTML/en/k9copy/settingsMencoder.png
+share/doc/HTML/en/k9copy/playback.png
+share/doc/HTML/en/k9copy/common
+share/doc/HTML/en/k9copy/index.cache.bz2
+share/doc/HTML/en/k9copy/mainwindow.png
+share/doc/HTML/en/k9copy/open1.png
+share/doc/HTML/en/k9copy/keepmenus.png
 share/icons/hicolor/16x16/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@latin/LC_MESSAGES/k9copy.mo
+share/locale/tr/LC_MESSAGES/k9copy.mo
+share/locale/zh_TW/LC_MESSAGES/k9copy.mo
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm share/doc/HTML/en/k9copy
+@dirrmtry share/doc/HTML/en
+@dirrmtry share/doc/HTML
+@dirrmtry share/apps/konqueror/servicemenus
+@dirrmtry share/apps/konqueror
+@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
+@dirrm share/applications/kde
+@dirrm share/applications
+@dirrm share/apps