18 files changed, 211 insertions, 82 deletions

diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index 7492ee94b220..cccf48774c3e 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	k9copy
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://k9copy.free.fr/
 
@@ -14,13 +14,17 @@ COMMENT=	A DVD-9 to DVD-5 shrinking application for KDE
 
 LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
-		dvdauthor:${PORTSDIR}/multimedia/dvdauthor
+                dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
+                vamps:${PORTSDIR}/multimedia/vamps
 
 USE_KDELIBS_VER=3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}b
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+INSTALLS_SHLIB=	yes
+DOCSDIR=	${PREFIX}/share/doc/HTML/en/k9copy
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,-O2,,g ; \
@@ -29,4 +33,9 @@ post-patch:
 		's,$$(LIB_KDEUI),$$(LIB_KDEUI) $$(LIBPTHREAD) -lcam,g' \
 		${WRKSRC}/src/Makefile.in
 
+post-configure:
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|doc libk3bdevice libk9copy po src|libk3bdevice libk9copy po src|g' ${WRKSRC}/Makefile
+.endif
+
 .include <bsd.port.mk>
diff --git a/multimedia/k9copy/distinfo b/multimedia/k9copy/distinfo
index f3d366ce05d9..44cabeba32ec 100644
--- a/multimedia/k9copy/distinfo
+++ b/multimedia/k9copy/distinfo
@@ -1,3 +1,3 @@
-MD5 (k9copy-1.0.1.tar.gz) = cc13f799a13784f7c9aaa2d40d608b0b
-SHA256 (k9copy-1.0.1.tar.gz) = 1111de1f6cee40f17e3a341f656b046f2a63a5b9debb68c9660c17d217d080bb
-SIZE (k9copy-1.0.1.tar.gz) = 1206622
+MD5 (k9copy-1.0.2.tar.gz) = 9037dfa804a6f758c5df7e641c67127d
+SHA256 (k9copy-1.0.2.tar.gz) = 1432c327ea38aeaffcfe34c99637ec90b09e31552c132a947a0a0f9e36dfa9e2
+SIZE (k9copy-1.0.2.tar.gz) = 1154768
diff --git a/multimedia/k9copy/files/patch-libk3bdevice-k3bdevice.h b/multimedia/k9copy/files/patch-libk3bdevice-k3bdevice.h
new file mode 100644
index 000000000000..5ed937e362d3
--- /dev/null
+++ b/multimedia/k9copy/files/patch-libk3bdevice-k3bdevice.h
@@ -0,0 +1,10 @@
+--- 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_k9backupdlg.cpp b/multimedia/k9copy/files/patch-libk9copy_k9backupdlg.cpp
new file mode 100644
index 000000000000..fb3761bde528
--- /dev/null
+++ b/multimedia/k9copy/files/patch-libk9copy_k9backupdlg.cpp
@@ -0,0 +1,15 @@
+--- libk9copy/k9backupdlg.cpp.orig     Thu Jan  5 06:08:21 2006
++++ libk9copy/k9backupdlg.cpp  Thu Jan  5 06:08:38 2006
+@@ -18,7 +18,11 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++       #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++       #include <inttypes.h>
++#endif
+ #include <qtimer.h>
+ #include <qdatetime.h>
+ #include <qapplication.h>
diff --git a/multimedia/k9copy/files/patch-libk9copy_k9cell.h b/multimedia/k9copy/files/patch-libk9copy_k9cell.h
new file mode 100644
index 000000000000..5ef77774ea0e
--- /dev/null
+++ b/multimedia/k9copy/files/patch-libk9copy_k9cell.h
@@ -0,0 +1,15 @@
+--- libk9copy/k9cell.h.orig    Thu Jan  5 06:09:52 2006
++++ libk9copy/k9cell.h Thu Jan  5 06:10:12 2006
+@@ -22,7 +22,11 @@
+
+ #include <qobject.h>
+ #include <qobjectlist.h>
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++       #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++       #include <inttypes.h>
++#endif
+ #include "k9dvdtitle.h"
+ enum streamType_t {stAudio,stVideo,stSubpicture,stOther};
+ /**
diff --git a/multimedia/k9copy/files/patch-libk9copy_k9cellcopylist.h b/multimedia/k9copy/files/patch-libk9copy_k9cellcopylist.h
new file mode 100644
index 000000000000..cae5c3a1ac22
--- /dev/null
+++ b/multimedia/k9copy/files/patch-libk9copy_k9cellcopylist.h
@@ -0,0 +1,15 @@
+--- libk9copy/k9cellcopylist.h.orig    Thu Jan  5 06:10:57 2006
++++ libk9copy/k9cellcopylist.h Thu Jan  5 06:11:13 2006
+@@ -24,7 +24,11 @@
+ #include "k9dvd.h"
+ #include "k9cell.h"
+ #include <dvdread/ifo_types.h>
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++       #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++       #include <inttypes.h>
++#endif
+
+ class k9CellCopyVTS {
+ private:
diff --git a/multimedia/k9copy/files/patch-src_kdvd.cpp b/multimedia/k9copy/files/patch-libk9copy_k9dvd.cpp
index 096884ad9480..a572bba7a38e 100644
--- a/multimedia/k9copy/files/patch-src_kdvd.cpp
+++ b/multimedia/k9copy/files/patch-libk9copy_k9dvd.cpp
@@ -1,6 +1,19 @@
---- src/kdvd.cpp.orig  Sun Dec 18 23:50:47 2005
-+++ src/kdvd.cpp       Mon Dec 19 00:19:47 2005
-@@ -409,7 +409,7 @@
+--- libk9copy/k9dvd.cpp.orig   Fri Dec  9 19:18:03 2005
++++ libk9copy/k9dvd.cpp        Thu Jan  5 06:12:30 2006
+@@ -27,7 +27,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++       #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++       #include <inttypes.h>
++#endif
+
+ #include "k9dvd.h"
+ #include "k9dvdtitle.h"
+@@ -196,7 +200,7 @@
          return -1;
      }
 
@@ -9,7 +22,7 @@
          fclose(filehandle);
          c.sprintf(tr2i18n("Couldn't seek in %s for title\n"), dvd_device);
          setError(c);
-@@ -417,14 +417,20 @@
+@@ -204,12 +208,18 @@
          return -1;
      }
 
@@ -19,16 +32,13 @@
 +    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);
+ //        c=tr2i18n("Couldn't read enough bytes for title.\n");
+ //        setError(c);
          strcpy(title, "unknown");
-         return -1;
-     }
--
+         return 0;
++    }
 +    snprintf( title, 32, "%s", tempBuf + 40 );
 +    i=32;
-+    }
-+
-     fclose (filehandle);
+     }
 
-     title[32] = '\0';
+     fclose (filehandle);
diff --git a/multimedia/k9copy/files/patch-libk9copy_k9dvd.h b/multimedia/k9copy/files/patch-libk9copy_k9dvd.h
new file mode 100644
index 000000000000..25939a256525
--- /dev/null
+++ b/multimedia/k9copy/files/patch-libk9copy_k9dvd.h
@@ -0,0 +1,15 @@
+--- libk9copy/k9dvd.h.orig     Thu Jan  5 06:13:32 2006
++++ libk9copy/k9dvd.h  Thu Jan  5 06:13:58 2006
+@@ -25,7 +25,11 @@
+ #include <qobjectlist.h>
+ #include <qdatetime.h>
+ #include <qvaluelist.h>
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++       #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++       #include <inttypes.h>
++#endif
+ #include <dvdread/ifo_types.h>
+
+
diff --git a/multimedia/k9copy/files/patch-libk9copy_k9dvdbackup.h b/multimedia/k9copy/files/patch-libk9copy_k9dvdbackup.h
new file mode 100644
index 000000000000..ff80c4ad39f4
--- /dev/null
+++ b/multimedia/k9copy/files/patch-libk9copy_k9dvdbackup.h
@@ -0,0 +1,15 @@
+--- libk9copy/k9dvdbackup.h.orig       Thu Jan  5 06:16:05 2006
++++ libk9copy/k9dvdbackup.h    Thu Jan  5 06:16:20 2006
+@@ -26,7 +26,11 @@
+ #include <qobjectlist.h>
+ #include "k9cell.h"
+ #include <dvdread/ifo_types.h>
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++       #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++       #include <inttypes.h>
++#endif
+ #include "k9cellcopylist.h"
+ /**
+ @author Jean-Michel Petit
diff --git a/multimedia/k9copy/files/patch-libk9copy_k9dvdtitle.cpp b/multimedia/k9copy/files/patch-libk9copy_k9dvdtitle.cpp
new file mode 100644
index 000000000000..41821ee8cd56
--- /dev/null
+++ b/multimedia/k9copy/files/patch-libk9copy_k9dvdtitle.cpp
@@ -0,0 +1,15 @@
+--- libk9copy/k9dvdtitle.cpp.orig      Thu Jan  5 06:16:57 2006
++++ libk9copy/k9dvdtitle.cpp   Thu Jan  5 06:17:14 2006
+@@ -31,7 +31,11 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <qvaluelist.h>
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++       #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++       #include <inttypes.h>
++#endif
+
+
+ //*******************k9DVDAudioStream**************
diff --git a/multimedia/k9copy/files/patch-src_kifo.cpp b/multimedia/k9copy/files/patch-libk9copy_k9ifo.cpp
index 251fbd0ce2cc..e371f3301021 100644
--- a/multimedia/k9copy/files/patch-src_kifo.cpp
+++ b/multimedia/k9copy/files/patch-libk9copy_k9ifo.cpp
@@ -1,5 +1,5 @@
---- src/kifo.cpp.orig  Sun Dec 18 23:40:34 2005
-+++ src/kifo.cpp       Sun Dec 18 23:40:52 2005
+--- libk9copy/k9ifo.cpp.orig  Sun Dec 18 23:40:34 2005
++++ libk9copy/k9ifo.cpp       Sun Dec 18 23:40:52 2005
 @@ -21,6 +21,9 @@
  #include <dvdread/dvd_reader.h>
  #include <dvdread/ifo_read.h>
diff --git a/multimedia/k9copy/files/patch-src_K9copy.desktop b/multimedia/k9copy/files/patch-src_K9copy.desktop
deleted file mode 100644
index cba2f03de535..000000000000
--- a/multimedia/k9copy/files/patch-src_K9copy.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/K9copy.desktop.orig    Tue Dec 20 16:03:59 2005
-+++ src/K9copy.desktop Tue Dec 20 16:04:12 2005
-@@ -3,6 +3,6 @@
- Name=k9copy
- Exec=k9copy -caption "%c" %i %m %u
- Comment=
--Icon=/home/jmp/dev/k9copy/src/k9copy.png
-+Icon=k9copy
- MimeTypes=
- Terminal=false
diff --git a/multimedia/k9copy/files/patch-src_Makefile.in b/multimedia/k9copy/files/patch-src_Makefile.in
index efa15fa1984c..ee760c39f447 100644
--- a/multimedia/k9copy/files/patch-src_Makefile.in
+++ b/multimedia/k9copy/files/patch-src_Makefile.in
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig       Tue Dec 20 16:07:46 2005
-+++ src/Makefile.in    Tue Dec 20 16:09:14 2005
-@@ -459,7 +459,7 @@
+--- src/Makefile.in.orig       Tue Jan  3 04:57:30 2006
++++ src/Makefile.in    Tue Jan  3 04:57:42 2006
+@@ -439,7 +439,7 @@
  shellrcdir = $(kde_datadir)/k9copy
  shellrc_DATA = k9copyui.rc
  applnkApplication_DATA = K9copy.desktop
diff --git a/multimedia/k9copy/files/patch-src_kburndvd.cpp b/multimedia/k9copy/files/patch-src_kburndvd.cpp
new file mode 100644
index 000000000000..61de7d380e57
--- /dev/null
+++ b/multimedia/k9copy/files/patch-src_kburndvd.cpp
@@ -0,0 +1,15 @@
+--- src/kburndvd.cpp.orig      Thu Jan  5 06:04:49 2006
++++ src/kburndvd.cpp   Thu Jan  5 06:05:18 2006
+@@ -24,7 +24,11 @@
+ #include <qdir.h>
+ #include <kmessagebox.h>
+ #include <kprocess.h>
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++       #include <stdint.h>
++#elif defined(HAVE_INTTYPES_H)
++       #include <inttypes.h>
++#endif
+ #include <kfiledialog.h>
+
+ kBurnDVD::kBurnDVD()
diff --git a/multimedia/k9copy/files/patch-src_kcddrive.cpp b/multimedia/k9copy/files/patch-src_kcddrive.cpp
index a05b47882f74..4e9b134c7e6a 100644
--- a/multimedia/k9copy/files/patch-src_kcddrive.cpp
+++ b/multimedia/k9copy/files/patch-src_kcddrive.cpp
@@ -1,30 +1,34 @@
---- src/kcddrive.cpp.orig      Thu Dec 15 16:49:47 2005
-+++ src/kcddrive.cpp   Thu Dec 15 16:49:47 2005
-@@ -27,8 +27,10 @@
- #include <sys/stat.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
-+/*
- #include <scsi/scsi.h>
- #include <scsi/sg.h>
-+*/
- #include <unistd.h>
-
- #include <qfile.h>
-@@ -177,7 +179,7 @@
-         return 0;
-     }
-
--    if (ioctl (fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) < 0) {
-+/*    if (ioctl (fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) < 0) {
-         close (fd);
-         return 0;
-     }
-@@ -185,6 +187,7 @@
-         close(fd);
-         return 0;
-     }
-+*/
-     id = m_idlun.mux4 & 0xFF;
-     lun = (m_idlun.mux4 >> 8)  & 0xFF;
-
+--- src/kcddrive.cpp.orig	Sun Dec 18 18:36:56 2005
++++ src/kcddrive.cpp	Fri Jan  6 18:01:33 2006
+@@ -21,6 +21,7 @@
+ 
+ #include "kcddrive.h"
+ #include <kprocess.h>
++#include <sys/param.h>
+ #include <sys/mount.h>
+ kCDDrive::kCDDrive() {
+     canReadDVD=false;
+@@ -55,7 +56,7 @@
+ 	if (process->isRunning()) process->wait(-1);
+ 	delete process;
+ */
+-	umount(device.latin1());
++	unmount(device.latin1(),0);
+ 	dev->eject();
+ 	}
+    }
+@@ -99,6 +100,7 @@
+ void kCDDrives::scanDrives() {
+     int i;
+     drives.clear();
++    dm->clear();
+     dm->scanBus();
+     dm->scanFstab();
+ 
+@@ -128,4 +130,4 @@
+ /** No descriptions */
+ kCDDrive * kCDDrives::getDrive(int num) {
+     return (kCDDrive *)drives.at(num);
+-}
+\ No newline at end of file
++}
diff --git a/multimedia/k9copy/files/patch-vamps_Makefile.in b/multimedia/k9copy/files/patch-vamps_Makefile.in
deleted file mode 100644
index 914d01804265..000000000000
--- a/multimedia/k9copy/files/patch-vamps_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- vamps/Makefile.in.orig     Tue Dec 20 15:26:47 2005
-+++ vamps/Makefile.in  Tue Dec 20 15:30:34 2005
-@@ -329,7 +329,7 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- #>- METASOURCES = AUTO
--usrbindir = /usr/bin
-+usrbindir = ${prefix}/bin
- k9vamps_LDADD = -lpthread -lm
- k9vamps_SOURCES = requant.h vamps.cpp putvlc.h getvlc.h requant.cpp
- k9playcell_LDADD = -ldvdread
diff --git a/multimedia/k9copy/pkg-descr b/multimedia/k9copy/pkg-descr
index 63014874a1c7..dbf77007a39d 100644
--- a/multimedia/k9copy/pkg-descr
+++ b/multimedia/k9copy/pkg-descr
@@ -21,4 +21,4 @@ Features
 
 WWW: http://k9copy.free.fr
 
-- Alexander V. Ribchnaky triosoft@triosoft.com.ua
+- Alexander V. Ribchansky triosoft@triosoft.com.ua
diff --git a/multimedia/k9copy/pkg-plist b/multimedia/k9copy/pkg-plist
index 55e686a955e7..e06456308eb4 100644
--- a/multimedia/k9copy/pkg-plist
+++ b/multimedia/k9copy/pkg-plist
@@ -1,18 +1,30 @@
 bin/k9copy
-bin/k9playcell
-bin/k9vamps
+include/k9backupdlg.h
+include/k9cell.h
+include/k9cellcopylist.h
+include/k9dvd.h
+include/k9dvdauthor.h
+include/k9dvdbackup.h
+include/k9dvdprogress.h
+include/k9dvdtitle.h
+include/k9ifo.h
+lib/libk9copy.la
+lib/libk9copy.so
+lib/libk9copy.so.0
 share/applnk/Multimedia/K9copy.desktop
 share/apps/k9copy/k9copyui.rc
-share/doc/HTML/en/k9copy/index.cache.bz2
-share/doc/HTML/en/k9copy/index.docbook
-share/doc/HTML/en/k9copy/common
+%%PORTDOCS%%%%DOCSDIR%%/index.cache.bz2
+%%PORTDOCS%%%%DOCSDIR%%/index.docbook
+%%PORTDOCS%%%%DOCSDIR%%/common
 share/icons/hicolor/16x16/apps/k9copy.png
 share/icons/hicolor/32x32/apps/k9copy.png
 share/icons/hicolor/48x48/apps/k9copy.png
+share/locale/cs/LC_MESSAGES/k9copy.mo
 share/locale/en_GB/LC_MESSAGES/k9copy.mo
 share/locale/es/LC_MESSAGES/k9copy.mo
 share/locale/fr/LC_MESSAGES/k9copy.mo
 share/locale/hu/LC_MESSAGES/k9copy.mo
 share/locale/it/LC_MESSAGES/k9copy.mo
-@dirrm share/doc/HTML/en/k9copy
+share/locale/pt_BR/LC_MESSAGES/k9copy.mo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/apps/k9copy